Skip to content

Commit 77cc8c8

Browse files
MaestroErrorMaestroError
committed
2 parents e940151 + 3b36382 commit 77cc8c8

28 files changed

+353
-350
lines changed

‎config/md-notion.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@
66
/**
77
* The Notion API key used for authentication with the Notion API.
88
*/
9-
"notion_api_key" => env("NOTION_API_KEY", ""),
9+
'notion_api_key' => env('NOTION_API_KEY', ''),
1010

1111
/**
1212
* Defines the maximum block number that can be fetched in a single request.
1313
*/
14-
"default_page_size" => env("NOTION_DEFAULT_PAGE_SIZE", 100),
14+
'default_page_size' => env('NOTION_DEFAULT_PAGE_SIZE', 100),
1515

1616
/**
1717
* Block type to adapter class mappings.
1818
* Keys are Notion block types from the JSON response.
1919
* Values are fully qualified adapter class names.
2020
*/
21-
"adapters" => [
22-
"paragraph" => \RedberryProducts\MdNotion\Adapters\ParagraphAdapter::class,
23-
"heading_1" => fn() => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(1),
24-
"heading_2" => fn() => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(2),
25-
"heading_3" => fn() => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(3),
26-
"bulleted_list_item" => \RedberryProducts\MdNotion\Adapters\BulletedListItemAdapter::class,
27-
"numbered_list_item" => \RedberryProducts\MdNotion\Adapters\NumberedListItemAdapter::class,
28-
"to_do" => \RedberryProducts\MdNotion\Adapters\ToDoAdapter::class,
29-
"toggle" => \RedberryProducts\MdNotion\Adapters\ToggleAdapter::class,
30-
"code" => \RedberryProducts\MdNotion\Adapters\CodeAdapter::class,
31-
"quote" => \RedberryProducts\MdNotion\Adapters\QuoteAdapter::class,
32-
"callout" => \RedberryProducts\MdNotion\Adapters\CalloutAdapter::class,
33-
"divider" => \RedberryProducts\MdNotion\Adapters\DividerAdapter::class,
34-
"bookmark" => \RedberryProducts\MdNotion\Adapters\BookmarkAdapter::class,
35-
"image" => \RedberryProducts\MdNotion\Adapters\ImageAdapter::class,
36-
"file" => \RedberryProducts\MdNotion\Adapters\FileAdapter::class,
37-
"video" => \RedberryProducts\MdNotion\Adapters\VideoAdapter::class,
38-
"column_list" => \RedberryProducts\MdNotion\Adapters\ColumnListAdapter::class,
39-
"column" => \RedberryProducts\MdNotion\Adapters\ColumnAdapter::class,
40-
"table" => \RedberryProducts\MdNotion\Adapters\TableAdapter::class,
41-
"table_row" => \RedberryProducts\MdNotion\Adapters\TableRowAdapter::class,
42-
"child_page" => \RedberryProducts\MdNotion\Adapters\ChildPageAdapter::class,
43-
"child_database" => \RedberryProducts\MdNotion\Adapters\ChildDatabaseAdapter::class,
21+
'adapters' => [
22+
'paragraph' => \RedberryProducts\MdNotion\Adapters\ParagraphAdapter::class,
23+
'heading_1' => fn () => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(1),
24+
'heading_2' => fn () => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(2),
25+
'heading_3' => fn () => new \RedberryProducts\MdNotion\Adapters\HeadingAdapter(3),
26+
'bulleted_list_item' => \RedberryProducts\MdNotion\Adapters\BulletedListItemAdapter::class,
27+
'numbered_list_item' => \RedberryProducts\MdNotion\Adapters\NumberedListItemAdapter::class,
28+
'to_do' => \RedberryProducts\MdNotion\Adapters\ToDoAdapter::class,
29+
'toggle' => \RedberryProducts\MdNotion\Adapters\ToggleAdapter::class,
30+
'code' => \RedberryProducts\MdNotion\Adapters\CodeAdapter::class,
31+
'quote' => \RedberryProducts\MdNotion\Adapters\QuoteAdapter::class,
32+
'callout' => \RedberryProducts\MdNotion\Adapters\CalloutAdapter::class,
33+
'divider' => \RedberryProducts\MdNotion\Adapters\DividerAdapter::class,
34+
'bookmark' => \RedberryProducts\MdNotion\Adapters\BookmarkAdapter::class,
35+
'image' => \RedberryProducts\MdNotion\Adapters\ImageAdapter::class,
36+
'file' => \RedberryProducts\MdNotion\Adapters\FileAdapter::class,
37+
'video' => \RedberryProducts\MdNotion\Adapters\VideoAdapter::class,
38+
'column_list' => \RedberryProducts\MdNotion\Adapters\ColumnListAdapter::class,
39+
'column' => \RedberryProducts\MdNotion\Adapters\ColumnAdapter::class,
40+
'table' => \RedberryProducts\MdNotion\Adapters\TableAdapter::class,
41+
'table_row' => \RedberryProducts\MdNotion\Adapters\TableRowAdapter::class,
42+
'child_page' => \RedberryProducts\MdNotion\Adapters\ChildPageAdapter::class,
43+
'child_database' => \RedberryProducts\MdNotion\Adapters\ChildDatabaseAdapter::class,
4444
],
4545
];

‎src/Adapters/BaseBlockAdapter.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected function getBlockContent(array $block): string
142142
*/
143143
protected function processIcon(array $icon): string
144144
{
145-
return match($icon['type']) {
145+
return match ($icon['type']) {
146146
'emoji' => $icon['emoji'],
147147
'external' => $this->processExternalIcon($icon['external']['url']),
148148
'file' => sprintf('[🔗](%s)', $icon['file']['url']),
@@ -159,10 +159,11 @@ private function processExternalIcon(string $url): string
159159
{
160160
if (preg_match('/\/([^\/]+)_[^\/]+\.svg$/', $url, $matches)) {
161161
$iconName = ucfirst($matches[1]);
162+
162163
return sprintf('[%s](%s)', $iconName, $url);
163164
}
164165

165-
return '[Icon](' . $url . ')';
166+
return '[Icon]('.$url.')';
166167
}
167168

168169
/**
@@ -171,6 +172,7 @@ private function processExternalIcon(string $url): string
171172
public function setSdk(Notion $sdk): self
172173
{
173174
$this->sdk = $sdk;
175+
174176
return $this;
175177
}
176178

‎src/Adapters/BlockAdapterFactory.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
namespace RedberryProducts\MdNotion\Adapters;
44

5-
use RedberryProducts\MdNotion\SDK\Notion;
65
use Illuminate\Support\Arr;
6+
use RedberryProducts\MdNotion\SDK\Notion;
77

88
class BlockAdapterFactory
99
{
1010
private Notion $sdk;
11+
1112
private array $adapters = [];
13+
1214
private array $adapterMap;
1315

1416
public function __construct(Notion $sdk, array $adapterMap)
@@ -19,18 +21,18 @@ public function __construct(Notion $sdk, array $adapterMap)
1921

2022
public function create(string $blockType): BlockAdapterInterface
2123
{
22-
if (!isset($this->adapters[$blockType])) {
24+
if (! isset($this->adapters[$blockType])) {
2325
$adapterClass = Arr::get($this->adapterMap, $blockType);
2426

25-
if (!$adapterClass || !class_exists($adapterClass)) {
27+
if (! $adapterClass || ! class_exists($adapterClass)) {
2628
throw new \InvalidArgumentException(
27-
"No adapter configured for block type: {$blockType}. " .
28-
"Please check your md-notion.php config file."
29+
"No adapter configured for block type: {$blockType}. ".
30+
'Please check your md-notion.php config file.'
2931
);
3032
}
3133

3234
/** @var BlockAdapterInterface $adapter */
33-
$adapter = is_callable($adapterClass) ? $adapterClass() : new $adapterClass();
35+
$adapter = is_callable($adapterClass) ? $adapterClass() : new $adapterClass;
3436
$adapter->setSdk($this->sdk);
3537
$this->adapters[$blockType] = $adapter;
3638
}

‎src/Adapters/FileAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ protected function prepareData(array $block): array
2020
{
2121
$dto = FileDTO::from($block);
2222

23-
$url = $dto->type === 'file'
23+
$url = $dto->type === 'file'
2424
? $dto->file['url']
2525
: $dto->external['url'];
2626

‎src/Adapters/HeadingAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class HeadingAdapter extends BaseBlockAdapter
99
{
1010
public function getType(): string
1111
{
12-
return 'heading_' . $this->level;
12+
return 'heading_'.$this->level;
1313
}
1414

1515
public function getTemplate(): string

‎src/Adapters/ImageAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected function prepareData(array $block): array
2121
{
2222
$dto = ImageDTO::from($block);
2323

24-
$url = $dto->type === 'file'
24+
$url = $dto->type === 'file'
2525
? $dto->file['url']
2626
: $dto->external['url'];
2727

‎src/Adapters/TodoAdapter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace RedberryProducts\MdNotion\Adapters;
44

5-
use RedberryProducts\MdNotion\DTOs\TodoDTO;
65
use RedberryProducts\MdNotion\DTOs\RichTextDTO;
6+
use RedberryProducts\MdNotion\DTOs\TodoDTO;
77

88
class TodoAdapter extends BaseBlockAdapter
99
{

‎src/Adapters/VideoAdapter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace RedberryProducts\MdNotion\Adapters;
44

5-
use RedberryProducts\MdNotion\DTOs\VideoDTO;
65
use RedberryProducts\MdNotion\DTOs\RichTextDTO;
6+
use RedberryProducts\MdNotion\DTOs\VideoDTO;
77

88
class VideoAdapter extends BaseBlockAdapter
99
{
@@ -21,7 +21,7 @@ protected function prepareData(array $block): array
2121
{
2222
$dto = VideoDTO::from($block);
2323

24-
$url = $dto->type === 'file'
24+
$url = $dto->type === 'file'
2525
? $dto->file['url']
2626
: $dto->external['url'];
2727

‎src/DTOs/FileDTO.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected function fromArray(array $data): void
3939
{
4040
$this->type = $data['type'];
4141
$this->caption = RichTextDTO::collection($data['caption'] ?? []);
42-
42+
4343
if ($this->type === 'file') {
4444
$this->file = $data['file'];
4545
$this->name = $data['name'] ?? basename($this->file['url']);

‎src/DTOs/HeadingDTO.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ public function __construct(
99
public bool $isToggleable,
1010
public string $color,
1111
public string $level
12-
) {
13-
}
12+
) {}
1413

1514
public static function from(array $block): self
1615
{
1716
$type = $block['type']; // heading_1, heading_2, or heading_3
1817
$heading = $block[$type];
19-
18+
2019
return new self(
2120
richText: $heading['rich_text'],
2221
isToggleable: $heading['is_toggleable'],

0 commit comments

Comments
 (0)