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

Update to laminas/laminas-coding-standard:2.3.x, improved types and internal API #103

Merged
merged 11 commits into from
Jul 6, 2022
Merged

Update to laminas/laminas-coding-standard:2.3.x, improved types and internal API #103

merged 11 commits into from
Jul 6, 2022

Conversation

gsteel
Copy link
Member

@gsteel gsteel commented Jul 6, 2022

Q A
QA yes

Description

Does the donkey work upgrading to LCS 2.3

Changes to tests and src are in separate commits

gsteel added 8 commits July 6, 2022 14:03
@gsteel
Update Laminas Coding Standard to 2.3.0 and psalm to the most recent …
2488fc7 
…minor version

Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
Newly detected psalm errors base lined
bf7d286 
These errors are primarily missing class, and missing file for legacy Zend purposes

Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
Update phpcs ruleset with correct rule reference and xsd, ignoring ca…
9d22611 
…che file

Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
qa: general, automated and primarily whitespace CS fixes
dfc42c1 
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
qa: Applies CS fixes to all test code, fixing new psalm errors and 54…
b54995e 
…4 others 💪

Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
qa: apply CS fixes
cd02372 
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
Baseline newly discovered psalm issues in src/
1341d78 
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
Bump interop integration tests to fix test failures on lowest
defeaf5 
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel gsteel force-pushed the update-laminas-coding-standard branch from 537a567 to defeaf5 Compare July 6, 2022 15:47
@gsteel
Copy link
Member Author

gsteel commented Jul 6, 2022

@Ocramius …
Integration tests are failing on 8.0 and 8.1 at

laminas-diactoros/src/Stream.php

Line 339 in c1a6111

$resource = fopen($stream, $mode);

I think this is because an empty path is throwing a ValueError in fopen - In order to fix this failure, we'll need to explicitly check for the empty path and throw the expected exception right?

@gsteel
Copy link
Member Author

gsteel commented Jul 6, 2022

OK, I take that last comment back - for some reason, the error handler is being ignored on 8.0 and 8.1 - this is all stuff that hasn't been touched by this PR so I'm a little bit confused as to why CI would be failing here…

Ocramius
Ocramius approved these changes Jul 6, 2022
View reviewed changes
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

Awesome, thanks @gsteel!

@Ocramius
Copy link
Member

Ocramius commented Jul 6, 2022

Ah, I did not notice the failures. I have another branch where I did this, and will propose a patch 🤔

@Ocramius
Copy link
Member

Ocramius commented Jul 6, 2022

Opened #104 - unsure if failures are comparable

@Ocramius Ocramius added this to the 2.13.0 milestone Jul 6, 2022
gsteel added 2 commits July 6, 2022 17:58
@gsteel
Removes the GMP case from the data provider
4f7b49b 
The test is checking for exceptional situations for non-stream resources and given the other cases are more likely to run (i.e. GMP is probably not installed), it's not worth the psalm errors

Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel
Bump PHPUnit to ^9.5
091cd93 
Signed-off-by: George Steel <george@net-glue.co.uk>
Ocramius
Ocramius reviewed Jul 6, 2022
View reviewed changes
src/Stream.php Outdated
try {
$resource = fopen($stream, $mode);
} catch (Throwable $e) {
throw new Exception\RuntimeException('Invalid stream reference provided');
Copy link
Member

Choose a reason for hiding this comment

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

We should really rethrow the previous exception

Copy link
Member

Choose a reason for hiding this comment

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

s/rethrow/include

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you think it's a reasonable change - tests are now passing locally for me on 8.x
… The previous behaviour was to throw what's there - I'll amend to add previous perhaps? The integration tests would fail with anything other than a RuntimeException afaict

Copy link
Member

Choose a reason for hiding this comment

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

I think this is really only in case of a stream error - an exception should be rare, but is a healthy approach to a failure.

@gsteel
Change set/restore error handler to a try/catch block
98f1d99 
Signed-off-by: George Steel <george@net-glue.co.uk>
@gsteel gsteel force-pushed the update-laminas-coding-standard branch from 122bc9b to 98f1d99 Compare July 6, 2022 19:21
@Ocramius Ocramius mentioned this pull request Jul 6, 2022
Closed
Ocramius
Ocramius approved these changes Jul 6, 2022
View reviewed changes
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

LGTM 🚢

@Ocramius Ocramius self-assigned this Jul 6, 2022
@Ocramius Ocramius changed the title Update laminas coding standard Update to laminas/laminas-coding-standard:2.3.x, improved types and internal API Jul 6, 2022
@Ocramius Ocramius merged commit 739ad4d into laminas:2.13.x Jul 6, 2022
@gsteel gsteel deleted the update-laminas-coding-standard branch July 6, 2022 20:55
@boesing boesing mentioned this pull request Jul 7, 2022
Closed
@Ocramius Ocramius mentioned this pull request Jul 7, 2022
Merged
Ocramius added a commit to Ocramius/laminas-diactoros that referenced this pull request Jul 7, 2022
@Ocramius
Refined types as per laminas/laminas-coding-standard:2.3.x upgrades
126124b 
In laminas#104 (duplicate), we improved the types of internal and
public API. These were mixed with coding style improvements.

The coding style improvements have been merged separately via laminas#103,
so this patch only includes the type/docblock improvements, which should ease the potential evolution of the
API of this package.
Ocramius added a commit to Ocramius/laminas-diactoros that referenced this pull request Jul 7, 2022
@Ocramius
Refined types as per laminas/laminas-coding-standard:2.3.x upgrades
2539f32 
In laminas#104 (duplicate), we improved the types of internal and
public API. These were mixed with coding style improvements.

The coding style improvements have been merged separately via laminas#103,
so this patch only includes the type/docblock improvements, which should ease the potential evolution of the
API of this package.
@gsteel gsteel mentioned this pull request Sep 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ocramius Ocramius Ocramius approved these changes

Assignees

@Ocramius Ocramius

Labels
Enhancement
Projects
None yet
Milestone
2.13.0
Development

Successfully merging this pull request may close these issues.
2 participants
@gsteel @Ocramius