Merge remote-tracking branch 'origin/master' into collection-importer

duncanmcclean · duncanmcclean · commit dfa0d22ab96d · 2025-02-07T12:36:51.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v7.13.5 (2025-02-07)
+
+### What's fixed
+* Prevent error when model can't be found #655 by @duncanmcclean
+
+
+
 ## v7.13.4 (2025-01-06)
 
 ### What's fixed
diff --git a/database/migrations/2021_05_04_162552_create_runway_uris_table.php b/database/migrations/2021_05_04_162552_create_runway_uris_table.php
@@ -17,7 +17,7 @@ public function up()
             $table->id();
             $table->string('uri');
             $table->string('model_type');
-            $table->bigInteger('model_id');
+            $table->string('model_id', 36);
             $table->timestamps();
         });
     }
diff --git a/docs/blueprints.md b/docs/blueprints.md
@@ -18,56 +18,57 @@ Runway supports pretty much ALL fieldtypes available in Statamic, including Bard
 
 For simplicity, here's a table matching Statamic's Core fieldtypes with the correct column types:
 
-**Fieldtype**| **Column Type**           |**Notes**
------|---------------------------|-----
-[Array](https://statamic.dev/fieldtypes/array)| `json`                    |
-Asset Container| `string`/`json`           |
-[Assets](https://statamic.dev/fieldtypes/assets)| `string`/`json`           |
-[Bard](https://statamic.dev/fieldtypes/bard)| `string`/`json`           |If 'Display HTML' is `true`, then Bard will save as a `string`.
-[Button Group](https://statamic.dev/fieldtypes/button_group)| `string`                  |
-[Checkboxes](https://statamic.dev/fieldtypes/checkboxes)| `json`                    |
-[Code](https://statamic.dev/fieldtypes/code)| `string`                  |
-[Collections](https://statamic.dev/fieldtypes/collections)| `string`/`json`           |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
-[Color](https://statamic.dev/fieldtypes/color)| `string`                  |
-[Date](https://statamic.dev/fieldtypes/date)| `string`/`range`          |Format is specified field configuration options. Ranges are should be stored as json.
-[Entries](https://statamic.dev/fieldtypes/entries)| `string`/`json`           |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
-Float| `float`                   |
-[Grid](https://statamic.dev/fieldtypes/grid)| `json`                    |
-[Group](https://statamic.dev/fieldtypes/group)| `json`                    |
-[Hidden](https://statamic.dev/fieldtypes/hidden)| `string`                  |
-[HTML](https://statamic.dev/fieldtypes/html)| -                         |UI only
-[Icon](https://statamic.dev/fieldtypes/icon)| `string`                  |
-[Integer](https://statamic.dev/fieldtypes/integer)| `integer`                 |
-[Link](https://statamic.dev/fieldtypes/link)| `json`                    |
-[List](https://statamic.dev/fieldtypes/list)| `json`                    |
-[Markdown](https://statamic.dev/fieldtypes/markdown)| `string`                  |
-[Navs](https://statamic.dev/fieldtypes/navs)| `string`/`json`           |
-[Radio](https://statamic.dev/fieldtypes/radio)| `string`                  |
-[Range](https://statamic.dev/fieldtypes/range)| `string`                  |
-[Replicator](https://statamic.dev/fieldtypes/replicator)| `json`                    |
-[Revealer](https://statamic.dev/fieldtypes/revealer)| -                         |UI only
-[Section](https://statamic.dev/fieldtypes/section)| -                         |UI only
+**Fieldtype**| **Column Type**          |**Notes**
+-----|--------------------------|-----
+[Array](https://statamic.dev/fieldtypes/array)| `json`                   |
+Asset Container| `string`/`json`          |
+[Assets](https://statamic.dev/fieldtypes/assets)| `string`/`json`          |
+[Bard](https://statamic.dev/fieldtypes/bard)| `string`/`json`          |If 'Display HTML' is `true`, then Bard will save as a `string`.
+[Button Group](https://statamic.dev/fieldtypes/button_group)| `string`                 |
+[Checkboxes](https://statamic.dev/fieldtypes/checkboxes)| `json`                   |
+[Code](https://statamic.dev/fieldtypes/code)| `string`                 |
+[Collections](https://statamic.dev/fieldtypes/collections)| `string`/`json`          |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
+[Color](https://statamic.dev/fieldtypes/color)| `string`                 |
+[Date](https://statamic.dev/fieldtypes/date)| `string`/`range`         |Format is specified field configuration options. Ranges are should be stored as json.
+[Dictionary](https://statamic.dev/fieldtypes/dictionary)|`string`/`json`           |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
+[Entries](https://statamic.dev/fieldtypes/entries)| `string`/`json`          |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
+[Form](https://statamic.dev/fieldtypes/form)| `string`/`json`          |If 'Max items' is `1`, column type should be `string`. Otherwise, `json` is what you want.
+[Grid](https://statamic.dev/fieldtypes/grid)| `json`                   |
+[Group](https://statamic.dev/fieldtypes/group)| `json`                   |
+[Hidden](https://statamic.dev/fieldtypes/hidden)| `string`                 |
+[HTML](https://statamic.dev/fieldtypes/html)| -                        |UI only
+[Icon](https://statamic.dev/fieldtypes/icon)| `string`                 |
+[Integer](https://statamic.dev/fieldtypes/integer)| `integer`                |
+[Link](https://statamic.dev/fieldtypes/link)| `json`                   |
+[List](https://statamic.dev/fieldtypes/list)| `json`                   |
+[Markdown](https://statamic.dev/fieldtypes/markdown)| `string`                 |
+[Navs](https://statamic.dev/fieldtypes/navs)| `string`/`json`          |
+[Radio](https://statamic.dev/fieldtypes/radio)| `string`                 |
+[Range](https://statamic.dev/fieldtypes/range)| `string`                 |
+[Replicator](https://statamic.dev/fieldtypes/replicator)| `json`                   |
+[Revealer](https://statamic.dev/fieldtypes/revealer)| -                        |UI only
+[Section](https://statamic.dev/fieldtypes/section)| -                        |UI only
 [Select](https://statamic.dev/fieldtypes/select)| `string`/`integer`/`json` |
-[Sites](https://statamic.dev/fieldtypes/sites)| `string`/`json`           |
-[Slug](https://statamic.dev/fieldtypes/slug)| `string`                  |
-[Structures](https://statamic.dev/fieldtypes/structures)| `json`                    |
-[Table](https://statamic.dev/fieldtypes/table)| `json`                    |
-[Tags](https://statamic.dev/fieldtypes/tags)| `json`                    |
-[Taxonomies](https://statamic.dev/fieldtypes/taxonomies)| `string`/`json`           |
-[Template](https://statamic.dev/fieldtypes/template)| `string`                  |
-[Terms](https://statamic.dev/fieldtypes/terms)| `string`/`json`           |
-[Text](https://statamic.dev/fieldtypes/text)| `string`                  |
-[Textarea](https://statamic.dev/fieldtypes/textarea)| `string`                  |
-[Time](https://statamic.dev/fieldtypes/time)| `string`                  |
-[Toggle](https://statamic.dev/fieldtypes/toggle)| `boolean`                 |
-[User Groups](https://statamic.dev/fieldtypes/user-groups)| `string`/`json`           |When the resource is the `User` model, you don't need to create a column for this fieldtype.
-[User Roles](https://statamic.dev/fieldtypes/user-roles)| `string`/`json`           |When the resource is the `User` model, you don't need to create a column for this fieldtype.
+[Sites](https://statamic.dev/fieldtypes/sites)| `string`/`json`          |
+[Slug](https://statamic.dev/fieldtypes/slug)| `string`                 |
+[Spacer](https://statamic.dev/fieldtypes/spacer)| -                        |UI only
+[Structures](https://statamic.dev/fieldtypes/structures)| `json`                   |
+[Table](https://statamic.dev/fieldtypes/table)| `json`                   |
+[Tags](https://statamic.dev/fieldtypes/tags)| `json`                   |
+[Taxonomies](https://statamic.dev/fieldtypes/taxonomies)| `string`/`json`          |
+[Template](https://statamic.dev/fieldtypes/template)| `string`                 |
+[Terms](https://statamic.dev/fieldtypes/terms)| `string`/`json`          |
+[Text](https://statamic.dev/fieldtypes/text)| `string`                 |
+[Textarea](https://statamic.dev/fieldtypes/textarea)| `string`                 |
+[Time](https://statamic.dev/fieldtypes/time)| `string`                 |
+[Toggle](https://statamic.dev/fieldtypes/toggle)| `boolean`                |
+[User Groups](https://statamic.dev/fieldtypes/user-groups)| `string`/`json`          |When the resource is the `User` model, you don't need to create a column for this fieldtype.
+[User Roles](https://statamic.dev/fieldtypes/user-roles)| `string`/`json`          |When the resource is the `User` model, you don't need to create a column for this fieldtype.
 [Users](https://statamic.dev/fieldtypes/users)| `string`/`integer`/`json` |
-[Video](https://statamic.dev/fieldtypes/video)| `string`                  |
-Width| `integer`                 |
-[YAML](https://statamic.dev/fieldtypes/yaml)| `string`                  |
-[Belongs To](/fieldtypes#belongsto-fieldtype)| `bigInteger`              |Usually `bigInteger` or `integer` but depends on personal preference.
-
+[Video](https://statamic.dev/fieldtypes/video)| `string`                 |
+[Width](https://statamic.dev/fieldtypes/width)| `integer`                |
+[YAML](https://statamic.dev/fieldtypes/yaml)| `string`                 |
+ 
 ## Eloquent Relationships
 
 Runway provides two fieldtypes to let you manage Eloquent Relationships within Statamic:
diff --git a/docs/upgrade-guides/v6-to-v7.md b/docs/upgrade-guides/v6-to-v7.md
@@ -66,7 +66,7 @@ BlogPost::class => [
 
 -   [v3.x to v4.0](/upgrade-guides/v3-x-to-v4-0)
 -   [v4.x to v5.0](/upgrade-guides/v4-x-to-v5-0)
--   [v6.x to v6.0](/upgrade-guides/v5-x-to-v6-0)
+-   [v5.x to v6.0](/upgrade-guides/v5-x-to-v6-0)
 
 ---
 
diff --git a/docs/upgrade-guides/v7-to-v8.md b/docs/upgrade-guides/v7-to-v8.md
@@ -89,8 +89,8 @@ The `runway:generate-migrations` command has been removed in favour of the new `
 
 -   [v3.x to v4.0](/upgrade-guides/v3-x-to-v4-0)
 -   [v4.x to v5.0](/upgrade-guides/v4-x-to-v5-0)
--   [v6.x to v6.0](/upgrade-guides/v5-x-to-v6-0)
--   [v7.x to v8.0](/upgrade-guides/v7-to-v8)
+-   [v5.x to v6.0](/upgrade-guides/v5-x-to-v6-0)
+-   [v6.x to v7.0](/upgrade-guides/v6-to-v7)
 
 ---
 
diff --git a/src/Relationships.php b/src/Relationships.php
@@ -59,7 +59,7 @@ protected function saveHasManyRelationship(Field $field, Relation $relationship,
         collect($values)
             ->reject(fn ($id) => $models->pluck($relatedResource->primaryKey())->contains($id))
             ->reject(fn ($id) => in_array($id, $deleted))
-            ->each(fn ($id) => $relatedResource->model()->find($id)->update([
+            ->each(fn ($id) => $relatedResource->model()->find($id)?->update([
                 $relationship->getForeignKeyName() => $this->model->getKey(),
             ]));
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function up()`
`17`	`17`	`$table->id();`
`18`	`18`	`$table->string('uri');`
`19`	`19`	`$table->string('model_type');`
`20`		`- $table->bigInteger('model_id');`
	`20`	`+ $table->string('model_id', 36);`
`21`	`21`	`$table->timestamps();`
`22`	`22`	`});`
`23`	`23`	`}`