Skip to content

Commit 193e851

Browse files
committed
Avoid magic methods on entities.
1 parent f7fcf27 commit 193e851

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/Controller/WopiController.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,14 @@ protected function wopiCheckFileInfo(FileInterface $file, UserInterface $user, b
8989
'SupportsRename' => FALSE,
9090
];
9191

92-
// @phpstan-ignore property.notFound
93-
$user_picture = $user->user_picture?->entity;
94-
if ($user_picture) {
95-
$response_data['UserExtraInfo']['avatar'] = $this->fileUrlGenerator->generateAbsoluteString($user_picture->getFileUri());
92+
if ($user->hasField('user_picture')) {
93+
$user_picture = $user->get('user_picture')->entity;
94+
if (
95+
$user_picture instanceof FileInterface &&
96+
$user_picture->getFileUri() !== NULL
97+
) {
98+
$response_data['UserExtraInfo']['avatar'] = $this->fileUrlGenerator->generateAbsoluteString($user_picture->getFileUri());
99+
}
96100
}
97101

98102
return new JsonResponse(

src/MediaHelper.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ public function getFileForMedia(MediaInterface $media): ?FileInterface {
4646
* {@inheritdoc}
4747
*/
4848
public function setMediaSource(MediaInterface $media, FileInterface $file): void {
49-
// @phpstan-ignore property.notFound
50-
$media_type = $media->bundle->entity;
5149
/** @var \Drupal\media\MediaTypeInterface $media_type */
50+
$media_type = $media->get('bundle')->entity;
5251
$source_field = $media->getSource()->getSourceFieldDefinition($media_type);
5352
if ($source_field === NULL) {
5453
// Throw an unhandled exception for now.

0 commit comments

Comments
 (0)