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

fix: change return type of hasOne and belongsTo to nullable object type. #3979

Closed
wants to merge 3 commits into from
Closed

fix: change return type of hasOne and belongsTo to nullable object type. #3979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51bd7a7
Update the scheduler info link in admin (#3826)
iamdarkle May 27, 2023
64cd6d1
Bundled output for commit 51bd7a7e32edc75c2bdeb24021505c297a81f978
flarum-bot May 27, 2023
1d70e1a
fix: change return type of hasOne and belongsTo to nullable object type.
novacuum Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/core/js/dist/admin.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion framework/core/js/dist/admin.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion framework/core/js/src/admin/components/StatusWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class StatusWidget extends DashboardWidget {
[
<span>
<strong>{app.translator.trans('core.admin.dashboard.status.headers.scheduler-status')}</strong>{' '}
<LinkButton href="https://discuss.flarum.org/d/24118" external={true} target="_blank" icon="fas fa-info-circle" />
<LinkButton href="https://docs.flarum.org/scheduler" external={true} target="_blank" icon="fas fa-info-circle" />
</span>,
<br />,
app.data.schedulerStatus,
Expand Down
7 changes: 6 additions & 1 deletion php-packages/phpstan/src/Relations/RelationProperty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use PHPStan\Type\Generic\GenericObjectType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\NullType;
use PHPStan\Type\UnionType;

class RelationProperty implements PropertyReflection
{
Expand Down Expand Up @@ -66,7 +68,10 @@ public function getReadableType(): Type

case 'hasOne':
case 'belongsTo':
return new ObjectType($this->methodCall->arguments[1]->class->toString());
return new UnionType([
new ObjectType($this->methodCall->arguments[1]->class->toString()),
new NullType(),
]);

default:
throw new Exception('Unknown relationship type for relation: '.$this->methodCall->methodName);
Expand Down
Loading