Bump Janus

composer.json

@@ -39,7 +39,7 @@
 		"ueberdosis/tiptap-php": "^1.3"
 	},
 	"require-dev": {
-		"21torr/janus": "^1.5.1",
+		"21torr/janus": "^2.0.3",
 		"bamarni/composer-bin-plugin": "^1.8.2",
 		"phpunit/phpunit": "^12.2.5",
 		"roave/security-advisories": "dev-latest"
@@ -56,6 +56,7 @@
 	},
 	"config": {
 		"allow-plugins": {
+			"21torr/janus": true,
 			"bamarni/composer-bin-plugin": true
 		},
 		"sort-packages": true
@@ -72,15 +73,15 @@
 	"scripts": {
 		"fix-lint": [
 			"@composer bin c-norm normalize \"$(pwd)/composer.json\" --indent-style tab --indent-size 1 --ansi",
-			"PHP_CS_FIXER_IGNORE_ENV=1 vendor-bin/cs-fixer/vendor/bin/php-cs-fixer fix --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --no-interaction --ansi"
+			"vendor-bin/cs-fixer/vendor/bin/php-cs-fixer fix --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --allow-unsupported-php-version=yes --no-interaction --ansi"
 		],
 		"lint": [
 			"@composer bin c-norm normalize \"$(pwd)/composer.json\" --indent-style tab --indent-size 1 --dry-run --ansi",
-			"PHP_CS_FIXER_IGNORE_ENV=1 vendor-bin/cs-fixer/vendor/bin/php-cs-fixer check --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --no-interaction --ansi"
+			"vendor-bin/cs-fixer/vendor/bin/php-cs-fixer check --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --allow-unsupported-php-version=yes --no-interaction --ansi"
 		],
 		"test": [
 			"phpunit",
 			"vendor-bin/phpstan/vendor/bin/phpstan analyze -c phpstan.neon . --ansi -v"
 		]
 	}
-}
+}

phpstan.neon

@@ -3,6 +3,11 @@ includes:
 
 parameters:
 
+# If you use simple-phpunit, you need to uncomment the following line.
+# Always make sure to first run simple-phpunit and then PHPStan.
+#	bootstrapFiles:
+#		- vendor/bin/.phpunit/phpunit/vendor/autoload.php
+
 # These are temporarily copied here, as normally they should be in the lib.neon of janus.
 # However, due to a bug in PHPStan, this currently doesn't work (https://github.com/phpstan/phpstan/issues/12844)
 	excludePaths:

tests/Context/ComponentContextTestHelperTrait.php

@@ -23,10 +23,10 @@ private function createDummyContext (
 	) : ComponentContext
 	{
 		return new ComponentContext(
-			$componentManager ?? $this->createMock(ComponentManager::class),
+			$componentManager ?? $this->createStub(ComponentManager::class),
 			$dataTransformer ?? new DataTransformer(),
 			$logger ?? new NullLogger(),
-			$validator ?? $this->createMock(DataValidator::class),
+			$validator ?? $this->createStub(DataValidator::class),
 			$imageDimensionsExtractor ?? new ImageDimensionsExtractor(),
 		);
 	}

tests/Field/Definition/BloksFieldTest.php

@@ -24,7 +24,7 @@ final class BloksFieldTest extends TestCase
 	public function testInvalidComponents () : void
 	{
 		$field = new BloksField("test");
-		$manager = $this->createMock(ComponentManager::class);
+		$manager = self::createStub(ComponentManager::class);
 
 		$context = $this->createDummyContext($manager);
 
@@ -81,7 +81,7 @@ public function testIgnoredComponentsCount (
 			minimumNumberOfBloks: $minCount,
 			maximumNumberOfBloks: $maxCount,
 		);
-		$manager = $this->createMock(ComponentManager::class);
+		$manager = self::createStub(ComponentManager::class);
 
 		$manager->method("getComponent")
 			->willReturnCallback(function (string $key)
@@ -91,7 +91,7 @@ public function testIgnoredComponentsCount (
 					throw new UnknownComponentKeyException("test", "key");
 				}
 
-				return $this->createMock(AbstractComponent::class);
+				return $this->createStub(AbstractComponent::class);
 			});
 
 		$this->expectException(InvalidDataException::class);

tests/Field/Definition/ChoiceFieldTest.php

@@ -235,7 +235,7 @@ public function testInvalid (ChoiceField $field, mixed $data) : void
 	private function createComponentContext () : ComponentContext
 	{
 		return new ComponentContext(
-			$this->createMock(ComponentManager::class),
+			self::createStub(ComponentManager::class),
 			new DataTransformer(),
 			new NullLogger(),
 			new DataValidator(),

tests/Fixtures/ComponentA.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace Tests\Torr\Storyblok\Fixtures;
+
+use Torr\Storyblok\Component\AbstractComponent;
+use Torr\Storyblok\Component\Config\ComponentType;
+
+/**
+ * @final
+ */
+class ComponentA extends AbstractComponent
+{
+	/**
+	 */
+	public function __construct (
+		/** @var list<string> */
+		private readonly array $tags = [],
+	) {}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public static function getKey () : string
+	{
+		return "a";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function configureFields () : array
+	{
+		return [];
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function getComponentType () : ComponentType
+	{
+		return ComponentType::Standalone;
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getDisplayName () : string
+	{
+		return "A";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getTags () : array
+	{
+		return $this->tags;
+	}
+}

tests/Fixtures/ComponentB.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace Tests\Torr\Storyblok\Fixtures;
+
+use Torr\Storyblok\Component\AbstractComponent;
+use Torr\Storyblok\Component\Config\ComponentType;
+
+/**
+ * @final
+ */
+class ComponentB extends AbstractComponent
+{
+	/**
+	 */
+	public function __construct (
+		/** @var list<string> */
+		private readonly array $tags = [],
+	) {}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public static function getKey () : string
+	{
+		return "b";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function configureFields () : array
+	{
+		return [];
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function getComponentType () : ComponentType
+	{
+		return ComponentType::Standalone;
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getDisplayName () : string
+	{
+		return "B";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getTags () : array
+	{
+		return $this->tags;
+	}
+}

tests/Fixtures/ComponentC.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace Tests\Torr\Storyblok\Fixtures;
+
+use Torr\Storyblok\Component\AbstractComponent;
+use Torr\Storyblok\Component\Config\ComponentType;
+
+/**
+ * @final
+ */
+class ComponentC extends AbstractComponent
+{
+	/**
+	 */
+	public function __construct (
+		/** @var list<string> */
+		private readonly array $tags = [],
+	) {}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public static function getKey () : string
+	{
+		return "c";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function configureFields () : array
+	{
+		return [];
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function getComponentType () : ComponentType
+	{
+		return ComponentType::Standalone;
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getDisplayName () : string
+	{
+		return "B";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getTags () : array
+	{
+		return $this->tags;
+	}
+}

tests/Fixtures/ComponentD.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace Tests\Torr\Storyblok\Fixtures;
+
+use Torr\Storyblok\Component\AbstractComponent;
+use Torr\Storyblok\Component\Config\ComponentType;
+
+/**
+ * @final
+ */
+class ComponentD extends AbstractComponent
+{
+	/**
+	 */
+	public function __construct (
+		/** @var list<string> */
+		private readonly array $tags = [],
+	) {}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public static function getKey () : string
+	{
+		return "d";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function configureFields () : array
+	{
+		return [];
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	protected function getComponentType () : ComponentType
+	{
+		return ComponentType::Standalone;
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getDisplayName () : string
+	{
+		return "B";
+	}
+
+	/**
+	 *
+	 */
+	#[\Override]
+	public function getTags () : array
+	{
+		return $this->tags;
+	}
+}