Skip to content

Commit e77ae13

Browse files
authored
Merge pull request #44 from maximehuran/feature/1.14
2 parents 4e5d44a + 81bac30 commit e77ae13

File tree

9 files changed

+13
-23
lines changed

9 files changed

+13
-23
lines changed

.github/workflows/recipe.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: ['8.0', '8.1', '8.2']
18-
sylius: ["~1.11.0", "~1.12.0", "~1.13.0"]
19-
exclude:
20-
- php: '8.2'
21-
sylius: '~1.11.0'
22-
- php: '8.0'
23-
sylius: '~1.12.0'
24-
- php: '8.0'
25-
sylius: '~1.13.0'
17+
php: ['8.1', '8.2', '8.3']
18+
sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
2619

2720
steps:
2821
- name: Setup PHP

.github/workflows/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php: ['8.1', '8.2']
16+
php: ['8.1', '8.2', '8.3']
1717

1818
steps:
1919
- uses: actions/checkout@v3

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: ['8.1', '8.2']
17+
php: ['8.1', '8.2', '8.3']
1818

1919
env:
2020
SYMFONY_ARGS: --no-tls

.php-version.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.2
1+
8.3

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=1.13.0
4+
SYLIUS_VERSION=1.14.0
55
SYMFONY=cd ${APP_DIR} && symfony
66
COMPOSER=symfony composer
77
CONSOLE=${SYMFONY} console

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ This plugins allows you to manage your menus.
1111

1212
## Compatibility
1313

14-
| Sylius Version | PHP Version |
15-
|---|---|
16-
| 1.11 | 8.0 - 8.1 |
17-
| 1.12 | 8.1 - 8.2 |
18-
| 1.13 | 8.1 - 8.2 |
14+
| Sylius Version | PHP Version |
15+
|----------------|-----------------|
16+
| 1.12 | 8.1 - 8.2 - 8.3 |
17+
| 1.13 | 8.1 - 8.2 - 8.3 |
18+
| 1.14 | 8.1 - 8.2 - 8.3 |
1919

2020
## Installation
2121

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "This plugins allows you to manage menus.",
66
"license": "MIT",
77
"require": {
8-
"php": "^8.0",
9-
"sylius/sylius": ">=1.11 <1.14"
8+
"php": "^8.1",
9+
"sylius/sylius": ">=1.12 <2.0"
1010
},
1111
"require-dev": {
1212
"friendsofphp/php-cs-fixer": "^3.16",

docker-compose.yaml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.8'
21
services:
32
database:
43
image: mysql:8.0

src/Repository/MenuItemRepository.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public function getLastPositionWithinMenu(MenuInterface $menu): int
3434
->setParameter('menu', $menu)
3535
;
3636

37-
/** @phpstan-ignore-next-line */
3837
return (int) $queryBuilder->getQuery()->getSingleScalarResult();
3938
}
4039

@@ -51,7 +50,6 @@ public function getLastPositionWithinMenuItem(MenuItemInterface $menuItem): int
5150
->setParameter('parent', $menuItem)
5251
;
5352

54-
/** @phpstan-ignore-next-line */
5553
return (int) $queryBuilder->getQuery()->getSingleScalarResult();
5654
}
5755
}

0 commit comments

Comments
 (0)