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

Update ORM to 2.11 #455

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

Conversation

gregcorbett
Copy link
Member

Replaces closed #344 as fork has been deleted.

Depends on #454

Closes #335

Ian Neilson added 11 commits June 16, 2022 11:50
After update to PHP7.4 but before change
to ORM2.6.
Moving to PHP7.4 generates some Notice reports from the
Doctrine code which cause tests to fail. This can be switched
back on for later ORM versions where this is fixed.
As of PHP 7.2.0 count() yields a warning on invalid countable types passed to the value parameter.
Removes various unit test errors.
Moving to PHP7.4 generated Notice reports during phpunit
tests for ORM 2.5.14. This re-enables the reports which were
temporarily switched off to allow the tests to run.
@gregcorbett gregcorbett self-assigned this May 9, 2023
@gregcorbett gregcorbett requested a review from a team as a code owner May 9, 2023 07:51
@gregcorbett gregcorbett changed the title ORM 2.5 and upwards to 2.11 Update ORM to 2.11 May 24, 2023
Copy link
Member

@rowan04 rowan04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in every file other than composer.lock are the same as in PR #344.
There is a difference of about 300 additions/deletions between the changes made to composer.lock in this PR and #344, with more changes being made to #344.
There are a couple more lines changed to composer.json in #344 than this PR - I think this is due to updates in other PRs made between these two PRs, and not a problem.
Apart from that, the other files are the same.

@gregcorbett
Copy link
Member Author

The changes in every file other than composer.lock are the same as in PR #357. There is a difference of about 300 additions/deletions between the changes made to composer.lock in this PR and #344, with more changes being made to #344. There are a couple more lines changed to composer.json in #344 than this PR - I think this is due to updates in other PRs made between these two PRs, and not a problem. Apart from that, the other files are the same.

I assume the first reference to #357 should be #344 ?

Thanks again for this, RE: composer.json - yes, the difference seems to be because 4dad3cd has already been merged.

As mentioned in #454, composer.lock needs regenerating anyway before merging - so if that's the only hard to explain difference I am happy with that 😋

@rowan04
Copy link
Member

rowan04 commented May 30, 2023

The changes in every file other than composer.lock are the same as in PR #357. There is a difference of about 300 additions/deletions between the changes made to composer.lock in this PR and #344, with more changes being made to #344. There are a couple more lines changed to composer.json in #344 than this PR - I think this is due to updates in other PRs made between these two PRs, and not a problem. Apart from that, the other files are the same.

I assume the first reference to #357 should be #344 ?

Thanks again for this, RE: composer.json - yes, the difference seems to be because 4dad3cd has already been merged.

As mentioned in #454, composer.lock needs regenerating anyway before merging - so if that's the only hard to explain difference I am happy with that 😋

yep i've updated it to #344.

@gregcorbett gregcorbett added this to the September 2023 milestone Jan 30, 2024
@gregcorbett gregcorbett mentioned this pull request Apr 22, 2024
4 tasks
This was referenced Sep 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move to newer version of Doctrine (2.5 at least)
2 participants