Merge branch 'release2.19.0'

Author: RicLeP

composer.json

@@ -28,7 +28,7 @@
 	    "ivopetkov/html5-dom-document-php": "2.*",
 	    "league/commonmark": "^2.0",
 	    "spatie/schema-org": "^3.3",
-	    "storyblok/php-client": "^2.2",
+	    "storyblok/php-client": "^2.3",
 	    "storyblok/richtext-resolver": "2.0.0"
     },
     "require-dev": {

config/storyblok.php

@@ -47,6 +47,16 @@
 
     /*
     |--------------------------------------------------------------------------
+    | Specify which Storyblok API region to use
+    |--------------------------------------------------------------------------
+    |
+    | Defaults to null which should be the original EU region
+    |
+    */
+	'api_region' => null,
+
+	/*
+    |--------------------------------------------------------------------------
     | Storyblok draft mode
     |--------------------------------------------------------------------------
     |

src/RequestStory.php

@@ -11,10 +11,23 @@
 class RequestStory
 {
 	/**
-	 * @var array An array of relations to resolve matching: component_name.field_name
+	 * @var string|null A comma delimited string of relations to resolve matching: component_name.field_name
 	 * @see https://www.storyblok.com/tp/using-relationship-resolving-to-include-other-content-entries
 	 */
-	protected array $resolveRelations = [];
+	protected ?string $resolveRelations = null;
+
+
+	/**
+	 * @var string|null The language version of the Story to load
+	 * @see https://www.storyblok.com/docs/guide/in-depth/internationalization
+	 */
+	protected ?string $language = null;
+
+	/**
+	 * @var string|null The fallback language version of the Story to load
+	 * @see https://www.storyblok.com/docs/guide/in-depth/internationalization
+	 */
+	protected ?string $fallbackLanguage = null;
 
 	/**
 	 * Caches the response if needed
@@ -48,11 +61,22 @@ public function get($slugOrUuid): mixed
 	 *
 	 * @param $resolveRelations
 	 */
-	public function prepareRelations($resolveRelations): void
+	public function resolveRelations($resolveRelations): void
 	{
 		$this->resolveRelations = implode(',', $resolveRelations);
 	}
 
+	/**
+	 * Set the language and fallback language to use for this Story, will default to ‘default’
+	 *
+	 * @param string|null $language
+	 * @param string|null $fallbackLanguage
+	 */
+	public function language($language, $fallbackLanguage = null) {
+		$this->language = $language;
+		$this->fallbackLanguage = $fallbackLanguage;
+	}
+
 	/**
 	 * Makes the API request
 	 *
@@ -72,6 +96,14 @@ private function makeRequest($slugOrUuid): array
 			$storyblokClient = $storyblokClient->resolveLinks(config('storyblok.resolve_links'));
 		}
 
+		if ($this->language) {
+			$storyblokClient = $storyblokClient->language($this->language);
+		}
+
+		if ($this->fallbackLanguage) {
+			$storyblokClient = $storyblokClient->fallbackLanguage($this->fallbackLanguage);
+		}
+
 		if (Str::isUuid($slugOrUuid)) {
 			$storyblokClient =  $storyblokClient->getStoryByUuid($slugOrUuid);
 		} else {

src/Storyblok.php

@@ -5,6 +5,7 @@
 
 
 use Riclep\Storyblok\Traits\HasChildClasses;
+use Storyblok\ApiException;
 
 class Storyblok
 {
@@ -14,16 +15,22 @@ class Storyblok
 	/**
 	 * Reads the requested story from the API
 	 *
-	 * @param $slug
+	 * @param string $slug
 	 * @param array|null $resolveRelations
+	 * @param null $language
+	 * @param null $fallbackLanguage
 	 * @return mixed
-	 * @throws \Storyblok\ApiException
+	 * @throws ApiException
 	 */
-	public function read($slug, array $resolveRelations = null) {
+	public function read(string $slug, array $resolveRelations = null, $language = null, $fallbackLanguage = null) {
 		$storyblokRequest = new RequestStory();
 
 		if ($resolveRelations) {
-			$storyblokRequest->prepareRelations($resolveRelations);
+			$storyblokRequest->resolveRelations($resolveRelations);
+		}
+
+		if ($language) {
+			$storyblokRequest->language($language, $fallbackLanguage);
 		}
 
 		$response = $storyblokRequest->get($slug);
@@ -45,4 +52,4 @@ public function setData($data): mixed
 
 		return new $class($response);
 	}
-}
+}

src/StoryblokServiceProvider.php

@@ -64,8 +64,8 @@ public function register(): void
 
 	    // register the Storyblok client, checking if we are in edit more of the dev requests draft content
 	    $client = new Client(
-		    config('storyblok.draft') ? config('storyblok.api_preview_key') : config('storyblok.api_public_key'),
-		    "api.storyblok.com", "v2", config('storyblok.use_ssl'), config('storyblok.api_region')
+			config('storyblok.draft') ? config('storyblok.api_preview_key') : config('storyblok.api_public_key'),
+			"api.storyblok.com", "v2", config('storyblok.use_ssl'), config('storyblok.api_region')
 	    );
 
 	    // if we’re in Storyblok’s edit mode let’s save that in the config for easy access