Merge remote-tracking branch 'origin/main'

aguingand · aguingand · commit 657b39391092 · 2024-12-18T14:32:43.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,6 +32,10 @@ jobs:
             env:
               LARAVEL: 11.*
               TESTBENCH: 9.*
+          - php: 8.4
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "8.2.*|8.3.*",
+        "php": "8.2.*|8.3.*|8.4.*",
         "code16/laravel-content-renderer": "^1.1.0",
         "intervention/image": "^3.4",
         "intervention/image-laravel": "^1.2",
diff --git a/demo/app/Sharp/Categories/CategoryForm.php b/demo/app/Sharp/Categories/CategoryForm.php
@@ -47,7 +47,7 @@ public function update($id, array $data)
     {
         $category = $id
             ? Category::findOrFail($id)
-            : new Category();
+            : Category::make(['order' => 100]);
 
         $this->save($category, $data);
 
diff --git a/demo/composer.lock b/demo/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`	`],`
`14`	`14`	`"require": {`
`15`		`- "php": "8.2.\|8.3.",`
	`15`	`+ "php": "8.2.\|8.3.\|8.4.*",`
`16`	`16`	`"code16/laravel-content-renderer": "^1.1.0",`
`17`	`17`	`"intervention/image": "^3.4",`
`18`	`18`	`"intervention/image-laravel": "^1.2",`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function update($id, array $data)`
`47`	`47`	`{`
`48`	`48`	`$category = $id`
`49`	`49`	`? Category::findOrFail($id)`
`50`		`- : new Category();`
	`50`	`+ : Category::make(['order' => 100]);`
`51`	`51`
`52`	`52`	`$this->save($category, $data);`
`53`	`53`