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

merge 2.next into 3.x #630

Merged
merged 12 commits into from
Sep 4, 2023
Merged

merge 2.next into 3.x #630

merged 12 commits into from
Sep 4, 2023

Conversation

LordSimal
Copy link
Contributor

There were no psalm errors any more so I was able to remove the baseline file.

LordSimal and others added 12 commits April 24, 2023 20:40
2.next: fix CakePHP 4.5 deprecations and update stan setup
# Conflicts:
#	tests/TestCase/Authenticator/CookieAuthenticatorTest.php
I ran into issues installing authentication alongside repl because
of the dev- dependency. Also with RC1 out we can start requiring that
instead of a dev revision.
Increase stability of cakephp requirement
# Conflicts:
#	.gitignore
#	.phive/phars.xml
#	composer.json
#	phpstan-baseline.neon
#	psalm-baseline.xml
#	psalm.xml
#	src/AbstractCollection.php
#	src/IdentityInterface.php
@LordSimal LordSimal merged commit 74fee21 into 3.x Sep 4, 2023
6 checks passed
@LordSimal LordSimal deleted the 3.x-merge-2.next branch September 4, 2023 11:18
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.

3 participants