Added support for Laravel 10

Author: Combind

.github/workflows/run-tests.yml

@@ -14,11 +14,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.1]
-        laravel: [9.*]
+        laravel: [10.*]
         stability: [prefer-stable]
         include:
-          - laravel: 9.*
-            testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
             carbon: ^2.63
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

composer.json

@@ -19,21 +19,21 @@
         "php": "^8.1",
         "artesaos/seotools": "^1.0",
         "gmostafa/php-graphql-client": "^1.13",
-        "illuminate/contracts": "^9.0",
+        "illuminate/contracts": "^9.0|^10.0",
         "spatie/laravel-missing-page-redirector": "^2.9",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^6.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {

src/HygraphApi.php

@@ -18,11 +18,14 @@ class HygraphApi
 
     protected int $ttl;
 
+    protected string $lang;
+
     public function __construct()
     {
         $this->endpoint = config('hygraph.content_api');
         $this->token = config('hygraph.token');
         $this->ttl = config('hygraph.cache_ttl');
+        $this->lang = substr(app()->getLocale(), 0, 2);
     }
 
     protected function query(Query $query): array|object|null
@@ -60,9 +63,9 @@ public function pages(): array|object|null
 
     public function page(string $id): array
     {
-        return Cache::remember($id, $this->ttl, function () use ($id) {
+        return Cache::remember($this->lang.'_'.$id, $this->ttl, function () use ($id) {
             $gql = (new Query('page'))
-                ->setArguments(['where' => new RawObject('{id: "'.$id.'"}')])
+                ->setArguments(['locales' => new RawObject($this->lang), 'where' => new RawObject('{id: "'.$id.'"}')])
                 ->setSelectionSet(
                     [
                         'id',
@@ -152,9 +155,9 @@ public function redirects(): array
 
     public function posts(): array|Collection|null
     {
-        return Cache::remember('allPosts', $this->ttl, function () {
+        return Cache::remember($this->lang.'_'.'allPosts', $this->ttl, function () {
             $gql = (new Query('posts'))
-                ->setArguments(['orderBy' => new RawObject('publicationDate_DESC')])
+                ->setArguments(['locales' => new RawObject($this->lang), 'orderBy' => new RawObject('publicationDate_DESC')])
                 ->setSelectionSet(
                     [
                         'id',
@@ -175,9 +178,9 @@ public function posts(): array|Collection|null
 
     public function categories(): array|null
     {
-        return Cache::remember('allPostCategories', $this->ttl, function () {
+        return Cache::remember($this->lang.'_'.'allPostCategories', $this->ttl, function () {
             $gql = (new Query('categories'))
-                ->setArguments(['orderBy' => new RawObject('name_ASC')])
+                ->setArguments(['locales' => new RawObject($this->lang), 'orderBy' => new RawObject('name_ASC')])
                 ->setSelectionSet(['id', 'name', 'slug']);
 
             return $this->query($gql)->categories;
@@ -186,9 +189,9 @@ public function categories(): array|null
 
     public function article(string $slug): object|null
     {
-        return Cache::remember('article_'.$slug, $this->ttl, function () use ($slug) {
+        return Cache::remember($this->lang.'_'.'article_'.$slug, $this->ttl, function () use ($slug) {
             $gql = (new Query('post'))
-                ->setArguments(['where' => new RawObject('{slug: "'.$slug.'"}')])
+                ->setArguments(['locales' => new RawObject($this->lang), 'where' => new RawObject('{slug: "'.$slug.'"}')])
                 ->setSelectionSet(
                     [
                         'id',
@@ -218,6 +221,11 @@ public function article(string $slug): object|null
                             ),
                         (new Query('seo'))->setSelectionSet(['title', 'description', (new Query('image'))->setSelectionSet(['url'])]),
                         (new Query('relatedPosts'))->setSelectionSet(['id']),
+                        (new Query('toc'))->setSelectionSet([
+                            'title',
+                            'slug',
+                            (new Query('tocLinks'))->setSelectionSet(['title', 'slug']),
+                        ]),
                     ]
                 );
 
@@ -231,9 +239,9 @@ public function article(string $slug): object|null
 
     public function featuredPosts(): array|null
     {
-        return Cache::remember('featuredPosts', $this->ttl, function () {
+        return Cache::remember($this->lang.'_'.'featuredPosts', $this->ttl, function () {
             $gql = (new Query('posts'))
-                ->setArguments(['where' => new RawObject('{isFeatured: true}'), 'orderBy' => new RawObject('publicationDate_DESC')])
+                ->setArguments(['locales' => new RawObject($this->lang), 'where' => new RawObject('{isFeatured: true}'), 'orderBy' => new RawObject('publicationDate_DESC')])
                 ->setSelectionSet(
                     [
                         'id',
@@ -254,7 +262,7 @@ public function featuredPosts(): array|null
     public function relatedPosts(array $ids): array|null
     {
         $gql = (new Query('posts'))
-            ->setArguments(['where' => new RawObject('{id_in: ["'.implode('","', $ids).'"]}')])
+            ->setArguments(['locales' => new RawObject($this->lang), 'where' => new RawObject('{id_in: ["'.implode('","', $ids).'"]}')])
             ->setSelectionSet(
                 [
                     'id',