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

Fix #9997 dynamic properties on SimpleXmlElement #10049

Merged
merged 1 commit into from Aug 5, 2023
Merged

Fix #9997 dynamic properties on SimpleXmlElement #10049

merged 1 commit into from Aug 5, 2023

Conversation

ygottschalk
Copy link
Contributor

@ygottschalk ygottschalk commented Jul 25, 2023 •
edited

Refs #9997
Types dynamic property access on SimpleXmlElement to SimpleXmlElement|null.

BC impact:
SimpleXmlElement is not considered an universal object crate anymore. Therefore things like $xmlElement->myExtraStringData = 'fooBar'; will not work anymore when this get merged.

I do not know why this code was in place and I am not sure if my changes are 'legit': https://github.com/vimeo/psalm/pull/10049/files#diff-a3219413916e4af22971b07d3ef169950d3b17b7cf58f48366c408b1d49ade5bR326
I looked through Atomic.php and some other file and it seemed like null checks (in most places) are done by checking $atomic instanceof TNull and not considering TNamedObject('null') as null. Thats why I removed the code...

Extra info copied from commit message

  • make SimpleXmlElement and SimpleXmlIterator not a universal object crate
  • added typed magic __get method to SimpleXmlElement
  • adjusted tests to reflect new behaviour of SimpleXmlElement
  • added tests
  • 'fixed' code translating null to TNamedObject('null') instead of TNull

@ygottschalk ygottschalk force-pushed the fix/9997-simplexamlelment-dynamic-properties branch 3 times, most recently from 3cc8503 to 2257d7e Compare July 25, 2023 13:37
@ygottschalk ygottschalk changed the title Fix #9997 Fix #9997 dynamic properties on SimpleXmlElement Jul 25, 2023
@ygottschalk ygottschalk marked this pull request as ready for review July 25, 2023 13:49
orklah
orklah reviewed Jul 27, 2023
View reviewed changes
src/Psalm/Type/Atomic.php Outdated
}

return new TNamedObject($value);
return new TNull();
Copy link
Collaborator

Choose a reason for hiding this comment

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

This change will prevent this to work in PHP <7: https://3v4l.org/nbaYr

@orklah orklah added the release:feature The PR will be included in 'Features' section of the release notes label Jul 27, 2023
@orklah
Copy link
Collaborator

orklah commented Jul 27, 2023

aside from the change in Atomic, this seems good :)

@ygottschalk ygottschalk force-pushed the fix/9997-simplexamlelment-dynamic-properties branch from 2257d7e to 33db549 Compare August 5, 2023 13:40
@ygottschalk ygottschalk changed the base branch from master to 5.x August 5, 2023 13:41
@ygottschalk ygottschalk marked this pull request as draft August 5, 2023 13:43
@ygottschalk ygottschalk force-pushed the fix/9997-simplexamlelment-dynamic-properties branch from 33db549 to 9b77760 Compare August 5, 2023 13:59
@ygottschalk
Fix vimeo#9997
a4de6d9 
- make SimpleXmlElement and SimpleXmlIterator not a universal object crate
- added typed magic __get method to SimpleXmlElement
- adjusted tests to reflect new behaviour of SimpleXmlElement
- added tests
@ygottschalk ygottschalk force-pushed the fix/9997-simplexamlelment-dynamic-properties branch from 9b77760 to a4de6d9 Compare August 5, 2023 15:07
ygottschalk
ygottschalk commented Aug 5, 2023
View reviewed changes
src/Psalm/Type/Atomic.php
@@ -323,7 +323,7 @@ private static function createInner(
return $analysis_php_version_id !== null ? new TNamedObject($value) : new TScalar();

case 'null':
if ($analysis_php_version_id === null || $analysis_php_version_id >= 8_00_00) {
if ($analysis_php_version_id === null || $analysis_php_version_id >= 7_00_00) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Then lets use this code in PHP<7

@ygottschalk ygottschalk marked this pull request as ready for review August 5, 2023 15:13
@ygottschalk
Copy link
Contributor Author

@orklah ready to merge. psl fail seems unrelated

@orklah orklah merged commit 3098e51 into vimeo:5.x Aug 5, 2023
49 of 50 checks passed
@orklah
Copy link
Collaborator

orklah commented Aug 5, 2023

Thanks!

oguzhand95 pushed a commit to cerbos/cerbos-sdk-php that referenced this pull request Aug 21, 2023
@renovate
chore(deps): Update php deps (#52)
80808d7 
[![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
([#&#8203;2551](https://togithub.com/phpstan/phpstan-src/pull/2551)),
thanks [@&#8203;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),
[#&#8203;9721](https://togithub.com/phpstan/phpstan/issues/9721)
- Properties set in the native constructor are initialized in additional
constructors
(phpstan/phpstan-src@1b0c6a0),
[#&#8203;9619](https://togithub.com/phpstan/phpstan/issues/9619)
- Fix performance problem with nested BooleanOr and BooleanAnd
(phpstan/phpstan-src@9adae6c),
[#&#8203;9690](https://togithub.com/phpstan/phpstan/issues/9690),
[#&#8203;9676](https://togithub.com/phpstan/phpstan/issues/9676)
- CallableTypeHelper - copy variadic parameters if the accepting closure
has more parameters
(phpstan/phpstan-src@31ed326),
[#&#8203;9699](https://togithub.com/phpstan/phpstan/issues/9699)

# Internals 🔍

- Simplify access to ClassReflection in ClassPropertyNode
([#&#8203;2565](https://togithub.com/phpstan/phpstan-src/pull/2565)),
thanks [@&#8203;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)

<!-- Release notes generated using configuration in .github/release.yml
at 5.x -->

#### What's Changed

##### Features

- Check if argument passed to isset() is not a variable by
[@&#8203;Nitamet](https://togithub.com/Nitamet) in
[vimeo/psalm#10068
- Fix [#&#8203;9997](https://togithub.com/vimeo/psalm/issues/9997)
dynamic properties on SimpleXmlElement by
[@&#8203;ygottschalk](https://togithub.com/ygottschalk) in
[vimeo/psalm#10049
- Nicer PHP version checking by
[@&#8203;Nitamet](https://togithub.com/Nitamet) in
[vimeo/psalm#10129

##### Fixes

- Fixed `DOMDocument::load*` signatures by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10073
- make (s)printf error reporting more correct/literal by
[@&#8203;kkmuffme](https://togithub.com/kkmuffme) in
[vimeo/psalm#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
[@&#8203;kubawerlos](https://togithub.com/kubawerlos) in
[vimeo/psalm#10104
- mysqli_field_seek returns true by
[@&#8203;kamil-tekiela](https://togithub.com/kamil-tekiela) in
[vimeo/psalm#10107
- Fix bcdiv nullable scale stub by
[@&#8203;TheDevick](https://togithub.com/TheDevick) in
[vimeo/psalm#10106
- Cleanup `test` command and `fixAll` action by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10108
- Correct type for `$enum->name` by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10109
- argv and argc were inconsistent in Context with VariableFetchAnalyzer
by [@&#8203;kkmuffme](https://togithub.com/kkmuffme) in
[vimeo/psalm#10093
- Fix `hash_pbkdf2` `$options` parameter by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10110
- Forbid faulty `nikic/php-parser` version by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10112
- `strip_tags()/$allowed_tags` can accept arrays since 7.4 by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10122
- Fix crash when assertion array is not a list by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10123
- Fix crash on array access to undefined class by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10134
- Correct exit code for invalid version format by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10135

#### New Contributors

- [@&#8203;Nitamet](https://togithub.com/Nitamet) made their first
contribution in
[vimeo/psalm#10068
- [@&#8203;TheDevick](https://togithub.com/TheDevick) made their first
contribution in
[vimeo/psalm#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.

---

- [ ] <!-- rebase-check -->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).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi40MC4zIiwidXBkYXRlZEluVmVyIjoiMzYuNDMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

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>
@edsrzf edsrzf mentioned this pull request Sep 14, 2023
Closed
tcarrio pushed a commit to open-feature/php-sdk that referenced this pull request Sep 21, 2023
@renovate
chore(deps): update dependency vimeo/psalm to ~5.15.0 (#97)
084b883 
[![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)

<!-- Release notes generated using configuration in .github/release.yml
at 5.x -->

#### What's Changed

##### Features

- Check if argument passed to isset() is not a variable by
[@&#8203;Nitamet](https://togithub.com/Nitamet) in
[vimeo/psalm#10068
- Fix [#&#8203;9997](https://togithub.com/vimeo/psalm/issues/9997)
dynamic properties on SimpleXmlElement by
[@&#8203;ygottschalk](https://togithub.com/ygottschalk) in
[vimeo/psalm#10049
- Nicer PHP version checking by
[@&#8203;Nitamet](https://togithub.com/Nitamet) in
[vimeo/psalm#10129

##### Fixes

- Fixed `DOMDocument::load*` signatures by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10073
- make (s)printf error reporting more correct/literal by
[@&#8203;kkmuffme](https://togithub.com/kkmuffme) in
[vimeo/psalm#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
[@&#8203;kubawerlos](https://togithub.com/kubawerlos) in
[vimeo/psalm#10104
- mysqli_field_seek returns true by
[@&#8203;kamil-tekiela](https://togithub.com/kamil-tekiela) in
[vimeo/psalm#10107
- Fix bcdiv nullable scale stub by
[@&#8203;TheDevick](https://togithub.com/TheDevick) in
[vimeo/psalm#10106
- Cleanup `test` command and `fixAll` action by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10108
- Correct type for `$enum->name` by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10109
- argv and argc were inconsistent in Context with VariableFetchAnalyzer
by [@&#8203;kkmuffme](https://togithub.com/kkmuffme) in
[vimeo/psalm#10093
- Fix `hash_pbkdf2` `$options` parameter by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10110
- Forbid faulty `nikic/php-parser` version by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10112
- `strip_tags()/$allowed_tags` can accept arrays since 7.4 by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10122
- Fix crash when assertion array is not a list by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10123
- Fix crash on array access to undefined class by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10134
- Correct exit code for invalid version format by
[@&#8203;weirdan](https://togithub.com/weirdan) in
[vimeo/psalm#10135

#### New Contributors

- [@&#8203;Nitamet](https://togithub.com/Nitamet) made their first
contribution in
[vimeo/psalm#10068
- [@&#8203;TheDevick](https://togithub.com/TheDevick) made their first
contribution in
[vimeo/psalm#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.

---

- [ ] <!-- rebase-check -->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).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi40My4yIiwidXBkYXRlZEluVmVyIjoiMzYuNDMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@kthaler kthaler mentioned this pull request Jan 9, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orklah orklah orklah left review comments

Assignees
No one assigned
Labels
release:feature The PR will be included in 'Features' section of the release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ygottschalk @orklah