Skip to content

Commit b2270d5

Browse files
DmitryLymarenkoDmitryLymarenko
authored
Merge pull request #173 from spryker-shop/release-202212.0-p1
Release 202212.0 p1
2 parents 0b6da75 + 3e63bb7 commit b2270d5

File tree

454 files changed

+2249
-1508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+2249
-1508
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
validation:
1414
name: "Static analysis / PHP 8.0"
15-
runs-on: ubuntu-18.04
15+
runs-on: ubuntu-20.04
1616
strategy:
1717
fail-fast: false
1818
matrix:
@@ -45,7 +45,7 @@ jobs:
4545
- name: Runs Elasticsearch
4646
uses: elastic/elastic-github-actions/elasticsearch@master
4747
with:
48-
stack-version: 7.6.0
48+
stack-version: 7.10.0
4949
port: 10005
5050

5151
- uses: actions/setup-node@v1
@@ -119,7 +119,7 @@ jobs:
119119
120120
- name: Install NPM packages
121121
run: |
122-
sudo npm install -g --unsafe-perm speccy@0.11.0
122+
sudo npm i --location=global --unsafe-perm speccy@0.11.0
123123
124124
- name: Speccy lint Glue specification
125125
run: speccy lint src/Generated/Glue/Specification/spryker_rest_api.schema.yml --rules=default
@@ -155,7 +155,7 @@ jobs:
155155

156156
php-80-mariadb-glue-alpine:
157157
name: "PHP 8.0 / MariaDB / Glue / Alpine"
158-
runs-on: ubuntu-18.04
158+
runs-on: ubuntu-20.04
159159
env:
160160
PROGRESS_TYPE: plain
161161
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -170,7 +170,7 @@ jobs:
170170
171171
- name: Install docker-compose
172172
run: |
173-
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
173+
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
174174
sudo chmod +x /usr/local/bin/docker-compose
175175
176176
- name: Run docker
@@ -184,7 +184,7 @@ jobs:
184184
185185
php-80-postgresql-acceptance-alpine:
186186
name: "PHP 8.0 / PostgreSQL / Acceptance / Alpine"
187-
runs-on: ubuntu-18.04
187+
runs-on: ubuntu-20.04
188188
env:
189189
PROGRESS_TYPE: plain
190190
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -199,7 +199,7 @@ jobs:
199199
200200
- name: Install docker-compose
201201
run: |
202-
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
202+
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
203203
sudo chmod +x /usr/local/bin/docker-compose
204204
205205
- name: Run docker
@@ -213,7 +213,7 @@ jobs:
213213
214214
php-80-postgresql-functional-alpine:
215215
name: "PHP 8.0 / PostgreSQL / Functional / Alpine"
216-
runs-on: ubuntu-18.04
216+
runs-on: ubuntu-20.04
217217
env:
218218
PROGRESS_TYPE: plain
219219
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -228,7 +228,7 @@ jobs:
228228
229229
- name: Install docker-compose
230230
run: |
231-
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
231+
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
232232
sudo chmod +x /usr/local/bin/docker-compose
233233
234234
- name: Run docker
@@ -241,7 +241,7 @@ jobs:
241241
242242
php-80-mariadb-acceptance-alpine:
243243
name: "PHP 8.0 / MariaDB / Acceptance / Alpine"
244-
runs-on: ubuntu-18.04
244+
runs-on: ubuntu-20.04
245245
env:
246246
PROGRESS_TYPE: plain
247247
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -256,7 +256,7 @@ jobs:
256256
257257
- name: Install docker-compose
258258
run: |
259-
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
259+
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
260260
sudo chmod +x /usr/local/bin/docker-compose
261261
262262
- name: Run docker
@@ -270,7 +270,7 @@ jobs:
270270
271271
php-80-mariadb-functional-alpine:
272272
name: "PHP 8.0 / MariaDB / Functional / Alpine"
273-
runs-on: ubuntu-18.04
273+
runs-on: ubuntu-20.04
274274
env:
275275
PROGRESS_TYPE: plain
276276
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -285,7 +285,7 @@ jobs:
285285
286286
- name: Install docker-compose
287287
run: |
288-
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
288+
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
289289
sudo chmod +x /usr/local/bin/docker-compose
290290
291291
- name: Run docker
@@ -298,7 +298,7 @@ jobs:
298298
299299
php-80-postgres-functional-debian:
300300
name: "PHP 8.0 / PostgreSQL / Functional / Debian"
301-
runs-on: ubuntu-18.04
301+
runs-on: ubuntu-20.04
302302
env:
303303
PROGRESS_TYPE: plain
304304
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0-debian
@@ -313,7 +313,7 @@ jobs:
313313
314314
- name: Install docker-compose
315315
run: |
316-
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
316+
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
317317
sudo chmod +x /usr/local/bin/docker-compose
318318
319319
- name: Run docker
@@ -325,15 +325,15 @@ jobs:
325325
326326
frontend-assets-via-docker-php-8-0:
327327
name: "Docker / Alpine / PHP 8.0 / Frontend & Assets"
328-
runs-on: ubuntu-18.04
328+
runs-on: ubuntu-20.04
329329
env:
330330
PROGRESS_TYPE: plain
331331
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
332332
steps:
333333
- uses: actions/checkout@v2
334334
- run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
335335
- run: sudo apt-get install --only-upgrade docker -y
336-
- 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
336+
- 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
337337
- run: sudo chmod +x /usr/local/bin/docker-compose
338338
- run: git clone https://github.com/spryker/docker-sdk.git --single-branch --branch master ./docker
339339
- run: docker/sdk boot deploy.yml

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# IDEs
2-
/.idea
3-
/.project
4-
/nbproject
2+
.idea/
3+
.project/
4+
.vscode/
5+
nbproject/
56
/.buildpath
67
/.settings
78
*.sublime-*

‎.stylelintignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Ignore paths
22
**/node_modules/**
3+
**/DateTimeConfiguratorPageExample/**
34
**/dist/**
4-
/public/*/assets/
5+
public/*/assets/**

‎codeception.acceptance.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ paths:
1111
support: tests/_support
1212
envs: tests/_envs
1313

14-
bootstrap: _bootstrap.php
1514
settings:
1615
suite_class: \PHPUnit_Framework_TestSuite
1716
colors: true

‎codeception.api.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ paths:
1111
support: tests/_support
1212
envs: tests/_envs
1313

14-
bootstrap: _bootstrap.php
1514
settings:
1615
suite_class: \PHPUnit_Framework_TestSuite
1716
colors: true

‎codeception.ci.functional.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ paths:
1111
support: tests/_support
1212
envs: tests/_envs
1313

14-
bootstrap: _bootstrap.php
1514
settings:
1615
suite_class: \PHPUnit_Framework_TestSuite
1716
colors: true

‎codeception.functional.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ paths:
1111
support: tests/_support
1212
envs: tests/_envs
1313

14-
bootstrap: _bootstrap.php
1514
settings:
1615
suite_class: \PHPUnit_Framework_TestSuite
1716
colors: true

‎codeception.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ paths:
1111
support: tests/_support
1212
envs: tests/_envs
1313

14-
bootstrap: _bootstrap.php
1514
settings:
1615
suite_class: \PHPUnit_Framework_TestSuite
1716
colors: true

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
"spryker-sdk/phpstan-spryker": "^0.4.0",
213213
"spryker-sdk/security-checker": "^0.1.0",
214214
"spryker/architecture-sniffer": "^0.5.5",
215-
"spryker/code-sniffer": "^0.16.6",
215+
"spryker/code-sniffer": "^0.17.18",
216216
"spryker/docker-chromedriver": "dev-master",
217217
"spryker/testify": "^3.47.0",
218218
"stecman/symfony-console-completion": "*",

‎composer.lock‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)