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

mixed type allows null #595

Merged
merged 1 commit into from
Feb 8, 2023
Merged

mixed type allows null #595

merged 1 commit into from
Feb 8, 2023

Conversation

mabar
Copy link
Contributor

@mabar mabar commented Oct 21, 2022

Allows properties with mixed type to contain null.

Also dropped the uppercase NULL, because $parsedTypes always contains only lowercase null

} elseif (isset($types[$typeLower])) {
$type = $typeLower;

@mabar
Copy link
Contributor Author

mabar commented Oct 24, 2022

@hrach Should I update v4.0 builds so it can pass? Test failures are not related to the PR...

@hrach
Copy link
Member

hrach commented Oct 24, 2022

I guess it is a kind of BC break we should not do in 4.0
Failing test - I know, sorry, Ill fix them. May I merge it later or do you hurry?

@mabar
Copy link
Contributor Author

mabar commented Oct 24, 2022

I approached it as a bug fix, because it's imho expected that mixed allows null. But sure, let's put it in v5 branch
And feel free to merge it any time you want, hotfix is as simple as mixed|null.

@hrach
Copy link
Member

hrach commented Feb 5, 2023

Please rebase, keep the NULL and retarget to main. Thank you.

@mabar mabar force-pushed the mixed-is-nullable branch from 48b51d8 to 138a062 Compare February 7, 2023 14:45
@mabar mabar changed the base branch from v4.0 to main February 7, 2023 14:45
@mabar
Copy link
Contributor Author

mabar commented Feb 7, 2023

@hrach Rebased, targeted to main and kept the NULL.

But I really think uppercase NULL is not necessary, because $typeLower is assigned to $parsedTypes in case of NULL.

@hrach
Copy link
Member

hrach commented Feb 8, 2023

Could you please rebase/force push to let the test run? Seems deadlocked now. thx

@mabar mabar force-pushed the mixed-is-nullable branch from 138a062 to 41d424c Compare February 8, 2023 18:18
@hrach hrach merged commit f0a06f1 into nextras:main Feb 8, 2023
@hrach
Copy link
Member

hrach commented Feb 8, 2023

Thank you!

@mabar mabar deleted the mixed-is-nullable branch February 8, 2023 18:29
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.

2 participants