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 branch 1.6.x into 2.0.x #1242

Merged
merged 69 commits into from
Apr 21, 2023
Merged

Merge branch 1.6.x into 2.0.x #1242

merged 69 commits into from
Apr 21, 2023

Conversation

ghostwriter
Copy link
Member

This patch updates 2.0.x branch with the changes from 1.6.x branch.

ohryan and others added 30 commits January 31, 2023 17:15
@ohryan
Updated TargetClassInterface to support getAttributes.
29a6407 
Added missing `getAttributes()` to `DefinedTargetClass`
@rneudorf-godaddy
Added getAttributes which returns \AllowDynamicProperties to `Und…
d2d52b5 
…efinedTargetClass`.

This will allow mocking undefined classes in php >= 8.2.
@rneudorf-godaddy
Added a Pass to write attributes to the mock.
fe9e0f7 
Added related test.
@rneudorf-godaddy
Updated test which fail with php >= 8.2
45d061a
@rneudorf-godaddy
Updated test which fail with php >= 8.2
557776b
@rneudorf-godaddy
Added test for setting dynamic properties on undefined classes in php…
b3a04e0 
… >= 8.2
@rneudorf-godaddy
Apply style fixes.
a52260c
@rneudorf-godaddy
Added php-cs-fix 3.x compatible config file
68b4fc3
@rneudorf-godaddy
Code style updates
de75a3a
@ghostwriter
Update Php80LanguageFeaturesTest.php
7ce1cb1 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update MockTest.php
b8401bd 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update MockingVoidMethodsTest.php
b75d9f6 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update MockingNullableMethodsTest.php
0df742b 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update MockeryCanMockMultipleInterfacesWhichOverlapTest.php
b634cf9 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update ExpectationTest.php
82f4dfc 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update ContainerTest.php
050778d 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update AllowsExpectsSyntaxTest.php
d3965a7 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Fix CS issue
a0bf01b 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Fix additional CS issue
a097d47 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add vimeo/psalm
63117f1 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Create psalm.xml.dist
45177de 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Create psalm-baseline.xml
df367cd 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
add psalm/plugin-phpunit
0dca220 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Enable Psalm PhpUnitPlugin
fa9cf2f 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add scripts to composer.json
628cdf0 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Refactoring risky tests (#1226)
bd8f225 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add vimeo/psalm and psalm/plugin-phpunit (#1230)
569f04d 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Switch to PSR-4 autoload (#1225)
a04cc4a 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@davedevelopment @ghostwriter
tidy: avoids require
5164b34
@ghostwriter
tidy: avoids require (#1218)
f9a7b32 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
ghostwriter and others added 25 commits April 17, 2023 19:18
@ghostwriter
Update tests.yml
8d46cd1 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Prevent CI run duplication (#1239)
9ff2fef 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Merge branch '1.5.x' into 1209/add-support-for-class-attributes
2055462
@ghostwriter
Update ExpectationTest.php
d90f674 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update ClassAttributesPassTest.php
7616b6d 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update ExpectationTest.php
6b8741a 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update UndefinedTargetClass.php
2325237 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update DefinedTargetClass.php
503977f 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update psalm-baseline.xml
d8f0815 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update psalm.xml.dist
cd39c18 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update psalm-baseline.xml
d2c322c 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Fix CS issue
4eda05e 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add Psalm issue handlers
0f8a16e 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Review PR
da56087 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Fix CS issue
d9ad5a1 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter @ohryan
Add support for target class attributes (#1210)
9eb7fad 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Co-authored-by: Ryan Neudorf <ryan.neudorf@gmail.com>
@ghostwriter
Create codecov.yml
c8589bb 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Create codecov.yml
e141b4b 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update phpunit.xml.dist
8043630 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add Code Coverage Badge
6665c0b 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add Supported PHP Version Badge
e93d255 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Add Type Coverage Badge
05bb5d1 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Fix Supported PHP Version
2636884 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Update README.md
dbf17ec 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter
Setup Codecov for code coverage (#1235)
e39a644 
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter ghostwriter marked this pull request as ready for review April 21, 2023 18:13
@ghostwriter ghostwriter merged commit e39a644 into 2.0.x Apr 21, 2023
12 checks passed
@ghostwriter ghostwriter added the Patch Backwards compatible bug fixes and improvements label Apr 30, 2023
@ghostwriter ghostwriter added this to the 1.6.0 milestone Apr 30, 2023
@ghostwriter ghostwriter self-assigned this May 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ghostwriter ghostwriter

Labels
Patch Backwards compatible bug fixes and improvements
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ghostwriter @ohryan @rneudorf-godaddy @davedevelopment @thomasschiet