Skip to content

Commit

Permalink
CC-16708 Update Demoshops to use PHP 7.4 by default
Browse files Browse the repository at this point in the history
  • Loading branch information
pyvovarov-s committed May 11, 2022
1 parent f8d457f commit 76ec8a8
Show file tree
Hide file tree
Showing 11 changed files with 239 additions and 134 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ jobs:
docker/sdk testing console queue:worker:start --stop-when-empty
docker/sdk testing codecept run -c codeception.api.yml
php-73-postgresql-acceptance-alpine:
name: "PHP 7.3 / PostgreSQL / Acceptance / Alpine"
php-74-postgresql-acceptance-alpine:
name: "PHP 7.4 / PostgreSQL / Acceptance / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.3
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
TRAVIS: 1

steps:
Expand All @@ -212,12 +212,12 @@ jobs:
docker/sdk testing codecept run -c codeception.acceptance.yml
php-73-postgresql-functional-alpine:
name: "PHP 7.3 / PostgreSQL / Functional / Alpine"
php-74-postgresql-functional-alpine:
name: "PHP 7.4 / PostgreSQL / Functional / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.3
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
TRAVIS: 1

steps:
Expand Down Expand Up @@ -297,12 +297,12 @@ jobs:
docker/sdk testing codecept run -c codeception.functional.yml
php-73-postgres-functional-debian:
name: "PHP 7.3 / PostgreSQL / Functional / Debian"
php-74-postgres-functional-debian:
name: "PHP 7.4 / PostgreSQL / Functional / Debian"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.3-debian
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4-debian
TRAVIS: 1

steps:
Expand All @@ -329,7 +329,7 @@ jobs:
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.3-alpine3.12
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4-alpine3.12
steps:
- uses: actions/checkout@v2
- run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
Expand Down
12 changes: 8 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Spryker B2C Demo Shop",
"license": "proprietary",
"require": {
"php": ">=7.3",
"php": ">=7.4",
"ext-bcmath": "*",
"ext-curl": "*",
"ext-gd": "*",
Expand Down Expand Up @@ -70,6 +70,7 @@
"spryker/auth-rest-api": "^2.14.0",
"spryker/availability-cart-connector": "^7.3.0",
"spryker/availability-notifications-rest-api": "^1.0.0",
"spryker/barcode-laminas": "^1.1",
"spryker/cart-codes-rest-api": "^1.3.1",
"spryker/cart-currency-connector": "^1.1.5",
"spryker/cart-note-product-bundle-connector": "^1.0.3",
Expand Down Expand Up @@ -97,7 +98,6 @@
"spryker/cms-slot-locale-connector": "^1.0.1",
"spryker/cms-slot-store-connector": "^1.0.1",
"spryker/cms-user-connector": "^1.1.1",
"spryker/code-it-now": "^1.0.0",
"spryker/configurable-bundles-products-resource-relationship": "^1.0.0",
"spryker/configurable-bundles-rest-api": "^1.0.1",
"spryker/content-banners-rest-api": "^2.2.0",
Expand Down Expand Up @@ -232,15 +232,19 @@
"config": {
"preferred-install": "dist",
"platform": {
"php": "7.3.15"
"php": "7.4.20"
},
"use-include-path": true,
"sort-packages": true,
"github-protocols": [
"https"
],
"process-timeout": 900,
"chromium-revision": 814168
"chromium-revision": 814168,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"sllh/composer-versions-check": true
}
},
"scripts": {
"compile": [
Expand Down
Loading

0 comments on commit 76ec8a8

Please sign in to comment.