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.

Sign up for GitHub

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

Merge release 4.6.2 into 4.7.x #786

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Merge release 4.6.2 into 4.7.x #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
600c2fb
Update ServiceRepositoryTrait with missing ManagerRegistry param
mustanggb Oct 25, 2023
0a533e9
Merge pull request #782 from mustanggb/param-managerregistry
malarzm Oct 25, 2023
97cb39e
Fix SYMFONY_REQUIRE env var
franmomu Oct 25, 2023
6b53426
Merge pull request #785 from franmomu/fix_symfony_require
malarzm Oct 25, 2023
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
21 changes: 11 additions & 10 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: "PHPUnit"
runs-on: "${{ matrix.os }}"
env:
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
SYMFONY_REQUIRE: ${{matrix.symfony-version}}

strategy:
matrix:
Expand All @@ -29,9 +29,9 @@ jobs:
stability:
- "stable"
symfony-version:
- "5.4.x"
- "6.2.x"
- "6.3.x"
- "5.4.*"
- "6.2.*"
- "6.3.*"
driver-version:
- "stable"
dependencies:
Expand All @@ -45,9 +45,13 @@ jobs:
symfony-version: "5.4.*"
exclude:
- php-version: "7.4"
symfony-version: "6.2.x"
symfony-version: "6.2.*"
- php-version: "7.4"
symfony-version: "6.3.x"
symfony-version: "6.3.*"
- php-version: "8.0"
symfony-version: "6.2.*"
- php-version: "8.0"
symfony-version: "6.3.*"

services:
mongodb:
Expand Down Expand Up @@ -80,14 +84,11 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-version }}"
tools: "pecl"
tools: "pecl, flex"
extensions: "mongodb-${{ matrix.driver-version }}"
coverage: "pcov"
ini-values: "zend.assertions=1"

- name: "Globally install symfony/flex"
run: "composer global require --no-progress --no-scripts --no-plugins symfony/flex && composer global config --no-plugins allow-plugins.symfony/flex true"

- name: "Set minimum-stability to stable in Composer"
run: "composer config minimum-stability ${{ matrix.stability }}"

Expand Down
3 changes: 2 additions & 1 deletion Repository/ServiceRepositoryTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
trait ServiceRepositoryTrait
{
/**
* @param string $documentClass The class name of the entity this repository manages
* @param ManagerRegistry $registry The ManagerRegistry to use
* @param string $documentClass The class name of the entity this repository manages
* @psalm-param class-string<T> $documentClass
*/
public function __construct(ManagerRegistry $registry, $documentClass)
Expand Down
Loading