diff options
Diffstat (limited to 'application/bookmark/BookmarkArray.php')
-rw-r--r-- | application/bookmark/BookmarkArray.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/application/bookmark/BookmarkArray.php b/application/bookmark/BookmarkArray.php index 3bd5eb20..b9328116 100644 --- a/application/bookmark/BookmarkArray.php +++ b/application/bookmark/BookmarkArray.php | |||
@@ -1,5 +1,7 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | declare(strict_types=1); | ||
4 | |||
3 | namespace Shaarli\Bookmark; | 5 | namespace Shaarli\Bookmark; |
4 | 6 | ||
5 | use Shaarli\Bookmark\Exception\InvalidBookmarkException; | 7 | use Shaarli\Bookmark\Exception\InvalidBookmarkException; |
@@ -70,7 +72,8 @@ class BookmarkArray implements \Iterator, \Countable, \ArrayAccess | |||
70 | */ | 72 | */ |
71 | public function offsetSet($offset, $value) | 73 | public function offsetSet($offset, $value) |
72 | { | 74 | { |
73 | if (! $value instanceof Bookmark | 75 | if ( |
76 | ! $value instanceof Bookmark | ||
74 | || $value->getId() === null || empty($value->getUrl()) | 77 | || $value->getId() === null || empty($value->getUrl()) |
75 | || ($offset !== null && ! is_int($offset)) || ! is_int($value->getId()) | 78 | || ($offset !== null && ! is_int($offset)) || ! is_int($value->getId()) |
76 | || $offset !== null && $offset !== $value->getId() | 79 | || $offset !== null && $offset !== $value->getId() |
@@ -187,13 +190,13 @@ class BookmarkArray implements \Iterator, \Countable, \ArrayAccess | |||
187 | /** | 190 | /** |
188 | * Returns a bookmark offset in bookmarks array from its unique ID. | 191 | * Returns a bookmark offset in bookmarks array from its unique ID. |
189 | * | 192 | * |
190 | * @param int $id Persistent ID of a bookmark. | 193 | * @param int|null $id Persistent ID of a bookmark. |
191 | * | 194 | * |
192 | * @return int Real offset in local array, or null if doesn't exist. | 195 | * @return int Real offset in local array, or null if doesn't exist. |
193 | */ | 196 | */ |
194 | protected function getBookmarkOffset($id) | 197 | protected function getBookmarkOffset(?int $id): ?int |
195 | { | 198 | { |
196 | if (isset($this->ids[$id])) { | 199 | if ($id !== null && isset($this->ids[$id])) { |
197 | return $this->ids[$id]; | 200 | return $this->ids[$id]; |
198 | } | 201 | } |
199 | return null; | 202 | return null; |
@@ -205,7 +208,7 @@ class BookmarkArray implements \Iterator, \Countable, \ArrayAccess | |||
205 | * | 208 | * |
206 | * @return int next ID. | 209 | * @return int next ID. |
207 | */ | 210 | */ |
208 | public function getNextId() | 211 | public function getNextId(): int |
209 | { | 212 | { |
210 | if (!empty($this->ids)) { | 213 | if (!empty($this->ids)) { |
211 | return max(array_keys($this->ids)) + 1; | 214 | return max(array_keys($this->ids)) + 1; |
@@ -214,13 +217,14 @@ class BookmarkArray implements \Iterator, \Countable, \ArrayAccess | |||
214 | } | 217 | } |
215 | 218 | ||
216 | /** | 219 | /** |
217 | * @param $url | 220 | * @param string $url |
218 | * | 221 | * |
219 | * @return Bookmark|null | 222 | * @return Bookmark|null |
220 | */ | 223 | */ |
221 | public function getByUrl($url) | 224 | public function getByUrl(string $url): ?Bookmark |
222 | { | 225 | { |
223 | if (! empty($url) | 226 | if ( |
227 | ! empty($url) | ||
224 | && isset($this->urls[$url]) | 228 | && isset($this->urls[$url]) |
225 | && isset($this->bookmarks[$this->urls[$url]]) | 229 | && isset($this->bookmarks[$this->urls[$url]]) |
226 | ) { | 230 | ) { |