Merge pull request #39 from RicLeP/develop

Update Storyblok RTR and fix settings

composer.json

@@ -29,7 +29,7 @@
  "league/commonmark": "^2.0",
  "spatie/schema-org": "^3.3",
  "storyblok/php-client": "^2.3",
- "storyblok/richtext-resolver": "2.1.0"
+ "storyblok/richtext-resolver": "2.2.0"
  },
  "require-dev": {
  "mockery/mockery": "^1.2",

config/storyblok.php

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

phpunit.xml.dist

@@ -1,35 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
- backupGlobals="false"
- backupStaticAttributes="false"
- colors="true"
- verbose="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false">
- <testsuites>
- <testsuite name="Test Suite">
- <directory>tests</directory>
- </testsuite>
- </testsuites>
- <filter>
- <whitelist>
- <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>
- </whitelist>
- </filter>
- <logging>
- <log type="tap" target="build/report.tap"/>
- <log type="junit" target="build/report.junit.xml"/>
- <log type="coverage-text" target="build/coverage.txt"/>
- <log type="coverage-clover" target="build/logs/clover.xml"/>
- </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+ <coverage>
+ <include>
+ <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>
+ </include>
+ </coverage>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory>tests</directory>
+ </testsuite>
+ </testsuites>
+ <logging>
+ <junit outputFile="build/report.junit.xml"/>
+ </logging>
+ <php>
+ <env name="STORYBLOK_PREVIEW_API_KEY" value="testing"/>
+ <env name="STORYBLOK_PUBLIC_API_KEY" value="testing"/>
+ </php>
 </phpunit>

src/Block.php

@@ -15,15 +15,13 @@
 use Riclep\Storyblok\Fields\Table;
 use Riclep\Storyblok\Traits\HasChildClasses;
 use Riclep\Storyblok\Traits\HasMeta;
-use Riclep\Storyblok\Traits\HasSettings;
 use Storyblok\ApiException;
 
 
 class Block implements \IteratorAggregate, \JsonSerializable
 {
  use HasChildClasses;
  use HasMeta;
- use HasSettings;
 
  /**
  * @var bool resolve UUID relations automatically
@@ -492,4 +490,4 @@ public function getCasts(): array
  {
  return $this->_casts;
  }
-}
+}