fix: broken API requests after breaking change on archived property (#419)

* Revert "fix: SDK broken after Notion API breaking change (#418)"

This reverts commit 8ab55dc.

* fix: broken API requests after breaking change on `archived` property

* remove deprecated methods from code coverage

* fixing coverage

Author: mariosimao

docs/blocks/index.md

@@ -15,7 +15,7 @@ $p = Paragraph::fromString("Simple paragraph.");
 $p->metadata()->id;                              // a9f03ee5...
 $p->metadata()->createdTime->format("Y-m-d");    // 2022-07-01
 $p->metadata()->lastEditedTime->format("Y-m-d"); // 2022-07-01
-$p->metadata()->in_trash;                        // false
+$p->metadata()->inTrash;                         // false
 $p->metadata()->hasChildren;                     // false
 ```
 

docs/how-to/delete-a-page.md

@@ -1,6 +1,6 @@
 # Delete a page
 
-Deleted pages are in_trash. It is possible to recover in_trash pages.
+Deleted pages are moved to trash. It is possible to recover pages in trash.
 
 ```php
 <?php
@@ -14,5 +14,5 @@ $pageId = "c986d7b0-7051-4f18-b165-cc0b9503ffc2";
 $page = $notion->pages()->find($pageId);
 $page = $notion->pages()->delete($page);
 
-$page->in_trash; // true
+$page->inTrash; // true
 ```

src/Blocks/BlockInterface.php

@@ -8,6 +8,11 @@ interface BlockInterface
     public function metadata(): BlockMetadata;
     public function addChild(BlockInterface $child): self;
     public function changeChildren(BlockInterface ...$children): self;
+    public function delete(): self;
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
     public function archive(): self;
 
     /** @internal */

src/Blocks/BlockMetadata.php

@@ -24,13 +24,21 @@ private function __construct(
         public readonly string $id,
         public readonly DateTimeImmutable $createdTime,
         public readonly DateTimeImmutable $lastEditedTime,
-        public readonly bool $in_trash,
+        public readonly bool $inTrash,
         public readonly bool $hasChildren,
         public readonly BlockType $type,
         private readonly string|null $unknownType = null
     ) {
+        /** @psalm-suppress DeprecatedProperty */
+        $this->archived = $inTrash;
     }
 
+    /**
+     * @deprecated 1.17.0 Use `$inTrash` instead.
+     * @codeCoverageIgnore
+     */
+    public readonly bool $archived;
+
     /** @internal */
     public static function create(BlockType $type): self
     {
@@ -68,7 +76,7 @@ public function toArray(): array
             "object"           => "block",
             "created_time"     => $this->createdTime->format(Date::FORMAT),
             "last_edited_time" => $this->lastEditedTime->format(Date::FORMAT),
-            "in_trash"         => $this->in_trash,
+            "in_trash"         => $this->inTrash,
             "has_children"     => $this->hasChildren,
             "type"             => $type,
         ];
@@ -81,7 +89,7 @@ public function toArray(): array
     }
 
     /** @internal */
-    public function archive(): self
+    public function delete(): self
     {
         return new self(
             $this->id,
@@ -113,7 +121,7 @@ public function updateHasChildren(bool $hasChildren): self
             $this->id,
             $this->createdTime,
             new DateTimeImmutable("now"),
-            $this->in_trash,
+            $this->inTrash,
             $hasChildren,
             $this->type,
         );
@@ -125,7 +133,7 @@ public function update(): self
             $this->id,
             $this->createdTime,
             new DateTimeImmutable("now"),
-            $this->in_trash,
+            $this->inTrash,
             $this->hasChildren,
             $this->type,
         );

src/Blocks/Bookmark.php

@@ -93,12 +93,21 @@ public function changeChildren(BlockInterface ...$children): never
         throw BlockException::noChindrenSupport();
     }
 
-    public function archive(): BlockInterface
+    public function delete(): BlockInterface
     {
         return new self(
-            $this->metadata->archive(),
+            $this->metadata->delete(),
             $this->url,
             $this->caption,
         );
     }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
+    public function archive(): BlockInterface
+    {
+        return $this->delete();
+    }
 }

src/Blocks/Breadcrumb.php

@@ -60,8 +60,17 @@ public function changeChildren(BlockInterface ...$children): never
         throw BlockException::noChindrenSupport();
     }
 
+    public function delete(): BlockInterface
+    {
+        return new self($this->metadata->delete());
+    }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
     public function archive(): BlockInterface
     {
-        return new self($this->metadata->archive());
+        return $this->delete();
     }
 }

src/Blocks/BulletedListItem.php

@@ -149,13 +149,22 @@ public function changeColor(Color $color): self
         );
     }
 
-    public function archive(): BlockInterface
+    public function delete(): BlockInterface
     {
         return new self(
-            $this->metadata->archive(),
+            $this->metadata->delete(),
             $this->text,
             $this->color,
             $this->children,
         );
     }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
+    public function archive(): BlockInterface
+    {
+        return $this->delete();
+    }
 }

src/Blocks/Callout.php

@@ -174,14 +174,23 @@ public function changeColor(Color $color): self
         );
     }
 
-    public function archive(): BlockInterface
+    public function delete(): BlockInterface
     {
         return new self(
-            $this->metadata->archive(),
+            $this->metadata->delete(),
             $this->text,
             $this->icon,
             $this->color,
             $this->children,
         );
     }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
+    public function archive(): BlockInterface
+    {
+        return $this->delete();
+    }
 }

src/Blocks/ChildDatabase.php

@@ -57,11 +57,20 @@ public function changeChildren(BlockInterface ...$children): never
         throw BlockException::noChindrenSupport();
     }
 
-    public function archive(): BlockInterface
+    public function delete(): BlockInterface
     {
         return new self(
-            $this->metadata->archive(),
+            $this->metadata->delete(),
             $this->title,
         );
     }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
+    public function archive(): BlockInterface
+    {
+        return $this->delete();
+    }
 }

src/Blocks/ChildPage.php

@@ -57,11 +57,20 @@ public function changeChildren(BlockInterface ...$children): never
         throw BlockException::noChindrenSupport();
     }
 
-    public function archive(): BlockInterface
+    public function delete(): BlockInterface
     {
         return new self(
-            $this->metadata->archive(),
+            $this->metadata->delete(),
             $this->title,
         );
     }
+
+    /**
+     * @deprecated 1.17.0 Use `delete()` instead.
+     * @codeCoverageIgnore
+     */
+    public function archive(): BlockInterface
+    {
+        return $this->delete();
+    }
 }