Merge branch 'release/2.2.0'

lindyhopchris · lindyhopchris · commit 20cf48ad9a00 · 2022-04-10T15:03:15.000+01:00
diff --git a/1.0/requests/authorization.md b/1.0/requests/authorization.md
@@ -499,7 +499,7 @@ class Server extends BaseServer
     {
         Post::addGlobalScope(new PostScope());
 
-        Post::creating(static function (Post $post) {
+        Post::creating(static function (Post $post): void {
             $post->author()->associate(Auth::user());
         });
     }
diff --git a/1.0/tutorial/03-server-and-schemas.md b/1.0/tutorial/03-server-and-schemas.md
@@ -669,5 +669,5 @@ In this chapter, we created our JSON:API server and added our first resource
 to it by creating a `PostSchema` class. We also learnt how to register JSON:API
 routes and how authentication works.
 
-In the [next chapter](./04-relationships), we'll add relationships to our
+In the [next chapter](./04-relationships.md), we'll add relationships to our
 `posts` resource.
diff --git a/1.0/tutorial/05-creating-resources.md b/1.0/tutorial/05-creating-resources.md
@@ -165,7 +165,9 @@ Open the `app/JsonApi/V1/Server.php` class, and update it as follows:
      public function serving(): void
      {
 -       // no-op
-+       Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));
++       Post::creating(static function (Post $post): void {
++           $post->author()->associate(Auth::user());
++       });
      }
 
      /**
@@ -326,7 +328,9 @@ the `serving()` method:
  {
 +    Auth::shouldUse('sanctum');
 +
-     Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));
+     Post::creating(static function(Post $post): void {
+         $post->author()->associate(Auth::user());
+     });
  }
 ```
 
diff --git a/2.0/digging-deeper/countable.md b/2.0/digging-deeper/countable.md
@@ -5,7 +5,7 @@
 ## Introduction
 
 :::danger
-Although included in the `1.0` release, the countable relationship feature
+Although included in the `2.0` release, the countable relationship feature
 **is experimental and is not considered ready for production use.** We will be
 making changes to this feature that will be breaking from the perspective of an
 API client.
diff --git a/2.0/requests/authorization.md b/2.0/requests/authorization.md
@@ -499,7 +499,7 @@ class Server extends BaseServer
     {
         Post::addGlobalScope(new PostScope());
 
-        Post::creating(static function (Post $post) {
+        Post::creating(static function (Post $post): void {
             $post->author()->associate(Auth::user());
         });
     }
diff --git a/2.0/tutorial/03-server-and-schemas.md b/2.0/tutorial/03-server-and-schemas.md
@@ -669,5 +669,5 @@ In this chapter, we created our JSON:API server and added our first resource
 to it by creating a `PostSchema` class. We also learnt how to register JSON:API
 routes and how authentication works.
 
-In the [next chapter](./04-relationships), we'll add relationships to our
+In the [next chapter](./04-relationships.md), we'll add relationships to our
 `posts` resource.
diff --git a/2.0/tutorial/05-creating-resources.md b/2.0/tutorial/05-creating-resources.md
@@ -165,7 +165,9 @@ Open the `app/JsonApi/V1/Server.php` class, and update it as follows:
      public function serving(): void
      {
 -       // no-op
-+       Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));
++       Post::creating(static function (Post $post): void {
++.           $post->author()->associate(Auth::user());
++       });
      }
 
      /**
@@ -326,7 +328,9 @@ the `serving()` method:
  {
 +    Auth::shouldUse('sanctum');
 +
-     Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));
+     Post::creating(static function(Post $post): void {
+         $post->author()->associate(Auth::user());
+     });
  }
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ class Server extends BaseServer`
`499`	`499`	`{`
`500`	`500`	`Post::addGlobalScope(new PostScope());`
`501`	`501`
`502`		`- Post::creating(static function (Post $post) {`
	`502`	`+ Post::creating(static function (Post $post): void {`
`503`	`503`	`$post->author()->associate(Auth::user());`
`504`	`504`	`});`
`505`	`505`	`}`
Original file line number	Diff line number	Diff line change
@@ -165,7 +165,9 @@ Open the `app/JsonApi/V1/Server.php` class, and update it as follows:
`165`	`165`	`public function serving(): void`
`166`	`166`	`{`
`167`	`167`	`- // no-op`
`168`		`-+ Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));`
	`168`	`++ Post::creating(static function (Post $post): void {`
	`169`	`++ $post->author()->associate(Auth::user());`
	`170`	`++ });`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`/**`
@@ -326,7 +328,9 @@ the `serving()` method:
`326`	`328`	`{`
`327`	`329`	`+ Auth::shouldUse('sanctum');`
`328`	`330`	`+`
`329`		`- Post::creating(static fn(Post $post) => $post->author()->associate(Auth::user()));`
	`331`	`+ Post::creating(static function(Post $post): void {`
	`332`	`+ $post->author()->associate(Auth::user());`
	`333`	`+ });`
`330`	`334`	`}`
`331`	`335`	```
`332`	`336`