From fa121bdada48118299431dca5f1744e6825efa57 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 6 Feb 2023 09:23:32 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Endpoints/Database.php | 30 ++++++++++++++++-------------- src/Query/Filters/FilterBag.php | 2 +- tests/FilterTest.php | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php index b0f8371..84eb58d 100644 --- a/src/Endpoints/Database.php +++ b/src/Endpoints/Database.php @@ -39,8 +39,8 @@ class Database extends Endpoint /** * Database constructor. * - * @param string $databaseId - * @param Notion $notion + * @param string $databaseId + * @param Notion $notion * * @throws \FiveamCode\LaravelNotionApi\Exceptions\HandlingException * @throws \FiveamCode\LaravelNotionApi\Exceptions\LaravelNotionAPIException @@ -64,7 +64,7 @@ public function query(): PageCollection { $response = $this ->post( - $this->url(Endpoint::DATABASES . "/{$this->databaseId}/query"), + $this->url(Endpoint::DATABASES."/{$this->databaseId}/query"), $this->getPostData() ) ->json(); @@ -72,16 +72,17 @@ public function query(): PageCollection return new PageCollection($response); } - public function getPostData():array { + public function getPostData(): array + { $postData = []; if ($this->sorts->isNotEmpty()) { $postData['sorts'] = Sorting::sortQuery($this->sorts); } - if ($this->filter !== null && !is_null($this->filterBag)) { + if ($this->filter !== null && ! is_null($this->filterBag)) { throw new HandlingException('Please provide either a filter bag or a single filter.'); - } elseif ($this->filter !== null || !is_null($this->filterBag)) { + } elseif ($this->filter !== null || ! is_null($this->filterBag)) { $postData['filter'] = $this->filterData; } @@ -101,11 +102,10 @@ public function getPostData():array { * @return Database $this * * @throws HandlingException - * */ public function filterBy(Collection|Filter|FilterBag $filter): Database { - if($filter instanceof Collection) { + if ($filter instanceof Collection) { return $this->filterByCollection($filter); } if ($filter instanceof FilterBag) { @@ -119,8 +119,9 @@ public function filterBy(Collection|Filter|FilterBag $filter): Database } /** - * @param Filter $filter + * @param Filter $filter * @return $this + * * @throws HandlingException */ public function filterBySingleFilter(Filter $filter): Database @@ -132,7 +133,7 @@ public function filterBySingleFilter(Filter $filter): Database } /** - * @param FilterBag $filterBag + * @param FilterBag $filterBag * @return Database $this */ public function filterByBag(FilterBag $filterBag): Database @@ -144,10 +145,11 @@ public function filterByBag(FilterBag $filterBag): Database } /** - * @param Collection $filterCollection + * @param Collection $filterCollection * @return Database $this */ - public function filterByCollection(Collection $filterCollection): Database { + public function filterByCollection(Collection $filterCollection): Database + { $filterBag = new FilterBag(Operators::OR); $filterBag->addFilters($filterCollection); @@ -155,7 +157,7 @@ public function filterByCollection(Collection $filterCollection): Database { } /** - * @param Collection|Sorting $sorts + * @param Collection|Sorting $sorts * @return Database $this * * @throws HandlingException @@ -178,7 +180,7 @@ public function sortBy(Sorting|Collection $sorts): Database } /** - * @param EntityCollection $entityCollection + * @param EntityCollection $entityCollection * @return $this */ public function offsetByResponse(EntityCollection $entityCollection): Database diff --git a/src/Query/Filters/FilterBag.php b/src/Query/Filters/FilterBag.php index f5aebd1..61eca69 100644 --- a/src/Query/Filters/FilterBag.php +++ b/src/Query/Filters/FilterBag.php @@ -72,7 +72,7 @@ public function addFilter(Filter $filter): self public function addFilters(Collection $filters): self { foreach ($filters as $filter) { - if(!$filter instanceof Filter) { + if (! $filter instanceof Filter) { throw new HandlingException('The filter bag must only contain filter objects.'); } $this->addFilter($filter); diff --git a/tests/FilterTest.php b/tests/FilterTest.php index 85f31b6..23cef34 100644 --- a/tests/FilterTest.php +++ b/tests/FilterTest.php @@ -58,4 +58,4 @@ $this->assertArrayHasKey('text', $queryData['filter']['or'][0]); $this->assertArrayHasKey('contains', $queryData['filter']['or'][0]['text']); $this->assertEquals('Grace', $queryData['filter']['or'][0]['text']['contains']); -}); \ No newline at end of file +});