Merge pull request #65 from bumpcore/64-1x-laravel-11-support

megasteve19 · web-flow · commit 90b00f1b20dc · 2024-06-08T00:00:57.000+03:00
Laravel 11 support
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,29 +1,38 @@
 name: "Tests"
 
 on:
-  push:
-    branches:
-    - master
-    - '*.x'
-  pull_request:
+    push:
+        branches:
+          - master
+          - '*.x'
+    pull_request:
 
 jobs:
-  run:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-versions: ["8.1", "8.2"]
-    steps:
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
+    run:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [8.1, 8.2, 8.3]
+                laravel: [10, 11]
+                exclude:
+                  - php: '8.1'
+                    laravel: 11
 
-    - name: Checkout code
-      uses: actions/checkout@v3
+        name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-interaction
+        steps:
+          - name: Setup PHP
+            uses: shivammathur/setup-php@v2
+            with:
+                php-version: ${{ matrix.php }}
 
-    - name: Execute tests
-      run: ./vendor/bin/pest
+          - name: Checkout code
+            uses: actions/checkout@v3
+
+          - name: Install dependencies
+            run: |
+                composer require "illuminate/support=^${{ matrix.laravel }}" --no-update
+                composer update --prefer-dist --no-interaction --no-progress
+
+          - name: Execute tests
+            run: ./vendor/bin/pest
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ Editor.php is a package designed to assist in parsing and manipulating the outpu
 
 ## Table Of Contents
 
+* [Version Table](#version-table)
 * [Quick Start](#quick-start)
 * [EditorPhp](#editorphp)
   + [Creating Instance](#creating-instance)
@@ -32,6 +33,12 @@ Editor.php is a package designed to assist in parsing and manipulating the outpu
   + [Publishing Views and Configuration](#publishing-views-and-configuration)
   + [Commands](#commands)
 * [Contribution](#contribution)
+
+# Version Table
+| Editor.php | Laravel | PHP |
+| --- | --- | --- |
+| 1.x | 10.x ~ 11.x | 8.1 ~ 8.3 |
+
 # Quick Start
 
 Install package by:
diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
 	],
 	"require": {
 		"php": "^8.1",
-		"illuminate/support": "^10.0",
-		"illuminate/validation": "^10.0",
+		"illuminate/support": "^10.0|^11.0",
+		"illuminate/validation": "^10.0|^11.0",
 		"fakerphp/faker": "^1.21"
 	},
 	"extra": {
@@ -34,8 +34,8 @@
 		}
 	},
 	"require-dev": {
-		"pestphp/pest": "^1.22.4",
-		"orchestra/testbench": "^8.0",
+		"pestphp/pest": "^1.22.4|^2.0",
+		"orchestra/testbench": "^8.0|^9.0",
 		"friendsofphp/php-cs-fixer": "^3.14.4",
 		"phpstan/phpstan": "^1.10"
 	},
diff --git a/config/editor.php b/config/editor.php
@@ -2,20 +2,20 @@
 
 return [
     'blocks' => [
-        'attaches' => \BumpCore\EditorPhp\Blocks\Attaches::class,
-        'checklist' => \BumpCore\EditorPhp\Blocks\Checklist::class,
-        'code' => \BumpCore\EditorPhp\Blocks\Code::class,
-        'delimiter' => \BumpCore\EditorPhp\Blocks\Delimiter::class,
-        'embed' => \BumpCore\EditorPhp\Blocks\Embed::class,
-        'header' => \BumpCore\EditorPhp\Blocks\Header::class,
-        'image' => \BumpCore\EditorPhp\Blocks\Image::class,
-        'linkTool' => \BumpCore\EditorPhp\Blocks\LinkTool::class,
-        'list' => \BumpCore\EditorPhp\Blocks\ListBlock::class,
-        'paragraph' => \BumpCore\EditorPhp\Blocks\Paragraph::class,
-        'personality' => \BumpCore\EditorPhp\Blocks\Personality::class,
-        'quote' => \BumpCore\EditorPhp\Blocks\Quote::class,
-        'raw' => \BumpCore\EditorPhp\Blocks\Raw::class,
-        'table' => \BumpCore\EditorPhp\Blocks\Table::class,
-        'warning' => \BumpCore\EditorPhp\Blocks\Warning::class,
+        'attaches' => BumpCore\EditorPhp\Blocks\Attaches::class,
+        'checklist' => BumpCore\EditorPhp\Blocks\Checklist::class,
+        'code' => BumpCore\EditorPhp\Blocks\Code::class,
+        'delimiter' => BumpCore\EditorPhp\Blocks\Delimiter::class,
+        'embed' => BumpCore\EditorPhp\Blocks\Embed::class,
+        'header' => BumpCore\EditorPhp\Blocks\Header::class,
+        'image' => BumpCore\EditorPhp\Blocks\Image::class,
+        'linkTool' => BumpCore\EditorPhp\Blocks\LinkTool::class,
+        'list' => BumpCore\EditorPhp\Blocks\ListBlock::class,
+        'paragraph' => BumpCore\EditorPhp\Blocks\Paragraph::class,
+        'personality' => BumpCore\EditorPhp\Blocks\Personality::class,
+        'quote' => BumpCore\EditorPhp\Blocks\Quote::class,
+        'raw' => BumpCore\EditorPhp\Blocks\Raw::class,
+        'table' => BumpCore\EditorPhp\Blocks\Table::class,
+        'warning' => BumpCore\EditorPhp\Blocks\Warning::class,
     ],
 ];
diff --git a/src/Blocks/Image.php b/src/Blocks/Image.php
@@ -65,7 +65,7 @@ public function render(): string
     public static function fake(\Faker\Generator $faker): array
     {
         return [
-            'file' => ['url' => $faker->imageUrl()],
+            'file' => ['url' => 'https://picsum.photos/200/300'],
             'caption' => $faker->text(),
             'withBorder' => $faker->boolean(),
             'stretched' => $faker->boolean(),
diff --git a/src/Blocks/LinkTool.php b/src/Blocks/LinkTool.php
@@ -73,7 +73,7 @@ public static function fake(\Faker\Generator $faker): array
                 'title' => $faker->text(32),
                 'site_name' => $faker->text(32),
                 'description' => $faker->text(96),
-                'image' => ['url' => $faker->imageUrl()],
+                'image' => ['url' => 'https://picsum.photos/200/300'],
             ],
         ];
     }
diff --git a/src/Blocks/Personality.php b/src/Blocks/Personality.php
@@ -69,7 +69,7 @@ public static function fake(\Faker\Generator $faker): array
             'name' => $faker->name(),
             'description' => $faker->text(),
             'link' => $faker->url(),
-            'photo' => $faker->imageUrl(),
+            'photo' => 'https://picsum.photos/200/300',
         ];
     }
 }
diff --git a/src/Parser.php b/src/Parser.php
@@ -17,21 +17,21 @@ class Parser
      * @var array<string, string>
      */
     public static array $blocks = [
-        'attaches' => \BumpCore\EditorPhp\Blocks\Attaches::class,
-        'checklist' => \BumpCore\EditorPhp\Blocks\Checklist::class,
-        'code' => \BumpCore\EditorPhp\Blocks\Code::class,
-        'delimiter' => \BumpCore\EditorPhp\Blocks\Delimiter::class,
-        'embed' => \BumpCore\EditorPhp\Blocks\Embed::class,
-        'header' => \BumpCore\EditorPhp\Blocks\Header::class,
-        'image' => \BumpCore\EditorPhp\Blocks\Image::class,
-        'linkTool' => \BumpCore\EditorPhp\Blocks\LinkTool::class,
-        'list' => \BumpCore\EditorPhp\Blocks\ListBlock::class,
-        'paragraph' => \BumpCore\EditorPhp\Blocks\Paragraph::class,
-        'personality' => \BumpCore\EditorPhp\Blocks\Personality::class,
-        'quote' => \BumpCore\EditorPhp\Blocks\Quote::class,
-        'raw' => \BumpCore\EditorPhp\Blocks\Raw::class,
-        'table' => \BumpCore\EditorPhp\Blocks\Table::class,
-        'warning' => \BumpCore\EditorPhp\Blocks\Warning::class,
+        'attaches' => Blocks\Attaches::class,
+        'checklist' => Blocks\Checklist::class,
+        'code' => Blocks\Code::class,
+        'delimiter' => Blocks\Delimiter::class,
+        'embed' => Blocks\Embed::class,
+        'header' => Blocks\Header::class,
+        'image' => Blocks\Image::class,
+        'linkTool' => Blocks\LinkTool::class,
+        'list' => Blocks\ListBlock::class,
+        'paragraph' => Blocks\Paragraph::class,
+        'personality' => Blocks\Personality::class,
+        'quote' => Blocks\Quote::class,
+        'raw' => Blocks\Raw::class,
+        'table' => Blocks\Table::class,
+        'warning' => Blocks\Warning::class,
     ];
 
     /**
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -5,20 +5,20 @@
 uses()
     ->beforeEach(function() {
         EditorPhp::register([
-            'attaches' => \BumpCore\EditorPhp\Blocks\Attaches::class,
-            'checklist' => \BumpCore\EditorPhp\Blocks\Checklist::class,
-            'code' => \BumpCore\EditorPhp\Blocks\Code::class,
-            'delimiter' => \BumpCore\EditorPhp\Blocks\Delimiter::class,
-            'embed' => \BumpCore\EditorPhp\Blocks\Embed::class,
-            'header' => \BumpCore\EditorPhp\Blocks\Header::class,
-            'image' => \BumpCore\EditorPhp\Blocks\Image::class,
-            'linkTool' => \BumpCore\EditorPhp\Blocks\LinkTool::class,
-            'list' => \BumpCore\EditorPhp\Blocks\ListBlock::class,
-            'paragraph' => \BumpCore\EditorPhp\Blocks\Paragraph::class,
-            'personality' => \BumpCore\EditorPhp\Blocks\Personality::class,
-            'quote' => \BumpCore\EditorPhp\Blocks\Quote::class,
-            'raw' => \BumpCore\EditorPhp\Blocks\Raw::class,
-            'table' => \BumpCore\EditorPhp\Blocks\Table::class,
-            'warning' => \BumpCore\EditorPhp\Blocks\Warning::class,
+            'attaches' => BumpCore\EditorPhp\Blocks\Attaches::class,
+            'checklist' => BumpCore\EditorPhp\Blocks\Checklist::class,
+            'code' => BumpCore\EditorPhp\Blocks\Code::class,
+            'delimiter' => BumpCore\EditorPhp\Blocks\Delimiter::class,
+            'embed' => BumpCore\EditorPhp\Blocks\Embed::class,
+            'header' => BumpCore\EditorPhp\Blocks\Header::class,
+            'image' => BumpCore\EditorPhp\Blocks\Image::class,
+            'linkTool' => BumpCore\EditorPhp\Blocks\LinkTool::class,
+            'list' => BumpCore\EditorPhp\Blocks\ListBlock::class,
+            'paragraph' => BumpCore\EditorPhp\Blocks\Paragraph::class,
+            'personality' => BumpCore\EditorPhp\Blocks\Personality::class,
+            'quote' => BumpCore\EditorPhp\Blocks\Quote::class,
+            'raw' => BumpCore\EditorPhp\Blocks\Raw::class,
+            'table' => BumpCore\EditorPhp\Blocks\Table::class,
+            'warning' => BumpCore\EditorPhp\Blocks\Warning::class,
         ]);
     })->in('.');

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function render(): string`
`65`	`65`	`public static function fake(\Faker\Generator $faker): array`
`66`	`66`	`{`
`67`	`67`	`return [`
`68`		`- 'file' => ['url' => $faker->imageUrl()],`
	`68`	`+ 'file' => ['url' => 'https://picsum.photos/200/300'],`
`69`	`69`	`'caption' => $faker->text(),`
`70`	`70`	`'withBorder' => $faker->boolean(),`
`71`	`71`	`'stretched' => $faker->boolean(),`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static function fake(\Faker\Generator $faker): array`
`73`	`73`	`'title' => $faker->text(32),`
`74`	`74`	`'site_name' => $faker->text(32),`
`75`	`75`	`'description' => $faker->text(96),`
`76`		`- 'image' => ['url' => $faker->imageUrl()],`
	`76`	`+ 'image' => ['url' => 'https://picsum.photos/200/300'],`
`77`	`77`	`],`
`78`	`78`	`];`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static function fake(\Faker\Generator $faker): array`
`69`	`69`	`'name' => $faker->name(),`
`70`	`70`	`'description' => $faker->text(),`
`71`	`71`	`'link' => $faker->url(),`
`72`		`- 'photo' => $faker->imageUrl(),`
	`72`	`+ 'photo' => 'https://picsum.photos/200/300',`
`73`	`73`	`];`
`74`	`74`	`}`
`75`	`75`	`}`