Unify constructor method names (#131)

mariosimao · Nov 1, 2022 · 5290088 · 5290088
1 parent f5a22dc
commit 5290088
Show file tree

Hide file tree

Showing 64 changed files with 330 additions and 292 deletions.
diff --git a/src/Blocks/Bookmark.php b/src/Blocks/Bookmark.php
@@ -35,7 +35,7 @@ private function __construct(
     /**
      * Create a bookmark from a URL
      */
-    public static function create(string $url): self
+    public static function fromUrl(string $url): self
     {
         $metadata = BlockMetadata::create(BlockType::Bookmark);
 

diff --git a/src/Blocks/BulletedListItem.php b/src/Blocks/BulletedListItem.php
@@ -49,7 +49,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $metadata = BlockMetadata::create(BlockType::BulletedListItem);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($metadata, $text, []);
     }

diff --git a/src/Blocks/Callout.php b/src/Blocks/Callout.php
@@ -41,16 +41,16 @@ private function __construct(
     public static function create(): self
     {
         $metadata = BlockMetadata::create(BlockType::Callout);
-        $icon = Icon::fromEmoji(Emoji::create("⭐"));
+        $icon = Icon::fromEmoji(Emoji::fromString("⭐"));
 
         return new self($metadata, [], $icon, []);
     }
 
     public static function fromString(string $emoji, string $content): self
     {
         $metadata = BlockMetadata::create(BlockType::Callout);
-        $text = [ RichText::createText($content) ];
-        $icon = Icon::fromEmoji(Emoji::create($emoji));
+        $text = [ RichText::fromString($content) ];
+        $icon = Icon::fromEmoji(Emoji::fromString($emoji));
 
         return new self($metadata, $text, $icon, []);
     }

diff --git a/src/Blocks/Code.php b/src/Blocks/Code.php
@@ -35,22 +35,27 @@ private function __construct(
         $metadata->checkType(BlockType::Code);
     }
 
+    public static function create(): self
+    {
+        return self::fromText([]);
+    }
+
     /** @param RichText[] $text */
-    public static function create(
-        array $text = [],
+    public static function fromText(
+        array $text,
         CodeLanguage $language = CodeLanguage::PlainText,
     ): self {
         $metadata = BlockMetadata::create(BlockType::Code);
 
         return new self($metadata, $text, $language, []);
     }
 
-    public static function createFromString(
+    public static function fromString(
         string $code,
         CodeLanguage $language = CodeLanguage::PlainText,
     ): self {
         $metadata = BlockMetadata::create(BlockType::Code);
-        $text = [ RichText::createText($code) ];
+        $text = [ RichText::fromString($code) ];
 
         return new self($metadata, $text, $language, []);
     }

diff --git a/src/Blocks/Embed.php b/src/Blocks/Embed.php
@@ -22,7 +22,7 @@ private function __construct(
         $metadata->checkType(BlockType::Embed);
     }
 
-    public static function create(string $url = ""): self
+    public static function fromUrl(string $url = ""): self
     {
         $metadata = BlockMetadata::create(BlockType::Embed);
 

diff --git a/src/Blocks/EquationBlock.php b/src/Blocks/EquationBlock.php
@@ -25,10 +25,10 @@ private function __construct(
         $metadata->checkType(BlockType::Equation);
     }
 
-    public static function create(string $expression = ""): self
+    public static function fromString(string $expression = ""): self
     {
         $block = BlockMetadata::create(BlockType::Equation);
-        $equation = Equation::create($expression);
+        $equation = Equation::fromString($expression);
 
         return new self($block, $equation);
     }

diff --git a/src/Blocks/FileBlock.php b/src/Blocks/FileBlock.php
@@ -23,7 +23,7 @@ private function __construct(
         $metadata->checkType(BlockType::File);
     }
 
-    public static function create(File $file): self
+    public static function fromFile(File $file): self
     {
         $metadata = BlockMetadata::create(BlockType::File);
 

diff --git a/src/Blocks/Heading1.php b/src/Blocks/Heading1.php
@@ -35,7 +35,7 @@ private function __construct(
         $metadata->checkType(BlockType::Heading1);
     }
 
-    public static function create(RichText ...$text): self
+    public static function fromText(RichText ...$text): self
     {
         $block = BlockMetadata::create(BlockType::Heading1);
 
@@ -45,7 +45,7 @@ public static function create(RichText ...$text): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Heading1);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, false, []);
     }

diff --git a/src/Blocks/Heading2.php b/src/Blocks/Heading2.php
@@ -35,7 +35,7 @@ private function __construct(
         $metadata->checkType(BlockType::Heading2);
     }
 
-    public static function create(RichText ...$text): self
+    public static function fromText(RichText ...$text): self
     {
         $block = BlockMetadata::create(BlockType::Heading2);
 
@@ -45,7 +45,7 @@ public static function create(RichText ...$text): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Heading2);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, false, []);
     }

diff --git a/src/Blocks/Heading3.php b/src/Blocks/Heading3.php
@@ -35,7 +35,7 @@ private function __construct(
         $metadata->checkType(BlockType::Heading3);
     }
 
-    public static function create(RichText ...$text): self
+    public static function fromText(RichText ...$text): self
     {
         $block = BlockMetadata::create(BlockType::Heading3);
 
@@ -45,7 +45,7 @@ public static function create(RichText ...$text): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Heading3);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, false, []);
     }

diff --git a/src/Blocks/Image.php b/src/Blocks/Image.php
@@ -22,7 +22,7 @@ private function __construct(
         $metadata->checkType(BlockType::Image);
     }
 
-    public static function create(File $file): self
+    public static function fromFile(File $file): self
     {
         $block = BlockMetadata::create(BlockType::Image);
 

diff --git a/src/Blocks/NumberedListItem.php b/src/Blocks/NumberedListItem.php
@@ -42,7 +42,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::NumberedListItem);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, []);
     }

diff --git a/src/Blocks/Paragraph.php b/src/Blocks/Paragraph.php
@@ -41,7 +41,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Paragraph);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, []);
     }

diff --git a/src/Blocks/Pdf.php b/src/Blocks/Pdf.php
@@ -22,7 +22,7 @@ private function __construct(
         $metadata->checkType(BlockType::Pdf);
     }
 
-    public static function create(File $file): self
+    public static function fromFile(File $file): self
     {
         $block = BlockMetadata::create(BlockType::Pdf);
 

diff --git a/src/Blocks/Quote.php b/src/Blocks/Quote.php
@@ -42,7 +42,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Quote);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, []);
     }

diff --git a/src/Blocks/ToDo.php b/src/Blocks/ToDo.php
@@ -44,7 +44,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::ToDo);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, false, []);
     }

diff --git a/src/Blocks/Toggle.php b/src/Blocks/Toggle.php
@@ -31,7 +31,7 @@ private function __construct(
         $metadata->checkType(BlockType::Toggle);
     }
 
-    public static function create(): self
+    public static function createEmpty(): self
     {
         $block = BlockMetadata::create(BlockType::Toggle);
 
@@ -41,7 +41,7 @@ public static function create(): self
     public static function fromString(string $content): self
     {
         $block = BlockMetadata::create(BlockType::Toggle);
-        $text = [ RichText::createText($content) ];
+        $text = [ RichText::fromString($content) ];
 
         return new self($block, $text, []);
     }

diff --git a/src/Blocks/Video.php b/src/Blocks/Video.php
@@ -22,7 +22,7 @@ private function __construct(
         $metadata->checkType(BlockType::Video);
     }
 
-    public static function create(File $file): self
+    public static function fromFile(File $file): self
     {
         $block = BlockMetadata::create(BlockType::Video);
 

diff --git a/src/Common/Emoji.php b/src/Common/Emoji.php
@@ -14,7 +14,7 @@ private function __construct(
     ) {
     }
 
-    public static function create(string $emoji): self
+    public static function fromString(string $emoji): self
     {
         return new self($emoji);
     }

diff --git a/src/Common/Equation.php b/src/Common/Equation.php
@@ -14,7 +14,7 @@ private function __construct(
     ) {
     }
 
-    public static function create(string $expression): self
+    public static function fromString(string $expression): self
     {
         return new self($expression);
     }

diff --git a/src/Common/Mention.php b/src/Common/Mention.php
@@ -29,22 +29,22 @@ private function __construct(
     ) {
     }
 
-    public static function createPage(string $pageId): self
+    public static function page(string $pageId): self
     {
         return new self(MentionType::Page, $pageId, null, null, null);
     }
 
-    public static function createDatabase(string $databaseId): self
+    public static function database(string $databaseId): self
     {
         return new self(MentionType::Database, null, $databaseId, null, null);
     }
 
-    public static function createUser(User $user): self
+    public static function user(User $user): self
     {
         return new self(MentionType::User, null, null, $user, null);
     }
 
-    public static function createDate(Date $date): self
+    public static function date(Date $date): self
     {
         return new self(MentionType::Date, null, null, null, $date);
     }

diff --git a/src/Common/RichText.php b/src/Common/RichText.php
@@ -34,22 +34,22 @@ private function __construct(
     }
 
     /** @psalm-mutation-free */
-    public static function createText(string $content): self
+    public static function fromString(string $content): self
     {
-        $text = Text::create($content);
+        $text = Text::fromString($content);
 
-        return self::createFromText($text);
+        return self::fromText($text);
     }
 
     public static function createLink(string $content, string $url): self
     {
-        $text = Text::create($content)->changeUrl($url);
+        $text = Text::fromString($content)->changeUrl($url);
 
-        return self::createFromText($text);
+        return self::fromText($text);
     }
 
     /** @psalm-mutation-free */
-    public static function createFromText(Text $text): self
+    public static function fromText(Text $text): self
     {
         $annotations = Annotations::create();
 
@@ -64,33 +64,39 @@ public static function createFromText(Text $text): self
         );
     }
 
-    public static function createEquation(string $expression): self
+    public static function fromEquation(Equation $equation): self
     {
-        $equation = Equation::create($expression);
+        $annotations = Annotations::create();
 
-        return self::createFromEquation($equation);
+        return new self(
+            $equation->expression,
+            null,
+            $annotations,
+            RichTextType::Equation,
+            null,
+            null,
+            $equation
+        );
     }
 
-    public static function createFromEquation(Equation $equation): self
+    public static function fromMention(Mention $mention): self
     {
         $annotations = Annotations::create();
 
         return new self(
-            $equation->expression,
+            "",
             null,
             $annotations,
             RichTextType::Equation,
             null,
+            $mention,
             null,
-            $equation
         );
     }
 
     public static function newLine(): self
     {
-        $text = Text::create("\n");
-
-        return self::createFromText($text);
+        return self::fromString("\n");
     }
 
     /**

diff --git a/src/Common/Text.php b/src/Common/Text.php
@@ -16,7 +16,7 @@ private function __construct(
     }
 
     /** @psalm-mutation-free */
-    public static function create(string $content): self
+    public static function fromString(string $content): self
     {
         return new self($content, null);
     }