Skip to content

Commit

Permalink
Merge pull request #173 from spryker-shop/release-202212.0-p1
Browse files Browse the repository at this point in the history
Release 202212.0 p1
  • Loading branch information
DmitryLymarenko authored Jan 25, 2023
2 parents 0b6da75 + 3e63bb7 commit b2270d5
Show file tree
Hide file tree
Showing 454 changed files with 2,249 additions and 1,508 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
validation:
name: "Static analysis / PHP 8.0"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Runs Elasticsearch
uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 7.6.0
stack-version: 7.10.0
port: 10005

- uses: actions/setup-node@v1
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- name: Install NPM packages
run: |
sudo npm install -g --unsafe-perm speccy@0.11.0
sudo npm i --location=global --unsafe-perm speccy@0.11.0
- name: Speccy lint Glue specification
run: speccy lint src/Generated/Glue/Specification/spryker_rest_api.schema.yml --rules=default
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:

php-80-mariadb-glue-alpine:
name: "PHP 8.0 / MariaDB / Glue / Alpine"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
Expand All @@ -170,7 +170,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -184,7 +184,7 @@ jobs:
php-80-postgresql-acceptance-alpine:
name: "PHP 8.0 / PostgreSQL / Acceptance / Alpine"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
Expand All @@ -199,7 +199,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -213,7 +213,7 @@ jobs:
php-80-postgresql-functional-alpine:
name: "PHP 8.0 / PostgreSQL / Functional / Alpine"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
Expand All @@ -228,7 +228,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -241,7 +241,7 @@ jobs:
php-80-mariadb-acceptance-alpine:
name: "PHP 8.0 / MariaDB / Acceptance / Alpine"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
Expand All @@ -256,7 +256,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -270,7 +270,7 @@ jobs:
php-80-mariadb-functional-alpine:
name: "PHP 8.0 / MariaDB / Functional / Alpine"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
Expand All @@ -285,7 +285,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -298,7 +298,7 @@ jobs:
php-80-postgres-functional-debian:
name: "PHP 8.0 / PostgreSQL / Functional / Debian"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0-debian
Expand All @@ -313,7 +313,7 @@ jobs:
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
Expand All @@ -325,15 +325,15 @@ jobs:
frontend-assets-via-docker-php-8-0:
name: "Docker / Alpine / PHP 8.0 / Frontend & Assets"
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
steps:
- uses: actions/checkout@v2
- run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
- run: sudo apt-get install --only-upgrade docker -y
- run: sudo curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
- run: sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
- run: sudo chmod +x /usr/local/bin/docker-compose
- run: git clone https://github.com/spryker/docker-sdk.git --single-branch --branch master ./docker
- run: docker/sdk boot deploy.yml
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# IDEs
/.idea
/.project
/nbproject
.idea/
.project/
.vscode/
nbproject/
/.buildpath
/.settings
*.sublime-*
Expand Down
3 changes: 2 additions & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Ignore paths
**/node_modules/**
**/DateTimeConfiguratorPageExample/**
**/dist/**
/public/*/assets/
public/*/assets/**
1 change: 0 additions & 1 deletion codeception.acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php
settings:
suite_class: \PHPUnit_Framework_TestSuite
colors: true
Expand Down
1 change: 0 additions & 1 deletion codeception.api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php
settings:
suite_class: \PHPUnit_Framework_TestSuite
colors: true
Expand Down
1 change: 0 additions & 1 deletion codeception.ci.functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php
settings:
suite_class: \PHPUnit_Framework_TestSuite
colors: true
Expand Down
1 change: 0 additions & 1 deletion codeception.functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php
settings:
suite_class: \PHPUnit_Framework_TestSuite
colors: true
Expand Down
1 change: 0 additions & 1 deletion codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php
settings:
suite_class: \PHPUnit_Framework_TestSuite
colors: true
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"spryker-sdk/phpstan-spryker": "^0.4.0",
"spryker-sdk/security-checker": "^0.1.0",
"spryker/architecture-sniffer": "^0.5.5",
"spryker/code-sniffer": "^0.16.6",
"spryker/code-sniffer": "^0.17.18",
"spryker/docker-chromedriver": "dev-master",
"spryker/testify": "^3.47.0",
"stecman/symfony-console-completion": "*",
Expand Down
26 changes: 13 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/Shared/common/config_oms-development.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
DummyPaymentConfig::PAYMENT_METHOD_CREDIT_CARD => 'DummyPayment01',
NopaymentConfig::PAYMENT_PROVIDER_NAME => 'Nopayment01',
GiftCardConfig::PROVIDER_NAME => 'DummyPayment01',
]
],
);
10 changes: 5 additions & 5 deletions config/Shared/config_default-ci.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@
= $backofficeHost;
$config[ZedRequestConstants::BASE_URL_ZED_API] = sprintf(
'http://%s',
$backendGatewayHost
$backendGatewayHost,
);
$config[ZedRequestConstants::BASE_URL_SSL_ZED_API] = sprintf(
'https://%s',
$backendGatewayHost
$backendGatewayHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -220,7 +220,7 @@

$config[ApplicationConstants::BASE_URL_ZED] = sprintf(
'http://%s',
$backofficeHost
$backofficeHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -237,7 +237,7 @@
= $config[NewsletterConstants::BASE_URL_YVES]
= sprintf(
'http://%s',
$yvesHost
$yvesHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -247,7 +247,7 @@
$config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN]
= sprintf(
'http://%s',
$glueHost
$glueHost,
);

if (class_exists(TestifyConstants::class)) {
Expand Down
10 changes: 5 additions & 5 deletions config/Shared/config_default-development.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@
= $backofficeHost;
$config[ZedRequestConstants::BASE_URL_ZED_API] = sprintf(
'http://%s',
$backendGatewayHost
$backendGatewayHost,
);
$config[ZedRequestConstants::BASE_URL_SSL_ZED_API] = sprintf(
'https://%s',
$backendGatewayHost
$backendGatewayHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -177,7 +177,7 @@

$config[ApplicationConstants::BASE_URL_ZED] = sprintf(
'http://%s',
$backofficeHost
$backofficeHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -194,7 +194,7 @@
= $config[NewsletterConstants::BASE_URL_YVES]
= sprintf(
'http://%s',
$yvesHost
$yvesHost,
);

// ----------------------------------------------------------------------------
Expand All @@ -204,7 +204,7 @@
$config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN]
= sprintf(
'http://%s',
$glueHost
$glueHost,
);

if (class_exists(TestifyConstants::class)) {
Expand Down
Loading

0 comments on commit b2270d5

Please sign in to comment.