Skip to content

Commit

Permalink
Merge pull request #49 from tomkalon/feature/op-451-refactored
Browse files Browse the repository at this point in the history
Feature/OP-451 - Added Sylius 1.13 Support and refactored files structure
  • Loading branch information
senghe authored Sep 16, 2024
2 parents 63a5b3b + defe03b commit d1bb5e9
Show file tree
Hide file tree
Showing 87 changed files with 835 additions and 837 deletions.
41 changes: 25 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,24 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.0"]
symfony: ["^5.4", "^6.0"]
sylius: ["~1.11.0", "~1.12.0"]
node: ["^14.17.x"]
mysql: ["5.7", "8.0"]

php: [ "8.0", "8.1", "8.2", "8.3" ]
symfony: [ "^5.4", "^6.0" ]
sylius: [ "~1.12.0", "~1.13.0" ]
node: [ "18.x", "20.x" ]
mysql: [ "8.0" ]
exclude:
- # Segmentation fault while clearing cache
php: 8.0
mysql: 5.7
- sylius: ~1.11.0
symfony: ^6.0
- sylius: "~1.13.0"
php: "8.0"
- sylius: "~1.12.0"
php: "8.0"
symfony: "^6.4"

env:
APP_ENV: test
DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -49,7 +48,7 @@ jobs:
coverage: none

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "${{ matrix.node }}"

Expand Down Expand Up @@ -152,25 +151,35 @@ jobs:
- name: Run PHPSpec
run: vendor/bin/phpspec run --ansi -f progress --no-interaction

- name: Run PHPUnit
run: vendor/bin/phpunit --colors=always

-
name: Run PHPStan
run: vendor/bin/phpstan analyse -c phpstan.neon.dist -l 8 src/

- name: Run ECS
run: vendor/bin/ecs

- name: Run Behat
run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun

- name: Upload Behat logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: failure()
with:
name: Behat logs
path: etc/build/
if-no-files-found: ignore

- name: Upload test log logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: failure()
with:
name: Var logs
path: tests/Application/var/log/
if-no-files-found: ignore

- name: Failed build Slack notification
uses: rtCamp/action-slack-notify@v2
if: ${{ failure() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ This plugin allows users to create multiple carts for their own use.

# Installation
---
The SyliusMulticartPlugin installation process can be found **[here](./doc/01-installation.md).**
The SyliusMulticartPlugin installation process can be found **[here](./doc/installation.md).**

# Testing
---
Expand Down
31 changes: 14 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
"license": "MIT",
"require": {
"php": "^8.0",
"sylius/sylius": "~1.11.0 || ~1.12.0"
"sylius/sylius": "~1.12.0 || ~1.13.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
"behat/behat": "^3.7",
"behat/mink-selenium2-driver": "^1.4",
"bitbag/coding-standard": "^1.0",
"bitbag/coding-standard": "^3.0",
"dmore/behat-chrome-extension": "^1.3",
"dmore/chrome-mink-driver": "^2.7",
"friends-of-behat/mink": "^1.8",
"friends-of-behat/mink-browserkit-driver": "^1.4",
"friends-of-behat/mink-debug-extension": "^2.0.0",
"friends-of-behat/mink-debug-extension": "^2.0",
"friends-of-behat/mink-extension": "^2.4",
"friends-of-behat/page-object-extension": "^0.3",
"friends-of-behat/suite-settings-extension": "^1.0",
Expand All @@ -28,20 +28,21 @@
"lchrusciel/api-test-case": "^5.2",
"phpspec/phpspec": "^7.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "0.12.85",
"phpstan/phpstan-doctrine": "0.12.33",
"phpstan/phpstan-strict-rules": "^0.12.0",
"phpstan/phpstan-webmozart-assert": "0.12.12",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-strict-rules": "^1.3.0",
"phpstan/phpstan-webmozart-assert": "^1.2.0",
"phpunit/phpunit": "^9.5",
"sylius-labs/coding-standard": "^4.0",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/debug-bundle": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || ^6.0",
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
"symfony/webpack-encore-bundle": "^1.13",
"vimeo/psalm": "4.12",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
"symfony/webpack-encore-bundle": "^1.16",
"vimeo/psalm": "4.27",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"doctrine/dbal": "^2.7 || ^3.0"
},
"config": {
"sort-packages": true,
Expand All @@ -51,11 +52,6 @@
"symfony/thanks": false
}
},
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
}
},
"autoload": {
"psr-4": {
"BitBag\\SyliusMultiCartPlugin\\": "src/",
Expand All @@ -79,6 +75,7 @@
]
},
"conflict": {
"doctrine/dbal": "^3.0"
"behat/mink-selenium2-driver": ">=1.7.0",
"doctrine/persistence": "<3.0"
}
}
Loading

0 comments on commit d1bb5e9

Please sign in to comment.