minor polishes and cleanup

johguentner · johguentner · commit 9334b9b197e5 · 2023-06-16T15:33:07.000+02:00
diff --git a/src/Builder/DatabaseBuilder.php b/src/Builder/DatabaseBuilder.php
@@ -16,13 +16,20 @@ class DatabaseBuilder
      */
     private array $payload;
 
+    /**
+     * @var Databases
+     */
+    private Databases $databasesEndpoint;
+
+
     /**
      * DatabaseBuilder constructor.
      *
      * @param  Databases  $databasesEndpoint
      */
-    public function __construct(private Databases $databasesEndpoint)
+    public function __construct(Databases $databasesEndpoint)
     {
+        $this->databasesEndpoint = $databasesEndpoint;
         $this->payload = [
             'is_inline' => false,
             'parent' => [],
@@ -43,7 +50,7 @@ public function __construct(private Databases $databasesEndpoint)
      * @param  string  $pageId
      * @return Database
      */
-    public function createInPage($pageId): Database
+    public function createInPage(string $pageId): Database
     {
         $this->payload['parent'] = [
             'type' => 'page_id',
@@ -219,7 +226,7 @@ public function scheme(callable $callback): DatabaseBuilder
      * @param  array|null  $content
      * @return DatabaseBuilder
      */
-    public function addRaw(string $title, string $propertyType, array $content = null): DatabaseBuilder
+    public function addRaw(string $title, string $propertyType, ?array $content = null): DatabaseBuilder
     {
         $this->payload['properties'][$title] = [];
         $this->payload['properties'][$title][$propertyType] = $content ?? new \stdClass();
diff --git a/src/Endpoints/Resolve.php b/src/Endpoints/Resolve.php
@@ -85,9 +85,8 @@ public function parent(NotionParent $parent): Page|Database|Block|NotionParent
                 return $this->notion->block($parent->getId())->retrieve();
             case 'workspace':
                 return $parent;
-                // throw new HandlingException('A Notion Workspace cannot be resolved by the Notion API.');
             default:
-                throw new HandlingException('Unknown parent type while resolving the notion parent');
+                throw new HandlingException('Unknown parent type while resolving the Notion parent');
         }
     }
 
diff --git a/src/Entities/NotionParent.php b/src/Entities/NotionParent.php
@@ -25,7 +25,7 @@ protected function setResponseData(array $responseData): void
             && $responseData['object'] !== 'workspace'
             && $responseData['object'] !== 'block_id'
         ) {
-            throw HandlingException::instance('invalid json-array: the given object is not a valid parent');
+            throw HandlingException::instance('Invalid JSON: The given object is not a valid parent');
         }
 
         $this->fillFromRaw();
diff --git a/src/Macros/PestHttpRecorder.php b/src/Macros/PestHttpRecorder.php
@@ -34,11 +34,11 @@ public static function register()
 
 class HttpRecorder
 {
-    private $snapshotDirectory = 'snapshots';
+    private string $snapshotDirectory = 'snapshots';
 
-    private $usePrettyJson = true;
+    private bool $usePrettyJson = true;
 
-    private $requestNames = [];
+    private array $requestNames = [];
 
     public function storeIn($directory)
     {

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,8 @@ public function parent(NotionParent $parent): Page\|Database\|Block\|NotionParent`
`85`	`85`	`return $this->notion->block($parent->getId())->retrieve();`
`86`	`86`	`case 'workspace':`
`87`	`87`	`return $parent;`
`88`		`- // throw new HandlingException('A Notion Workspace cannot be resolved by the Notion API.');`
`89`	`88`	`default:`
`90`		`- throw new HandlingException('Unknown parent type while resolving the notion parent');`
	`89`	`+ throw new HandlingException('Unknown parent type while resolving the Notion parent');`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected function setResponseData(array $responseData): void`
`25`	`25`	`&& $responseData['object'] !== 'workspace'`
`26`	`26`	`&& $responseData['object'] !== 'block_id'`
`27`	`27`	`) {`
`28`		`- throw HandlingException::instance('invalid json-array: the given object is not a valid parent');`
	`28`	`+ throw HandlingException::instance('Invalid JSON: The given object is not a valid parent');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`$this->fillFromRaw();`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ public static function register()`
`34`	`34`
`35`	`35`	`class HttpRecorder`
`36`	`36`	`{`
`37`		`- private $snapshotDirectory = 'snapshots';`
	`37`	`+ private string $snapshotDirectory = 'snapshots';`
`38`	`38`
`39`		`- private $usePrettyJson = true;`
	`39`	`+ private bool $usePrettyJson = true;`
`40`	`40`
`41`		`- private $requestNames = [];`
	`41`	`+ private array $requestNames = [];`
`42`	`42`
`43`	`43`	`public function storeIn($directory)`
`44`	`44`	`{`