removed unused imports and renamed propertyNames in DB entity to propertyKeys

mechelon · mechelon · commit b0390a275ef0 · 2021-05-23T13:50:42.000+02:00
diff --git a/README.md b/README.md
@@ -37,11 +37,9 @@ Head over to the [Documentation](https://5amco.de/docs) of this package.
 ### 🔥 Code Examples to jumpstart your Notion API Project
 
 #### Basic Setup
+
 ```php
 use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Collection;
-use FiveamCode\LaravelNotionApi\Query\Sorting;
-use FiveamCode\LaravelNotionApi\Query\Filter;
 
 // Setup basic API connection
 $notion = new Notion();
diff --git a/src/Endpoints/Database.php b/src/Endpoints/Database.php
@@ -7,9 +7,6 @@
 use FiveamCode\LaravelNotionApi\Notion;
 use FiveamCode\LaravelNotionApi\Query\Filter;
 use FiveamCode\LaravelNotionApi\Query\Sorting;
-use FiveamCode\LaravelNotionApi\Query\StartCursor;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use Symfony\Component\VarDumper\Cloner\Data;
 
 class Database extends Endpoint
 {
diff --git a/src/Endpoints/Databases.php b/src/Endpoints/Databases.php
@@ -5,8 +5,6 @@
 use FiveamCode\LaravelNotionApi\Entities\Database;
 use FiveamCode\LaravelNotionApi\Entities\Collections\DatabaseCollection;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use FiveamCode\LaravelNotionApi\Query\StartCursor;
 use Illuminate\Support\Collection;
 
 
diff --git a/src/Endpoints/Pages.php b/src/Endpoints/Pages.php
@@ -4,7 +4,6 @@
 
 use FiveamCode\LaravelNotionApi\Entities\Page;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 
 class Pages extends Endpoint implements EndpointInterface
 {
diff --git a/src/Endpoints/Search.php b/src/Endpoints/Search.php
@@ -2,15 +2,10 @@
 
 namespace FiveamCode\LaravelNotionApi\Endpoints;
 
-use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
-use FiveamCode\LaravelNotionApi\Entities\Collections\PageCollection;
 use Illuminate\Support\Collection;
 use FiveamCode\LaravelNotionApi\Notion;
-use FiveamCode\LaravelNotionApi\Query\Filter;
 use FiveamCode\LaravelNotionApi\Query\Sorting;
-use FiveamCode\LaravelNotionApi\Query\StartCursor;
-use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
-use Symfony\Component\VarDumper\Cloner\Data;
+use FiveamCode\LaravelNotionApi\Entities\Collections\EntityCollection;
 
 class Search extends Endpoint
 {
@@ -43,7 +38,7 @@ public function query(): EntityCollection
 
         if ($this->searchText !== null)
             $postData['query'] = $this->searchText;
-        
+
         $response = $this
             ->post(
                 $this->url(Endpoint::SEARCH),
diff --git a/src/Endpoints/Users.php b/src/Endpoints/Users.php
@@ -5,8 +5,6 @@
 use FiveamCode\LaravelNotionApi\Entities\User;
 use FiveamCode\LaravelNotionApi\Entities\Collections\UserCollection;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use FiveamCode\LaravelNotionApi\Query\StartCursor;
 use Illuminate\Support\Collection;
 
 class Users extends Endpoint implements EndpointInterface
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -5,7 +5,6 @@
 use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 
 class Block extends Entity
diff --git a/src/Entities/Collections/BlockCollection.php b/src/Entities/Collections/BlockCollection.php
@@ -3,9 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 use FiveamCode\LaravelNotionApi\Entities\Blocks\Block;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 
diff --git a/src/Entities/Collections/DatabaseCollection.php b/src/Entities/Collections/DatabaseCollection.php
@@ -3,9 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 use FiveamCode\LaravelNotionApi\Entities\Database;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 
diff --git a/src/Entities/Collections/PageCollection.php b/src/Entities/Collections/PageCollection.php
@@ -3,9 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 use FiveamCode\LaravelNotionApi\Entities\Page;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 
diff --git a/src/Entities/Collections/UserCollection.php b/src/Entities/Collections/UserCollection.php
@@ -3,9 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Entities\Collections;
 
 use FiveamCode\LaravelNotionApi\Entities\User;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 
diff --git a/src/Entities/Database.php b/src/Entities/Database.php
@@ -4,7 +4,6 @@
 
 use DateTime;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 
 
@@ -14,7 +13,7 @@ class Database extends Entity
     protected string $objectType = "";
     protected array $rawTitle = [];
     protected array $rawProperties = [];
-    protected array $propertyNames = [];
+    protected array $propertyKeys = [];
     protected DateTime $createdTime;
     protected DateTime $lastEditedTime;
 
@@ -57,7 +56,7 @@ private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
             $this->rawProperties = $this->responseData['properties'];
-            $this->propertyNames = array_keys($this->rawProperties);
+            $this->propertyKeys = array_keys($this->rawProperties);
         }
     }
 
@@ -88,9 +87,9 @@ public function getRawProperties(): array
         return $this->rawProperties;
     }
 
-    public function getPropertyNames(): array
+    public function getPropertyKeys(): array
     {
-        return $this->propertyNames;
+        return $this->propertyKeys;
     }
 
     public function getCreatedTime(): DateTime
diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php
@@ -4,7 +4,6 @@
 
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
 use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 use Carbon\Carbon;
 use JsonSerializable;
diff --git a/src/Entities/Page.php b/src/Entities/Page.php
@@ -5,7 +5,6 @@
 use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Properties\Property;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
diff --git a/src/Entities/Properties/CreatedBy.php b/src/Entities/Properties/CreatedBy.php
@@ -2,15 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
 use FiveamCode\LaravelNotionApi\Entities\User;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class CreatedBy extends Property
 {
diff --git a/src/Entities/Properties/MultiSelect.php b/src/Entities/Properties/MultiSelect.php
@@ -2,12 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 class MultiSelect extends Property
diff --git a/src/Entities/Properties/Number.php b/src/Entities/Properties/Number.php
@@ -2,15 +2,6 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-
 class Number extends Property
 {
     protected float $number = 0;
diff --git a/src/Entities/Properties/Property.php b/src/Entities/Properties/Property.php
@@ -2,10 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 
 class Property extends Entity
diff --git a/src/Entities/Properties/Select.php b/src/Entities/Properties/Select.php
@@ -2,13 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class Select extends Property
 {
diff --git a/src/Entities/Properties/Text.php b/src/Entities/Properties/Text.php
@@ -2,14 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class Text extends Property
 {
diff --git a/src/Entities/Properties/Title.php b/src/Entities/Properties/Title.php
@@ -2,14 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\Properties;
 
-use DateTime;
-use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
-use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class Title extends Property
 {
diff --git a/src/Entities/PropertyItems/RichText.php b/src/Entities/PropertyItems/RichText.php
@@ -2,12 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\PropertyItems;
 
-use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class RichText extends Entity
 {
diff --git a/src/Entities/PropertyItems/SelectItem.php b/src/Entities/PropertyItems/SelectItem.php
@@ -2,12 +2,9 @@
 
 namespace FiveamCode\LaravelNotionApi\Entities\PropertyItems;
 
-use DateTime;
 use FiveamCode\LaravelNotionApi\Entities\Entity;
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 
 class SelectItem extends Entity
 {
diff --git a/src/Entities/User.php b/src/Entities/User.php
@@ -3,7 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Entities;
 
 use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use FiveamCode\LaravelNotionApi\Notion;
 use Illuminate\Support\Arr;
 
 class User extends Entity
diff --git a/src/Query/QueryHelper.php b/src/Query/QueryHelper.php
@@ -2,7 +2,6 @@
 
 namespace FiveamCode\LaravelNotionApi\Query;
 
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 
 class QueryHelper
diff --git a/src/Query/StartCursor.php b/src/Query/StartCursor.php
@@ -2,9 +2,6 @@
 
 namespace FiveamCode\LaravelNotionApi\Query;
 
-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
-use Illuminate\Support\Collection;
-
 class StartCursor {
     private string $cursor;
 
diff --git a/tests/EndpointPageTest.php b/tests/EndpointPageTest.php
@@ -3,7 +3,6 @@
 namespace FiveamCode\LaravelNotionApi\Tests;
 
 use Carbon\Carbon;
-use FiveamCode\LaravelNotionApi\Entities\Database;
 use FiveamCode\LaravelNotionApi\Entities\Page;
 use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use Illuminate\Support\Facades\Http;
diff --git a/tests/EnpointPagePropertyTest.php b/tests/EnpointPagePropertyTest.php
@@ -2,15 +2,12 @@
 
 namespace FiveamCode\LaravelNotionApi\Tests;
 
-use Carbon\Carbon;
-use FiveamCode\LaravelNotionApi\Entities\Database;
 use FiveamCode\LaravelNotionApi\Entities\Page;
 use FiveamCode\LaravelNotionApi\Entities\Properties\MultiSelect;
 use FiveamCode\LaravelNotionApi\Entities\Properties\Select;
 use FiveamCode\LaravelNotionApi\Entities\Properties\Text;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
 use FiveamCode\LaravelNotionApi\Entities\PropertyItems\SelectItem;
-use FiveamCode\LaravelNotionApi\Exceptions\NotionException;
 use Illuminate\Support\Facades\Http;
 use Orchestra\Testbench\TestCase;
 

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`	`use FiveamCode\LaravelNotionApi\Notion;`
`8`	`8`	`use FiveamCode\LaravelNotionApi\Query\Filter;`
`9`	`9`	`use FiveamCode\LaravelNotionApi\Query\Sorting;`
`10`		`-use FiveamCode\LaravelNotionApi\Query\StartCursor;`
`11`		`-use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;`
`12`		`-use Symfony\Component\VarDumper\Cloner\Data;`
`13`	`10`
`14`	`11`	`class Database extends Endpoint`
`15`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use FiveamCode\LaravelNotionApi\Entities\Page;`
`6`	`6`	`use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;`
`7`		`-use FiveamCode\LaravelNotionApi\Notion;`
`8`	`7`
`9`	`8`	`class Pages extends Endpoint implements EndpointInterface`
`10`	`9`	`{`