Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Doctrine persistence version 3.0 #493

Merged
merged 6 commits into from
Feb 3, 2023
Merged
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
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ on:
jobs:
tests:
runs-on: ubuntu-latest
name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Twig ${{ matrix.twig }}"
name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Twig ${{ matrix.twig }}, Persistence: ${{ matrix.persistence }}"
strategy:
fail-fast: false
matrix:
php: ["8.0", "8.1"]
symfony: ["^5.4", "~6.0.0", "~6.1.0"]
twig: ["^2.12", "^3.0"]
persistence: ["^2.0", "^3.0"]
exclude:
-
php: "8.0"
Expand Down Expand Up @@ -50,6 +51,11 @@ jobs:
if: matrix.twig != ''
run: composer require "twig/twig:${{ matrix.twig }}" --no-update --no-scripts

-
name: Restrict doctrine/persistence version
if: matrix.persistence != ''
run: composer require "doctrine/persistence:${{ matrix.persistence }}" --no-update --no-scripts

-
name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"php": "^8.0",
"babdev/pagerfanta-bundle": "^3.0",
"doctrine/collections": "^1.6",
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/event-manager": "^1.1",
"doctrine/inflector": "^1.4 || ^2.0",
"doctrine/persistence": "^1.3 || ^2.0",
"doctrine/persistence": "^2.0 || ^3.0",
"friendsofsymfony/rest-bundle": "^3.0",
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
"jms/serializer-bundle": "^3.5 || ^4.0",
Expand Down
2 changes: 2 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ parameters:
- '/Method Sylius\\Component\\Resource\\Model\\ResourceInterface::getId\(\) has no return typehint specified./'
- '/Method Sylius\\Component\\Resource\\Model\\TimestampableInterface::setCreatedAt\(\) has no return typehint specified./'
- '/Method Sylius\\Component\\Resource\\Model\\TimestampableInterface::setUpdatedAt\(\) has no return typehint specified./'
- '/Method Sylius\\Component\\Resource\\Repository\\InMemoryRepository::findBy\(\) has parameter \$limit with no type specified./'
- '/Method Sylius\\Component\\Resource\\Repository\\InMemoryRepository::findBy\(\) has parameter \$offset with no type specified./'
- '/Method Symfony\\Component\\Routing\\RouteCollection::add\(\) invoked with 3 parameters, 2 required\./'
- '/Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required\./'
- '/Parameter \#1 \$currentPage of method Pagerfanta\\Pagerfanta<mixed>::setCurrentPage\(\) expects int<1, max>, int given\./'
Expand Down
1 change: 1 addition & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
<MissingParamType>
<errorLevel type="suppress">
<file name="src/Bundle/Routing/ResourceLoader.php" />
<file name="src/Component/Repository/InMemoryRepository.php" />
</errorLevel>
</MissingParamType>

Expand Down