Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 0 additions & 47 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,64 +15,17 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.feature]
indent_style = space
indent_size = 4

[*.js]
indent_style = space
indent_size = 2

[*.json]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
indent_size = 4
trim_trailing_whitespace = false

[*.neon]
indent_style = space
indent_size = 4

[*.php]
indent_style = space
indent_size = 4

[*.sh]
indent_style = space
indent_size = 4

[*.{yaml,yml}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = false

[.babelrc]
indent_style = space
indent_size = 2

[.gitmodules]
indent_style = tab
indent_size = 4

[.php_cs{,.dist}]
indent_style = space
indent_size = 4

[composer.json]
indent_style = space
indent_size = 4

[package.json]
indent_style = space
indent_size = 2

[phpstan.neon]
indent_style = space
indent_size = 4

[phpunit.xml{,.dist}]
indent_style = space
indent_size = 4
88 changes: 47 additions & 41 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: vimeo/psalm
versions:
- 4.5.0
- 4.5.1
- 4.5.2
- 4.6.0
- 4.6.1
- 4.6.2
- 4.6.3
- 4.7.0
- 4.7.1
- dependency-name: phpstan/phpstan
versions:
- 0.12.70
- 0.12.71
- 0.12.73
- 0.12.75
- 0.12.76
- 0.12.77
- 0.12.78
- 0.12.80
- 0.12.81
- 0.12.83
- 0.12.84
- dependency-name: sylius-labs/coding-standard
versions:
- 4.0.2
- dependency-name: phpstan/phpstan-doctrine
versions:
- 0.12.32
- dependency-name: phpstan/phpstan-webmozart-assert
versions:
- 0.12.10
- 0.12.11
-
package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
ignore:
-
dependency-name: vimeo/psalm
versions:
- 4.5.0
- 4.5.1
- 4.5.2
- 4.6.0
- 4.6.1
- 4.6.2
- 4.6.3
- 4.7.0
- 4.7.1
-
dependency-name: phpstan/phpstan
versions:
- 0.12.70
- 0.12.71
- 0.12.73
- 0.12.75
- 0.12.76
- 0.12.77
- 0.12.78
- 0.12.80
- 0.12.81
- 0.12.83
- 0.12.84
-
dependency-name: sylius-labs/coding-standard
versions:
- 4.0.2
-
dependency-name: phpstan/phpstan-doctrine
versions:
- 0.12.32
-
dependency-name: phpstan/phpstan-webmozart-assert
versions:
- 0.12.10
- 0.12.11
90 changes: 50 additions & 40 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
paths-ignore:
- "*.md"
release:
types: [created]
types: [ created ]
schedule:
-
cron: "0 1 * * 6" # Run at 1am every Saturday
Expand All @@ -29,47 +29,49 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.3"]
symfony: ["^6.4", "^7.4"]
sylius: ["~2.0.0", "~2.1.0", "~2.2.0"]
database: ["mysql:8.4"]
node: ["22.x"]

exclude:
- sylius: "~2.0.0"
symfony: "^7.4"
php: [ "8.3", "8.4" ]
symfony: [ "^6.4", "^7.4" ]
sylius: [ "~2.1.0", "~2.2.0" ]
database: [ "mysql:8.4" ]
node: [ "22.x" ]

include:
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mysql:8.0"
node: "22.x"
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mariadb:10.11"
node: "22.x"
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mariadb:11.4"
node: "22.x"
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:15"
node: "22.x"
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:16"
node: "22.x"
- php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:17"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mysql:8.0"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mariadb:10.11"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "mariadb:11.4"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:15"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:16"
node: "22.x"
-
php: "8.3"
symfony: "^7.4"
sylius: "~2.2.0"
database: "postgres:17"
node: "22.x"

env:
APP_ENV: test
Expand All @@ -91,6 +93,14 @@ jobs:
sylius_version: "${{ matrix.sylius }}"
symfony_version: "${{ matrix.symfony }}"

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

-
name: Run PHPStan
run: vendor/bin/phpstan analyse

-
name: Run unit tests
run: vendor/bin/phpunit --colors=always --testsuite=unit
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ To be able to set up a plugin's database, remember to configure your database cr
- PHPStan

```bash
vendor/bin/phpstan analyse -c phpstan.neon -l max src/
vendor/bin/phpstan analyse
```

- Coding Standard
Expand Down
2 changes: 1 addition & 1 deletion assets/shop/js/greetings.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
setTimeout(function () {
document.getElementById('greeting').innerHTML = document.getElementById('greeting').dataset.greeting;
document.getElementById('greeting').innerHTML = document.getElementById('greeting').dataset.greeting;
}, 1000);
2 changes: 1 addition & 1 deletion compose.override.dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
volumes:
- .:/srv/sylius:rw,cached
- ./public:/srv/sylius/public:rw,delegated
mailhog:
mailpit:
ports:
- "8025:8025"

Expand Down
4 changes: 2 additions & 2 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ services:
image: ghcr.io/sylius/sylius-nginx:latest
depends_on:
- php
mailhog:
mailpit:
# do not use in production!
image: mailhog/mailhog:latest
image: axllent/mailpit:latest
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"require-dev": {
"behat/behat": "^3.16",
"behat/mink": "^1.13",
"dbrekelmans/bdi": "^1.4",
"dmore/behat-chrome-extension": "^1.4",
"dmore/chrome-mink-driver": "^2.9",
"friends-of-behat/mink": "^1.11",
"friends-of-behat/mink-browserkit-driver": "^1.6",
"friends-of-behat/mink-debug-extension": "^2.1",
"friends-of-behat/mink-extension": "^2.7",
Expand Down
9 changes: 9 additions & 0 deletions config/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $containerConfigurator) {
$containerConfigurator->import('twig_hooks/**/*.php');
};
4 changes: 0 additions & 4 deletions config/config.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions config/routes/admin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

declare(strict_types=1);

use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;

return static function (RoutingConfigurator $routes): void {
};
1 change: 0 additions & 1 deletion config/routes/admin.yaml

This file was deleted.

22 changes: 22 additions & 0 deletions config/routes/shop.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

use Acme\SyliusExamplePlugin\Controller\GreetingController;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;

return static function (RoutingConfigurator $routes): void {
$routes->add('acme_sylius_example_static_welcome', '/static-welcome/{name}')
->defaults([
'_controller' => [GreetingController::class, 'staticallyGreetAction'],
'name' => null,
])
;

$routes->add('acme_sylius_example_dynamic_welcome', '/dynamic-welcome/{name}')
->defaults([
'_controller' => [GreetingController::class, 'dynamicallyGreetAction'],
'name' => null,
])
;
};
13 changes: 0 additions & 13 deletions config/routes/shop.yaml

This file was deleted.

9 changes: 9 additions & 0 deletions config/services.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $containerConfigurator) {
$containerConfigurator->import('services/*.php');
};
Loading