Nicer PHP version checking by Nitamet · Pull Request #10129 · vimeo/psalm

Nitamet · 2023-08-18T17:54:19Z

Resolves #10084

There are now separate checks for version format and supported versions
If the version is invalid or unsupported, CLI now doesn't throw an error and print the stacktrace, just prints the error message and exits

Separate condition to check both cases if the specified string is a valid version and if it is supported Remove unsupported versions up to 7.4 from regex

src/Psalm/Internal/Analyzer/ProjectAnalyzer.php

Nitamet · 2023-08-18T21:30:56Z

Changed the code according to the comments.

weirdan · 2023-08-18T21:44:38Z

Thanks!

Addresses vimeo#10129 (comment)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [google/protobuf](https://developers.google.com/protocol-buffers/) ([source](https://togithub.com/protocolbuffers/protobuf-php)) | require | minor | `3.23.4` -> `3.24.1` | | [grpc/grpc](https://grpc.io) ([source](https://togithub.com/grpc/grpc-php)) | require | minor | `1.52.0` -> `1.57.0` | | [phpstan/phpstan](https://togithub.com/phpstan/phpstan) | require-dev | patch | `1.10.27` -> `1.10.29` | | [phpunit/phpunit](https://phpunit.de/) ([source](https://togithub.com/sebastianbergmann/phpunit)) | require-dev | patch | `10.3.1` -> `10.3.2` | | [vimeo/psalm](https://togithub.com/vimeo/psalm) | require-dev | minor | `5.14.1` -> `5.15.0` | --- ### Release Notes <details> <summary>protocolbuffers/protobuf-php (google/protobuf)</summary> ### [`v3.24.1`](https://togithub.com/protocolbuffers/protobuf-php/compare/v3.24.0...v3.24.1) [Compare Source](https://togithub.com/protocolbuffers/protobuf-php/compare/v3.24.0...v3.24.1) ### [`v3.24.0`](https://togithub.com/protocolbuffers/protobuf-php/compare/v3.23.4...v3.24.0) [Compare Source](https://togithub.com/protocolbuffers/protobuf-php/compare/v3.23.4...v3.24.0) </details> <details> <summary>grpc/grpc-php (grpc/grpc)</summary> ### [`v1.57.0`](https://togithub.com/grpc/grpc-php/compare/v1.52.0...v1.57.0) [Compare Source](https://togithub.com/grpc/grpc-php/compare/v1.52.0...v1.57.0) </details> <details> <summary>phpstan/phpstan (phpstan/phpstan)</summary> ### [`v1.10.29`](https://togithub.com/phpstan/phpstan/releases/tag/1.10.29) [Compare Source](https://togithub.com/phpstan/phpstan/compare/1.10.28...1.10.29) # Improvements 🔧 - Update nikic/php-parser to v4.17.1 - PHP 8.3 features are no longer parse errors. Full-fledged PHP 8.3 support is coming later this year. - Update BetterReflection to 6.12.0 # Bugfixes 🐛 - PHPStan Pro - when launching, `PHP_BINARY` needs to be escaped (phpstan/phpstan-src@2c7cfd8) # Function signature fixes 🤖 - Fix FTP-related function signatures ([#2551](https://togithub.com/phpstan/phpstan-src/pull/2551)), thanks [@thg2k](https://togithub.com/thg2k)! ### [`v1.10.28`](https://togithub.com/phpstan/phpstan/releases/tag/1.10.28) [Compare Source](https://togithub.com/phpstan/phpstan/compare/1.10.27...1.10.28) # Improvements 🔧 - Update BetterReflection to 6.12.0 (phpstan/phpstan-src@7c49c94) # Bugfixes 🐛 - Nullsafe operator on `null` results in `null` (phpstan/phpstan-src@5c40c85), [#9721](https://togithub.com/phpstan/phpstan/issues/9721) - Properties set in the native constructor are initialized in additional constructors (phpstan/phpstan-src@1b0c6a0), [#9619](https://togithub.com/phpstan/phpstan/issues/9619) - Fix performance problem with nested BooleanOr and BooleanAnd (phpstan/phpstan-src@9adae6c), [#9690](https://togithub.com/phpstan/phpstan/issues/9690), [#9676](https://togithub.com/phpstan/phpstan/issues/9676) - CallableTypeHelper - copy variadic parameters if the accepting closure has more parameters (phpstan/phpstan-src@31ed326), [#9699](https://togithub.com/phpstan/phpstan/issues/9699) # Internals 🔍 - Simplify access to ClassReflection in ClassPropertyNode ([#2565](https://togithub.com/phpstan/phpstan-src/pull/2565)), thanks [@mad-briller](https://togithub.com/mad-briller)! </details> <details> <summary>sebastianbergmann/phpunit (phpunit/phpunit)</summary> ### [`v10.3.2`](https://togithub.com/sebastianbergmann/phpunit/compare/10.3.1...10.3.2) [Compare Source](https://togithub.com/sebastianbergmann/phpunit/compare/10.3.1...10.3.2) </details> <details> <summary>vimeo/psalm (vimeo/psalm)</summary> ### [`v5.15.0`](https://togithub.com/vimeo/psalm/releases/tag/5.15.0) [Compare Source](https://togithub.com/vimeo/psalm/compare/5.14.1...5.15.0)  #### What's Changed ##### Features - Check if argument passed to isset() is not a variable by [@Nitamet](https://togithub.com/Nitamet) in [https://github.com/vimeo/psalm/pull/10068](https://togithub.com/vimeo/psalm/pull/10068) - Fix [#9997](https://togithub.com/vimeo/psalm/issues/9997) dynamic properties on SimpleXmlElement by [@ygottschalk](https://togithub.com/ygottschalk) in [https://github.com/vimeo/psalm/pull/10049](https://togithub.com/vimeo/psalm/pull/10049) - Nicer PHP version checking by [@Nitamet](https://togithub.com/Nitamet) in [https://github.com/vimeo/psalm/pull/10129](https://togithub.com/vimeo/psalm/pull/10129) ##### Fixes - Fixed `DOMDocument::load*` signatures by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10073](https://togithub.com/vimeo/psalm/pull/10073) - make (s)printf error reporting more correct/literal by [@kkmuffme](https://togithub.com/kkmuffme) in [https://github.com/vimeo/psalm/pull/10088](https://togithub.com/vimeo/psalm/pull/10088) - Fix parameter having `object` type in PHPDoc and only `&` in the method's definition, used with code having an object calling it's method with itself as an argument for mentioned parameter by [@kubawerlos](https://togithub.com/kubawerlos) in [https://github.com/vimeo/psalm/pull/10104](https://togithub.com/vimeo/psalm/pull/10104) - mysqli_field_seek returns true by [@kamil-tekiela](https://togithub.com/kamil-tekiela) in [https://github.com/vimeo/psalm/pull/10107](https://togithub.com/vimeo/psalm/pull/10107) - Fix bcdiv nullable scale stub by [@TheDevick](https://togithub.com/TheDevick) in [https://github.com/vimeo/psalm/pull/10106](https://togithub.com/vimeo/psalm/pull/10106) - Cleanup `test` command and `fixAll` action by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10108](https://togithub.com/vimeo/psalm/pull/10108) - Correct type for `$enum->name` by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10109](https://togithub.com/vimeo/psalm/pull/10109) - argv and argc were inconsistent in Context with VariableFetchAnalyzer by [@kkmuffme](https://togithub.com/kkmuffme) in [https://github.com/vimeo/psalm/pull/10093](https://togithub.com/vimeo/psalm/pull/10093) - Fix `hash_pbkdf2` `$options` parameter by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10110](https://togithub.com/vimeo/psalm/pull/10110) - Forbid faulty `nikic/php-parser` version by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10112](https://togithub.com/vimeo/psalm/pull/10112) - `strip_tags()/$allowed_tags` can accept arrays since 7.4 by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10122](https://togithub.com/vimeo/psalm/pull/10122) - Fix crash when assertion array is not a list by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10123](https://togithub.com/vimeo/psalm/pull/10123) - Fix crash on array access to undefined class by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10134](https://togithub.com/vimeo/psalm/pull/10134) - Correct exit code for invalid version format by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10135](https://togithub.com/vimeo/psalm/pull/10135) #### New Contributors - [@Nitamet](https://togithub.com/Nitamet) made their first contribution in [https://github.com/vimeo/psalm/pull/10068](https://togithub.com/vimeo/psalm/pull/10068) - [@TheDevick](https://togithub.com/TheDevick) made their first contribution in [https://github.com/vimeo/psalm/pull/10106](https://togithub.com/vimeo/psalm/pull/10106) **Full Changelog**: vimeo/psalm@5.14.1...5.15.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/cerbos/cerbos-sdk-php).  Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Oğuzhan Durgun <oguzhandurgun95@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [vimeo/psalm](https://togithub.com/vimeo/psalm) | require-dev | minor | `~5.14.0` -> `~5.15.0` | --- ### Release Notes <details> <summary>vimeo/psalm (vimeo/psalm)</summary> ### [`v5.15.0`](https://togithub.com/vimeo/psalm/releases/tag/5.15.0) [Compare Source](https://togithub.com/vimeo/psalm/compare/5.14.1...5.15.0)  #### What's Changed ##### Features - Check if argument passed to isset() is not a variable by [@Nitamet](https://togithub.com/Nitamet) in [https://github.com/vimeo/psalm/pull/10068](https://togithub.com/vimeo/psalm/pull/10068) - Fix [#9997](https://togithub.com/vimeo/psalm/issues/9997) dynamic properties on SimpleXmlElement by [@ygottschalk](https://togithub.com/ygottschalk) in [https://github.com/vimeo/psalm/pull/10049](https://togithub.com/vimeo/psalm/pull/10049) - Nicer PHP version checking by [@Nitamet](https://togithub.com/Nitamet) in [https://github.com/vimeo/psalm/pull/10129](https://togithub.com/vimeo/psalm/pull/10129) ##### Fixes - Fixed `DOMDocument::load*` signatures by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10073](https://togithub.com/vimeo/psalm/pull/10073) - make (s)printf error reporting more correct/literal by [@kkmuffme](https://togithub.com/kkmuffme) in [https://github.com/vimeo/psalm/pull/10088](https://togithub.com/vimeo/psalm/pull/10088) - Fix parameter having `object` type in PHPDoc and only `&` in the method's definition, used with code having an object calling it's method with itself as an argument for mentioned parameter by [@kubawerlos](https://togithub.com/kubawerlos) in [https://github.com/vimeo/psalm/pull/10104](https://togithub.com/vimeo/psalm/pull/10104) - mysqli_field_seek returns true by [@kamil-tekiela](https://togithub.com/kamil-tekiela) in [https://github.com/vimeo/psalm/pull/10107](https://togithub.com/vimeo/psalm/pull/10107) - Fix bcdiv nullable scale stub by [@TheDevick](https://togithub.com/TheDevick) in [https://github.com/vimeo/psalm/pull/10106](https://togithub.com/vimeo/psalm/pull/10106) - Cleanup `test` command and `fixAll` action by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10108](https://togithub.com/vimeo/psalm/pull/10108) - Correct type for `$enum->name` by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10109](https://togithub.com/vimeo/psalm/pull/10109) - argv and argc were inconsistent in Context with VariableFetchAnalyzer by [@kkmuffme](https://togithub.com/kkmuffme) in [https://github.com/vimeo/psalm/pull/10093](https://togithub.com/vimeo/psalm/pull/10093) - Fix `hash_pbkdf2` `$options` parameter by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10110](https://togithub.com/vimeo/psalm/pull/10110) - Forbid faulty `nikic/php-parser` version by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10112](https://togithub.com/vimeo/psalm/pull/10112) - `strip_tags()/$allowed_tags` can accept arrays since 7.4 by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10122](https://togithub.com/vimeo/psalm/pull/10122) - Fix crash when assertion array is not a list by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10123](https://togithub.com/vimeo/psalm/pull/10123) - Fix crash on array access to undefined class by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10134](https://togithub.com/vimeo/psalm/pull/10134) - Correct exit code for invalid version format by [@weirdan](https://togithub.com/weirdan) in [https://github.com/vimeo/psalm/pull/10135](https://togithub.com/vimeo/psalm/pull/10135) #### New Contributors - [@Nitamet](https://togithub.com/Nitamet) made their first contribution in [https://github.com/vimeo/psalm/pull/10068](https://togithub.com/vimeo/psalm/pull/10068) - [@TheDevick](https://togithub.com/TheDevick) made their first contribution in [https://github.com/vimeo/psalm/pull/10106](https://togithub.com/vimeo/psalm/pull/10106) **Full Changelog**: vimeo/psalm@5.14.1...5.15.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-feature/php-sdk).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Nitamet added 2 commits August 18, 2023 20:09

Fix PHP version checking

5f40d26

Separate condition to check both cases if the specified string is a valid version and if it is supported Remove unsupported versions up to 7.4 from regex

Add versions 5.4-7.3 as supported

2c7391a

weirdan reviewed Aug 18, 2023

View reviewed changes

src/Psalm/Internal/Analyzer/ProjectAnalyzer.php Outdated Show resolved Hide resolved

weirdan requested changes Aug 18, 2023

View reviewed changes

src/Psalm/Internal/Analyzer/ProjectAnalyzer.php Show resolved Hide resolved

Nitamet added 2 commits August 19, 2023 00:01

Add 8.3 as supported version

18b74b1

Throw and catch exception when specified PHP version is invalid

005eed3

Nitamet requested a review from weirdan August 18, 2023 21:29

weirdan approved these changes Aug 18, 2023

View reviewed changes

weirdan changed the title ~~Fix version checking~~ Nicer PHP version checking Aug 18, 2023

weirdan added the release:feature The PR will be included in 'Features' section of the release notes label Aug 18, 2023

weirdan merged commit 0922fa1 into vimeo:5.x Aug 18, 2023

weirdan mentioned this pull request Aug 20, 2023

Correct exit code for invalid version format #10135

Merged

weirdan added a commit to weirdan/psalm that referenced this pull request Aug 20, 2023

Correct exit code for invalid version format

46ebe72

Addresses vimeo#10129 (comment)

This was referenced Aug 28, 2024

Update dependency vimeo/psalm to v5 - autoclosed laminas/laminas-server#71

Closed

Update dependency vimeo/psalm to v5 - autoclosed Ocramius/ProxyManager#776

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nicer PHP version checking#10129

Nicer PHP version checking#10129
weirdan merged 4 commits intovimeo:5.xfrom
Nitamet:10084-incorrect-version-checking

Nitamet commented Aug 18, 2023

Uh oh!

Uh oh!

Uh oh!

Nitamet commented Aug 18, 2023

Uh oh!

weirdan commented Aug 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Nitamet commented Aug 18, 2023

Uh oh!

Uh oh!

Uh oh!

Nitamet commented Aug 18, 2023

Uh oh!

weirdan commented Aug 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants