Merge branch 'release2.8.0'

Author: RicLeP

.idea/codestream.xml

@@ -0,0 +1,5 @@
+name: laravel-storyblok
+recipe: laravel
+config:
+  webroot: .
+  php: '8.0'

.idea/laravel-storyblok.iml

@@ -19,12 +19,13 @@
         }
     ],
     "require": {
-        "php": "^7.1|^8.0",
+        "php": "^7.4|^8.0",
         "ext-json": "*",
         "barryvdh/reflection-docblock": "^2.0",
         "embed/embed": "^3.4",
         "illuminate/support": "^6.0|^7.0|^8.0",
-		"ivopetkov/html5-dom-document-php": "2.*",
+        "imgix/imgix-php": "^3.3",
+        "ivopetkov/html5-dom-document-php": "2.*",
         "league/commonmark": "^2.0",
         "mundschenk-at/php-typography": "^6.5",
         "spatie/schema-org": "^3.3",
@@ -49,15 +50,14 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true
     },
     "extra": {
         "laravel": {
             "providers": [
-				"Riclep\\Storyblok\\StoryblokServiceProvider"
+                "Riclep\\Storyblok\\StoryblokServiceProvider"
             ],
             "aliases": {
                 "Storyblok": "Riclep\\Storyblok\\StoryblokFacade"

.idea/php.xml

@@ -139,7 +139,17 @@
     | Can be customized to proxy image service requests over a custom domain
     |
     */
-    'image_service_domain' => env('STORYBLOK_IMAGE_SERVICE_DOMAIN', 'img2.storyblok.com'),
+    'image_service_domain' => env('STORYBLOK_IMAGE_SERVICE_DOMAIN', 'a.storyblok.com'),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Image transformation driver
+	|--------------------------------------------------------------------------
+	|
+	| The class used for transforming images Fields / image URLs
+	|
+	*/
+	'image_transformer' => \Riclep\Storyblok\Support\ImageTransformers\Storyblok::class,
 
     /*
     |--------------------------------------------------------------------------
@@ -149,7 +159,7 @@
     | This turns on live preview of changes in the editor if correctly set up
     |
     */
-    'live-preview' => true,
+    'live_preview' => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -159,7 +169,5 @@
     | Class or ID selector for the HTML element wrapping your live preview content
     |
     */
-    'live-element' => '.storyblok-live',
-
-
+    'live_element' => '.storyblok-live',
 ];

.lando.yml

@@ -16,14 +16,14 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">src/Fields</directory>
-            <directory suffix=".php">src/Traits</directory>
+			<directory suffix=".php">src/Fields</directory>
+			<directory suffix=".php">src/Support</directory>
+			<directory suffix=".php">src/Traits</directory>
             <file>src/Block.php</file>
             <file>src/Field.php</file>
             <file>src/FieldFactory.php</file>
 			<file>src/Folder.php</file>
 			<file>src/Page.php</file>
-			<file>src/Support/ImageTransformation.php</file>
         </whitelist>
     </filter>
     <logging>

composer.json

@@ -11,6 +11,14 @@
 
 class FieldFactory
 {
+	/**
+	 * Works out what class should be used for the given block’s content
+	 *
+	 * @param $block
+	 * @param $field
+	 * @param $key
+	 * @return \Illuminate\Support\Collection|mixed|Asset|Image|MultiAsset|RichText|Table
+	 */
 	public function build($block, $field, $key) {
 		// does the Block assign any $_casts? This is key (field) => value (class)
 		if (array_key_exists($key, $block->getCasts())) {
@@ -38,15 +46,23 @@ public function build($block, $field, $key) {
 			return $this->arrayField($block, $field, $key);
 		}
 
-		// legacy image fields
-		if ($this->isLegacyImageField($field)) {
+		// legacy and string image fields
+		if ($this->isStringImageField($field)) {
 			return new Image($field, $block);
 		}
 
 		// strings or anything else - do nothing
 		return $field;
 	}
 
+	/**
+	 * If given an array field we need more processing to determine the class
+	 *
+	 * @param $block
+	 * @param $field
+	 * @param $key
+	 * @return \Illuminate\Support\Collection|mixed|Asset|Image|MultiAsset|RichText|Table
+	 */
 	public function arrayField($block, $field, $key) {
 		// match link fields
 		if (array_key_exists('linktype', $field)) {
@@ -63,8 +79,8 @@ public function arrayField($block, $field, $key) {
 		// match asset fields - detecting raster images
 		if (array_key_exists('fieldtype', $field) && $field['fieldtype'] === 'asset') {
 
-			// legacy image fields
-			if($this->isLegacyImageField($field['filename'])) {
+			// legacy and string image fields
+			if($this->isStringImageField($field['filename'])) {
 				return new Image($field, $block);
 			}
 
@@ -131,16 +147,15 @@ public function arrayField($block, $field, $key) {
 	}
 
 
-
 	/**
-	 * Check if given string is an legacy image field
+	 * Check if given string is a string image field
 	 *
 	 * @param  $filename
 	 * @return boolean
 	 */
-	public function isLegacyImageField($filename){
+	public function isStringImageField($filename){
 		$allowed_extentions = ['.jpg', '.jpeg', '.png', '.gif', '.webp'];
 
-		return is_string($filename) && Str::of( $filename )->lower()->endsWith( $allowed_extentions );
+		return is_string($filename) && Str::of($filename)->lower()->endsWith($allowed_extentions);
 	}
 }