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

Backport fix for "Passing a closed resource to Service parse or expect" to 2.2 #298

Merged
merged 3 commits into from
Sep 6, 2024

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Sep 5, 2024

Backport the code related to issue #297 from PR #296 to the 2.2 branch.

And apply code-style changes that the latest php-cs-fixer 3.64 makes.

php-cs-fixer 3.64 wants to apply trailing-comma to list(a,b,c,) as part of the latest Symfony code style.
The old php-cs-fixer v2 does not know about that.
So for this 2.2 branch we can lock the new php-cs-fixer to 3.63.2 so that it does not do any code-style changes.
That lets the CI pass.

In future we will probably drop the support for PHP 7.1 7.2 7.3 and therefore can stop using php-cs-fixer v2. I will do that for a 2.3 series "some day".

Copy link

codecov bot commented Sep 5, 2024

Codecov Report

Attention: Patch coverage is 75.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 96.07%. Comparing base (a476c68) to head (e9eca39).
Report is 21 commits behind head on 2.2.

Files with missing lines Patch % Lines
lib/Service.php 75.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.2     #298      +/-   ##
============================================
- Coverage     97.06%   96.07%   -1.00%     
- Complexity      116      124       +8     
============================================
  Files            13       13              
  Lines           511      484      -27     
============================================
- Hits            496      465      -31     
- Misses           15       19       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

remove undefined assertIsResource from test

ignore 'Else branch is unreachable' message on old phpstan

lock php-cs-fixer to 3.63.2
@phil-davis phil-davis merged commit 9f64ae0 into sabre-io:2.2 Sep 6, 2024
9 checks passed
@phil-davis phil-davis mentioned this pull request Sep 6, 2024
@phil-davis phil-davis deleted the backport-296-to-2.2 branch September 6, 2024 07:32
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.

1 participant