diff --git a/src/AnimeClient/API/Kitsu/Auth.php b/src/AnimeClient/API/Kitsu/Auth.php index 8e302696..72d79c03 100644 --- a/src/AnimeClient/API/Kitsu/Auth.php +++ b/src/AnimeClient/API/Kitsu/Auth.php @@ -52,7 +52,7 @@ final class Auth ->getSegment(SESSION_SEGMENT); $this->model = $container->get('kitsu-model'); - Event::on('::unauthorized::', [$this, 'reAuthenticate']); + Event::on('::unauthorized::', $this->reAuthenticate(...)); } /** diff --git a/src/AnimeClient/API/Kitsu/Model.php b/src/AnimeClient/API/Kitsu/Model.php index 018aea92..b4293d7d 100644 --- a/src/AnimeClient/API/Kitsu/Model.php +++ b/src/AnimeClient/API/Kitsu/Model.php @@ -567,7 +567,7 @@ final class Model // this way is much faster... foreach ($statuses as $status) { - foreach ($this->getPages([$this, 'getThumbListPages'], strtoupper($type), $status) as $page) + foreach ($this->getPages($this->getThumbListPages(...), strtoupper($type), $status) as $page) { $pages[] = $page; } @@ -597,7 +597,7 @@ final class Model // this way is much faster... foreach ($statuses as $status) { - foreach ($this->getPages([$this, 'getSyncPages'], strtoupper($type), $status) as $page) + foreach ($this->getPages($this->getSyncPages(...), strtoupper($type), $status) as $page) { $pages[] = $page; } @@ -627,7 +627,7 @@ final class Model { $pages = []; - foreach ($this->getPages([$this, 'getListPages'], strtoupper($type), strtoupper($status)) as $page) + foreach ($this->getPages($this->getListPages(...), strtoupper($type), strtoupper($status)) as $page) { $pages[] = $page; } diff --git a/src/AnimeClient/API/ParallelAPIRequest.php b/src/AnimeClient/API/ParallelAPIRequest.php index b2a3cf4f..ab66c3cf 100644 --- a/src/AnimeClient/API/ParallelAPIRequest.php +++ b/src/AnimeClient/API/ParallelAPIRequest.php @@ -56,7 +56,7 @@ final class ParallelAPIRequest */ public function addRequests(array $requests): self { - array_walk($requests, [$this, 'addRequest']); + array_walk($requests, $this->addRequest(...)); return $this; } diff --git a/src/AnimeClient/Controller.php b/src/AnimeClient/Controller.php index 275076e6..f10e0647 100644 --- a/src/AnimeClient/Controller.php +++ b/src/AnimeClient/Controller.php @@ -251,7 +251,7 @@ class Controller public function notFound( string $title = 'Sorry, page not found', string $message = 'Page Not Found' - ): void { + ): never { $this->outputHTML('404', [ 'title' => $title, 'message' => $message, diff --git a/src/AnimeClient/Controller/User.php b/src/AnimeClient/Controller/User.php index c87093f7..249fd4ec 100644 --- a/src/AnimeClient/Controller/User.php +++ b/src/AnimeClient/Controller/User.php @@ -71,7 +71,7 @@ final class User extends BaseController $rawData = $this->kitsuModel->getUserData($username); if ($rawData['data']['findProfileBySlug'] === NULL) { - $this->notFound('Sorry, user not found', "The user '$username' does not seem to exist."); + $this->notFound('Sorry, user not found', "The user '{$username}' does not seem to exist."); return; } diff --git a/src/Ion/Attribute/Route.php b/src/Ion/Attribute/Route.php index a6cfbd58..f7754f2b 100644 --- a/src/Ion/Attribute/Route.php +++ b/src/Ion/Attribute/Route.php @@ -19,8 +19,8 @@ use Attribute; #[Attribute(Attribute::TARGET_FUNCTION | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] class Route { - public const GET = 'get'; - public const POST = 'post'; + final public const GET = 'get'; + final public const POST = 'post'; public function __construct( public string $name, diff --git a/src/Ion/Transformer/AbstractTransformer.php b/src/Ion/Transformer/AbstractTransformer.php index 14807048..5ff017da 100644 --- a/src/Ion/Transformer/AbstractTransformer.php +++ b/src/Ion/Transformer/AbstractTransformer.php @@ -33,7 +33,7 @@ abstract class AbstractTransformer implements TransformerInterface { $list = (array) $collection; - return array_map([$this, 'transform'], $list); + return array_map($this->transform(...), $list); } /**