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

Jump to bottom

merge 3.x => 3.next #1004

Merged
merged 9 commits into from
Sep 13, 2024
Merged

merge 3.x => 3.next #1004

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aaa021a
Correct asserted view code
ravage84 Apr 26, 2024
b4167f8
Skip test case that behaves differently with older CakePHP versions
ravage84 Apr 26, 2024
7d7c919
Merge pull request #986 from cakephp/2.x-assert-nick
dereuromark Apr 26, 2024
28783da
update stan
LordSimal Aug 8, 2024
e7dd9ef
Merge pull request #1000 from cakephp/update-stan
ADmad Aug 8, 2024
99d7655
Merge branch '2.x' into 3.x-merge
LordSimal Sep 13, 2024
46ecd86
remove version check in tests
LordSimal Sep 13, 2024
c7f1806
Merge pull request #1003 from cakephp/3.x-merge
ADmad Sep 13, 2024
bcca4f6
Merge branch '3.x' into 3.next-merge
LordSimal Sep 13, 2024
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
2 changes: 1 addition & 1 deletion .phive/phars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpstan" version="1.11.6" installed="1.11.6" location="./tools/phpstan" copy="false"/>
<phar name="phpstan" version="1.11.9" installed="1.11.9" location="./tools/phpstan" copy="false"/>
<phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
</phive>