Type hinting #43
Merged
Type hinting #43
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alxndr-w
requested changes
Nov 21, 2023
There was a problem hiding this comment.
@schorschy hier müsstest du nochmal über einige Stellen rüber. Bei vielen, bei denen :object steht, gehört eigentlich eine Collection hin.
Comment on lines
-12
to
15
| public function getMedia() | ||
| public function getMedia(): rex_media | ||
| { | ||
| return rex_media::get($this->image); | ||
| } |
There was a problem hiding this comment.
Kannst du hier noch als Weiche einbauen - wenn media_manager_responsive installiert ist, dann rex_media_plus-Objekt zurückgeben.
lib/event_category.php
Outdated
Comment on lines
30
to
33
| public function getDateWhere($whereRaw = ''): object | ||
| { | ||
| return event_date::query()->joinRelation('event_category_id', 'c')->where('c.id', $this->getId())->whereRaw($whereRaw)->orderBy('startDate`, `startTime', 'DESC')->find(); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public function getDateWhere($whereRaw = ''): object | |
| { | |
| return event_date::query()->joinRelation('event_category_id', 'c')->where('c.id', $this->getId())->whereRaw($whereRaw)->orderBy('startDate`, `startTime', 'DESC')->find(); | |
| } | |
| public function getDateWhere($whereRaw = ''): ?rex_yform_manager_collection | |
| { | |
| return event_date::query()->joinRelation('event_category_id', 'c')->where('c.id', $this->getId())->whereRaw($whereRaw)->orderBy('startDate`, `startTime', 'DESC')->find(); | |
| } |
Comment on lines
+35
to
38
| public function getRelatedDates($whereRaw = ''): array | ||
| { | ||
| return $this->getDateWhere($whereRaw); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public function getRelatedDates($whereRaw = ''): array | |
| { | |
| return $this->getDateWhere($whereRaw); | |
| } | |
| public function getRelatedDates($whereRaw = ''): ?rex_yform_manager_collection | |
| { | |
| return $this->getDateWhere($whereRaw); | |
| } |
Comment on lines
+44
to
47
| public function hasAttribute($needle): bool | ||
| { | ||
| return in_array($needle, $this->getAttributes()); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public function hasAttribute($needle): bool | |
| { | |
| return in_array($needle, $this->getAttributes()); | |
| } | |
| public function hasAttribute($needle): bool | |
| { | |
| return in_array($needle, $this->getAttributes(), true); | |
| } |
There was a problem hiding this comment.
bool kommt nur raus, wenn in_array den 3. Parameter $strict = true hat
lib/event_date.php
Outdated
| @@ -13,18 +13,19 @@ public static function generateuuid($id = null) :string | |||
| return uuid::uuid3(uuid::NAMESPACE_URL, $id); | |||
| } | |||
|
|
|||
| public function getCategory() | |||
| public function getCategory(): object | |||
There was a problem hiding this comment.
Suggested change
| public function getCategory(): object | |
| public function getCategory(): ?event_category |
| { | ||
| if (!$uuid) { | ||
| return; | ||
| return null; |
There was a problem hiding this comment.
Suggested change
| return null; | |
| return; |
Reicht so.
lib/event_registration_person.php
Outdated
Comment on lines
62
to
66
| public function getRegistration(): object | ||
| { | ||
| return $this->getRelatedDataset('registration_id'); | ||
| } | ||
|
|
lib/event_registration_person.php
Outdated
Comment on lines
77
to
83
| public static function getByUuid($uuid = null): object | ||
| { | ||
| if (!$uuid) { | ||
| return; | ||
| } | ||
| return self::query()->where('uuid', $uuid)->findOne(); | ||
| } |
lib/event_registration_person.php
Outdated
Comment on lines
84
to
90
| public static function getByHash($hash = null): object | ||
| { | ||
| if (!$hash) { | ||
| return; | ||
| } | ||
| return self::query()->where('hash', $hash)->findOne(); | ||
| } |
Comment on lines
+91
to
94
| public static function ep_saved($ep): bool | ||
| { | ||
| $lastId = $ep->getSubject()->getLastId(); | ||
| $table = $ep->getParam('table'); |
There was a problem hiding this comment.
Suggested change
| public static function ep_saved($ep): bool | |
| { | |
| $lastId = $ep->getSubject()->getLastId(); | |
| $table = $ep->getParam('table'); | |
| public static function ep_saved(rex_extension_point $ep): bool | |
| { | |
| $lastId = $ep->getSubject()->getLastId(); | |
| $table = $ep->getParam('table'); |
|
Ich hab neue commits gepusht, aber kann den pull-request nicht erneut auslösen oder dich irgendwie drauf hinweisen dass es erledigt wurde außer per Kommentar :D kannst mir hierzu ja in der nächsten besprechung den best practice mitteilen. |
alxndr-w
approved these changes
Nov 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.