Skip to content

Commit

Permalink
Merge pull request #205 from David-Crty/update/sylius-1-11
Browse files Browse the repository at this point in the history
Updating to sylius 1.11
  • Loading branch information
stefandoorn authored Feb 28, 2022
2 parents 65aed21 + 643d4c8 commit d008431
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ jobs:
matrix:
php: ["8.0", "7.4"]
symfony: ["^4.4", "^5.2"]
sylius: ["~1.9.0", "~1.10.0"]
sylius: ["~1.9.0", "~1.10.0", "~1.11.0"]
node: ["10.x"]
mysql: ["8.0"]

exclude:
-
php: "8.0"
sylius: "~1.9.0"
-
php: "7.4"
sylius: "~1.11.0"
-
symfony: "^4.4"
sylius: "~1.11.0"

env:
APP_ENV: test
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"license": "MIT",
"require": {
"php": "^7.4 || ^8.0",
"sylius/sylius": "~1.9.0 || ~1.10.0"
"sylius/sylius": "~1.9.0 || ~1.10.0 || ~1.11.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
Expand Down
7 changes: 7 additions & 0 deletions tests/Application/.env
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@ JWT_PASSPHRASE=love_and_vibes_plugin_development
# Delivery is disabled by default via "null://localhost"
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 ###
7 changes: 6 additions & 1 deletion tests/Application/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
use Symfony\Component\Routing\RouteCollectionBuilder;
use Sylius\Calendar\SyliusCalendarBundle;

final class Kernel extends BaseKernel
{
Expand All @@ -38,6 +39,10 @@ public function registerBundles(): iterable
continue;
}
yield from $this->registerBundlesFromFile($bundlesFile);

if(class_exists(SyliusCalendarBundle::class)) {
yield new SyliusCalendarBundle();
}
}
}

Expand Down Expand Up @@ -67,7 +72,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void

protected function getContainerBaseClass(): string
{
if ($this->isTestEnvironment()) {
if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) {
return MockerContainer::class;
}

Expand Down
Empty file.

0 comments on commit d008431

Please sign in to comment.