Skip to content

Commit 024a27b

Browse files
author
Maxime
authored
Merge pull request #19 from delyriand/chore/allow-sylius-2.x
feat(deps): Allow Sylius 2.1 and more
2 parents 163dc44 + 4d88552 commit 024a27b

File tree

6 files changed

+44
-5
lines changed

6 files changed

+44
-5
lines changed

.github/workflows/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
php: ['8.2', '8.3']
18-
sylius: ["~2.0.0"]
18+
sylius: [ '~2.0.0', '~2.0.1' ]
1919

2020
steps:
2121
- name: Setup PHP

.php-cs-fixer.dist.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
declare(strict_types=1);
1313

14+
use PhpCsFixer\UnsupportedPhpVersionAllowedConfigInterface;
15+
1416
$header = <<<'HEADER'
1517
This file is part of Monsieur Biz' Alert Message plugin for Sylius.
1618
@@ -267,4 +269,8 @@
267269
->setFinder($finder)
268270
;
269271

272+
if ($config instanceof UnsupportedPhpVersionAllowedConfigInterface) {
273+
$config->setUnsupportedPhpVersionAllowed(true);
274+
}
275+
270276
return $config;

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL := help
22
SHELL=/bin/bash
33
APP_DIR=tests/Application
4-
SYLIUS_VERSION=2.0.0
4+
SYLIUS_VERSION=2.1.0
55
SYMFONY=cd ${APP_DIR} && symfony
66
COMPOSER=symfony composer
77
CONSOLE=${SYMFONY} console

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ By default it'll use the Semantic UI classes.
2020

2121
| Sylius Version | PHP Version |
2222
|----------------|-----------------|
23-
| 2.0 | 8.2 - 8.3 |
23+
| 2.0, 2.1 | 8.2 - 8.3 |
2424

2525
ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusAlertMessagePlugin/tree/1.x) and all 1.x releases.
2626

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": "^8.2",
9-
"sylius/sylius": "~2.0.0"
9+
"sylius/sylius": "~2.0"
1010
},
1111
"require-dev": {
1212
"friendsofphp/php-cs-fixer": "^3.16",
@@ -28,7 +28,7 @@
2828
"cache:clear": "symfony-cmd",
2929
"assets:install %PUBLIC_DIR%": "symfony-cmd"
3030
},
31-
"phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=no",
31+
"phpcs": "php-cs-fixer fix --using-cache=no",
3232
"phpstan": "phpstan analyse -c phpstan.neon src/",
3333
"phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml",
3434
"phpunit": "phpunit",
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Monsieur Biz' Alert Message plugin for Sylius.
5+
*
6+
* (c) Monsieur Biz <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE.txt
9+
* file that was distributed with this source code.
10+
*/
11+
12+
declare(strict_types=1);
13+
14+
namespace App\Context\Channel\RequestBased;
15+
16+
use Sylius\Component\Channel\Context\RequestBased\RequestResolverInterface;
17+
use Sylius\Component\Channel\Model\ChannelInterface;
18+
use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
19+
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
20+
use Symfony\Component\HttpFoundation\Request;
21+
22+
#[AutoconfigureTag('sylius.context.channel.request_based.resolver')]
23+
final class HostnameAndPortBasedRequestResolver implements RequestResolverInterface
24+
{
25+
public function __construct(private ChannelRepositoryInterface $channelRepository)
26+
{
27+
}
28+
29+
public function findChannel(Request $request): ?ChannelInterface
30+
{
31+
return $this->channelRepository->findOneEnabledByHostname($request->getHost() . ':' . $request->getPort());
32+
}
33+
}

0 commit comments

Comments
 (0)