Skip to content

Update to Sylius 1.11 and PHP 8.0 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Sylius 1.11 and PHP 8.0 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "highest"
Expand All @@ -37,10 +36,10 @@ jobs:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
coverage: "none"
tools: "composer:v1"
tools: "composer"

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand All @@ -67,7 +66,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

dependencies:
- "highest"
Expand All @@ -82,10 +81,10 @@ jobs:
coverage: "none"
extensions: "${{ env.PHP_EXTENSIONS }}"
php-version: "${{ matrix.php-version }}"
tools: "composer:v1, composer-require-checker, composer-unused"
tools: "composer, composer-require-checker, composer-unused"

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand All @@ -103,8 +102,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "highest"
Expand All @@ -119,10 +117,10 @@ jobs:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
coverage: "none"
tools: "composer:v1"
tools: "composer"

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand All @@ -137,8 +135,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "lowest"
Expand All @@ -154,10 +151,10 @@ jobs:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
coverage: "none"
tools: "composer:v1"
tools: "composer"

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand All @@ -175,8 +172,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "highest"
Expand All @@ -194,10 +190,10 @@ jobs:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
coverage: "none"
tools: "composer:v1"
tools: "composer"

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand All @@ -220,7 +216,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

dependencies:
- "highest"
Expand All @@ -235,13 +231,13 @@ jobs:
coverage: "pcov"
extensions: "${{ env.PHP_EXTENSIONS }}"
php-version: "${{ matrix.php-version }}"
tools: "composer:v1"
tools: "composer"

- name: "Set up problem matchers for phpunit/phpunit"
run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""

- name: "Install composer dependencies"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"

Expand Down
47 changes: 27 additions & 20 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
],
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^8.0",
"sylius/sylius": "^1.11",
"ext-json": "*",
"ext-mbstring": "*",
"doctrine/doctrine-bundle": "^1.12.12 || ^2.0",
Expand All @@ -23,20 +24,20 @@
"setono/doctrine-orm-batcher": "^0.6.2",
"setono/doctrine-orm-batcher-bundle": "^0.3.1",
"sylius/resource-bundle": "^1.6",
"symfony/cache": "^4.4 || ^5.0",
"symfony/config": "^4.4 || ^5.0",
"symfony/console": "^4.4 || ^5.0",
"symfony/dependency-injection": "^4.4 || ^5.0",
"symfony/event-dispatcher": "^4.4 || ^5.0",
"symfony/form": "^4.4 || ^5.0",
"symfony/http-foundation": "^4.4 || ^5.0",
"symfony/lock": "^4.4 || ^5.0",
"symfony/messenger": "^4.4 || ^5.0",
"symfony/options-resolver": "^4.4 || ^5.0",
"symfony/routing": "^4.4 || ^5.0",
"symfony/cache": "^5.4",
"symfony/config": "^5.4",
"symfony/console": "^5.4",
"symfony/dependency-injection": "^5.4",
"symfony/event-dispatcher": "^5.4",
"symfony/form": "^5.4",
"symfony/http-foundation": "^5.4",
"symfony/lock": "^5.4",
"symfony/messenger": "^5.4",
"symfony/options-resolver": "^5.4",
"symfony/routing": "^5.4",
"symfony/translation-contracts": "^1.0 || ^2.0",
"symfony/validator": "^4.4 || ^5.0",
"symfony/workflow": "^4.4 || ^5.0",
"symfony/validator": "^5.4",
"symfony/workflow": "^5.4",
"thecodingmachine/safe": "^1.1",
"twig/twig": "^2.0 || ^3.0",
"webmozart/assert": "^1.1"
Expand All @@ -47,14 +48,20 @@
"phpunit/phpunit": "^9.4",
"roave/security-advisories": "dev-master",
"setono/code-quality-pack": "^1.1",
"sylius/sylius": "~1.9.0",
"symfony/debug-bundle": "^5.1",
"symfony/dotenv": "^5.1",
"symfony/intl": "^4.4 || ^5.0",
"symfony/web-profiler-bundle": "^4.4 || ^5.0"
"symfony/debug-bundle": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/framework-bundle": "^5.4",
"symfony/intl": "^5.4",
"symfony/web-profiler-bundle": "^5.4"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"ergebnis/composer-normalize": true,
"phpstan/extension-installer": true,
"symfony/thanks": true
}
},
"extra": {
"branch-alias": {
Expand Down
9 changes: 0 additions & 9 deletions easy-coding-standard.yml
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions ecs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\EasyCodingStandard\ValueObject\Option;

return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php');

$containerConfigurator->parameters()->set(Option::SKIP, [
VisibilityRequiredFixer::class => ['*Spec.php'],
]);
};
7 changes: 7 additions & 0 deletions tests/Application/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ DATABASE_URL=mysql://[email protected]/setono_sylius_mailchimp_%kernel.environment%
MAILER_URL=smtp://localhost
###< symfony/swiftmailer-bundle ###

###> symfony/messenger ###
# Choose one of the transports below
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
MESSENGER_TRANSPORT_DSN=doctrine://default
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
###< symfony/messenger ###

###> setono/sylius-mailchimp-plugin ###
# Get it from https://us4.admin.mailchimp.com/account/api/
MAILCHIMP_API_KEY=
Expand Down
Loading