Merge pull request #113 from anstapol/nova-5

Nova 5 support

Thank you @anstapol and @Woeler.

Author: roelofr

.github/workflows/test-code.yml

@@ -23,12 +23,15 @@ jobs:
         laravel:
           - '10.0'
           - '11.0'
+          - '12.0'
 
         include:
           - laravel: '10.0'
             testbench: '8.0'
           - laravel: '11.0'
             testbench: '9.0'
+          - laravel: '12.0'
+            testbench: '10.0'
           - php: 8.3
             laravel: '11.0'
             stable: true

.gitignore

@@ -6,3 +6,6 @@
 Thumbs.db
 .php-cs-fixer.cache
 /composer.lock
+/auth.json
+/report-junit.xml
+/.env

composer.json

@@ -15,14 +15,15 @@
         "ext-json": "*",
         "codex-team/editor.js": "*",
         "guzzlehttp/guzzle": "^7.0",
-        "illuminate/support": "^10.0 || ^11.0",
-        "illuminate/events": "^10.0 || ^11.0",
-        "laravel/nova": "^4.0",
+        "illuminate/events": "^10.0 || ^11.0 || ^12.0",
+        "illuminate/support": "^10.0 || ^11.0 || ^12.0",
+        "laravel/laravel": "^12",
+        "laravel/nova": "^4.0 || ^5.0",
         "spatie/image": "^3.0"
     },
     "require-dev": {
         "laravel/pint": "^1.15",
-        "orchestra/testbench": "^8.0 || ^9.0",
+        "orchestra/testbench": "^10",
         "php-parallel-lint/php-parallel-lint": "^1.3"
     },
     "autoload": {

src/Events/EditorJsImageUploaded.php

@@ -10,7 +10,5 @@ class EditorJsImageUploaded
 {
     use Dispatchable;
 
-    public function __construct(public string $disk, public string $path)
-    {
-    }
+    public function __construct(public string $disk, public string $path) {}
 }

src/Events/EditorJsThumbnailCreated.php

@@ -10,7 +10,5 @@ class EditorJsThumbnailCreated
 {
     use Dispatchable;
 
-    public function __construct(public string $disk, public string $path)
-    {
-    }
+    public function __construct(public string $disk, public string $path) {}
 }

src/Http/Controllers/EditorJsImageUploadController.php

@@ -103,7 +103,7 @@ public function url(Request $request): JsonResponse
         }
 
         // Validate mime type
-        $mime = (new finfo())->buffer($response->body(), FILEINFO_MIME_TYPE);
+        $mime = (new finfo)->buffer($response->body(), FILEINFO_MIME_TYPE);
         if (! in_array($mime, self::VALID_IMAGE_MIMES, true)) {
             return response()->json([
                 'success' => 0,

src/Http/Controllers/EditorJsLinkController.php

@@ -40,7 +40,7 @@ public function fetch(Request $request): JsonResponse
             ]);
         }
 
-        $doc = new DOMDocument();
+        $doc = new DOMDocument;
         @$doc->loadHTML((string) $response->getBody());
         $nodes = $doc->getElementsByTagName('title');
         $title = $nodes->item(0)->nodeValue;

src/NovaEditorJsConverter.php

@@ -43,7 +43,7 @@ public function addRender(string $block, callable $callback): void
      */
     public function generateHtmlOutput(mixed $data): HtmlString
     {
-        if (empty($data) || $data == new stdClass()) {
+        if (empty($data) || $data == new stdClass) {
             return new HtmlString('');
         }
 

src/NovaEditorJsField.php

@@ -40,18 +40,17 @@ public function __construct($name, $attribute = null, ?callable $resolveCallback
     /**
      * Resolve the field's value for display.
      *
-     * @param  string|null  $attribute
      *
      * @throws \Throwable
      */
-    public function resolveForDisplay($resource, $attribute = null)
+    public function resolveForDisplay($resource, ?string $attribute = null): void
     {
         $attribute = $attribute ?? $this->attribute;
         if ($attribute === 'ComputedField') {
             return;
         }
 
-        $value = data_get($resource, str_replace('->', '.', $attribute), $placeholder = new \stdClass());
+        $value = data_get($resource, str_replace('->', '.', $attribute), $placeholder = new \stdClass);
 
         if (is_callable($this->resolveCallback)) {
             $value = call_user_func($this->resolveCallback, $value, $resource, $attribute);

tests/Feature/Http/Controllers/EditorJsImageUploadControllerTest.php

@@ -46,7 +46,7 @@ public function testImageUpload(string $path): void
         $fake = Event::fake();
         DB::setEventDispatcher($fake);
 
-        $uploadedFile = UploadedFile::fake()->create('file', 1024, (new finfo())->file($path, FILEINFO_MIME_TYPE));
+        $uploadedFile = UploadedFile::fake()->create('file', 1024, (new finfo)->file($path, FILEINFO_MIME_TYPE));
         if ($fp = $uploadedFile->openFile('w')) {
             $fp->fwrite(file_get_contents($path));
         }

tests/Feature/Views/ViewTestHelpers.php

@@ -9,7 +9,7 @@
 
 trait ViewTestHelpers
 {
-    protected function view(string $view, array $args = []): TestView
+    protected function view(string $view, $args = []): TestView
     {
         return new TestView(View::make($view, $args));
     }

tests/TestCase.php

@@ -23,7 +23,7 @@ class TestCase extends OrchestraTestCase
      */
     protected function repairLaravel8Compatibiliy()
     {
-        if (! \Composer\InstalledVersions::satisfies(new \Composer\Semver\VersionParser(), 'illuminate/support', '^8.0')) {
+        if (! \Composer\InstalledVersions::satisfies(new \Composer\Semver\VersionParser, 'illuminate/support', '^8.0')) {
             return;
         }