Tests: replace ninjify for contributte

f3l1x · f3l1x · commit e577d2ac6145 · 2023-07-03T18:19:08.000+02:00
diff --git a/src/Mapping/ContainerEntityListenerResolver.php b/src/Mapping/ContainerEntityListenerResolver.php
@@ -20,10 +20,9 @@ public function __construct(Container $container)
 	}
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
-	 * @param string|NULL $className
+	 * {@inheritDoc}
 	 */
-	public function clear(?string $className = null): void
+	public function clear($className = null): void
 	{
 		if ($className === null) {
 			$this->instances = [];
@@ -36,6 +35,9 @@ public function clear(?string $className = null): void
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	public function register(mixed $object): void
 	{
 		if (!is_object($object)) {
@@ -46,12 +48,10 @@ public function register(mixed $object): void
 	}
 
 	/**
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
+	 * {@inheritDoc}
 	 */
-	public function resolve(string $className): object
+	public function resolve($className): object
 	{
-		/** @var class-string $className */
 		$className = trim($className, '\\');
 
 		if (isset($this->instances[$className])) {
diff --git a/tests/Cases/DI/Configuration/EntityListenerResolver.phpt b/tests/Cases/DI/Configuration/EntityListenerResolver.phpt
@@ -3,7 +3,7 @@
 use Doctrine\ORM\Mapping\DefaultEntityListenerResolver;
 use Nette\DI\Compiler;
 use Nettrine\ORM\Mapping\ContainerEntityListenerResolver;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Helpers;
 
diff --git a/tests/Cases/DI/Configuration/NamingStrategy.phpt b/tests/Cases/DI/Configuration/NamingStrategy.phpt
@@ -2,7 +2,7 @@
 
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Nette\DI\Compiler;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Helpers;
 
diff --git a/tests/Cases/DI/Configuration/QuoteStrategy.phpt b/tests/Cases/DI/Configuration/QuoteStrategy.phpt
@@ -3,7 +3,7 @@
 use Doctrine\ORM\Mapping\AnsiQuoteStrategy;
 use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
 use Nette\DI\Compiler;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Helpers;
 
diff --git a/tests/Cases/DI/Configuration/RepositoryFactory.phpt b/tests/Cases/DI/Configuration/RepositoryFactory.phpt
@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Doctrine\ORM\Repository\DefaultRepositoryFactory;
 use Nette\DI\Compiler;
-use Ninjify\Nunjuck\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Helpers;
 
diff --git a/tests/Cases/DI/Helper/MappingHelper.phpt b/tests/Cases/DI/Helper/MappingHelper.phpt
@@ -1,9 +1,9 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Nette\DI\CompilerExtension;
 use Nettrine\ORM\DI\Helpers\MappingHelper;
 use Nettrine\ORM\Exception\Logical\InvalidStateException;
-use Ninjify\Nunjuck\Toolkit;
 use Tester\Assert;
 
 require_once __DIR__ . '/../../../bootstrap.php';
diff --git a/tests/Cases/DI/OrmAnnotationsExtension.phpt b/tests/Cases/DI/OrmAnnotationsExtension.phpt
@@ -7,7 +7,7 @@ use Nette\DI\InvalidConfigurationException;
 use Nette\DI\ServiceCreationException;
 use Nettrine\Annotations\DI\AnnotationsExtension;
 use Nettrine\ORM\DI\OrmAnnotationsExtension;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Container;
 use Tests\Toolkit\Helpers;
diff --git a/tests/Cases/DI/OrmAttributesExtension.phpt b/tests/Cases/DI/OrmAttributesExtension.phpt
@@ -9,7 +9,7 @@ use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Nette\DI\Compiler;
 use Nette\DI\InvalidConfigurationException;
 use Nettrine\ORM\DI\OrmAttributesExtension;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Container;
 use Tests\Toolkit\Helpers;
diff --git a/tests/Cases/DI/OrmCacheExtension.phpt b/tests/Cases/DI/OrmCacheExtension.phpt
@@ -1,13 +1,13 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Doctrine\Common\Cache\ApcuCache;
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Cache\PhpFileCache;
 use Doctrine\Common\Cache\VoidCache;
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
 use Nette\DI\Compiler;
 use Nettrine\ORM\DI\OrmCacheExtension;
-use Nettrine\ORM\EntityManagerDecorator;
-use Ninjify\Nunjuck\Toolkit;
 use Tester\Assert;
 use Tests\Fixtures\Dummy\DummyCacheConfigurationFactory;
 use Tests\Toolkit\Container;
diff --git a/tests/Cases/DI/OrmExtensionTest.php b/tests/Cases/DI/OrmExtensionTest.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types = 1);
 
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
 use Nette\DI\Compiler;
-use Nettrine\ORM\EntityManagerDecorator;
 use Nettrine\ORM\Exception\Logical\InvalidArgumentException;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Fixtures\Dummy\DummyConfiguration;
 use Tests\Fixtures\Dummy\DummyEntityManagerDecorator;
diff --git a/tests/Cases/DI/OrmXmlExtensionTest.php b/tests/Cases/DI/OrmXmlExtensionTest.php
@@ -6,7 +6,7 @@
 use Nette\DI\Compiler;
 use Nette\DI\InvalidConfigurationException;
 use Nettrine\ORM\DI\OrmXmlExtension;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Container;
 use Tests\Toolkit\Helpers;
diff --git a/tests/Cases/E2E/AutoGenerateProxyClasses.phpt b/tests/Cases/E2E/AutoGenerateProxyClasses.phpt
@@ -1,9 +1,9 @@
 <?php declare(strict_types = 1);
 
+use Contributte\Tester\Toolkit;
 use Doctrine\Common\Proxy\AbstractProxyFactory;
 use Doctrine\ORM\Configuration;
 use Nette\DI\Compiler;
-use Ninjify\Nunjuck\Toolkit;
 use Tester\Assert;
 use Tests\Toolkit\Container;
 use Tests\Toolkit\Helpers;
diff --git a/tests/Cases/E2E/EntityMapping.phpt b/tests/Cases/E2E/EntityMapping.phpt
@@ -7,7 +7,7 @@ use Nette\DI\Compiler;
 use Nettrine\Annotations\DI\AnnotationsExtension;
 use Nettrine\ORM\DI\OrmAnnotationsExtension;
 use Nettrine\ORM\DI\OrmXmlExtension;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Fixtures\EntityMappingCompilerExtension;
 use Tests\Toolkit\Container;
diff --git a/tests/Cases/E2E/EntityMappingForAttributes.phpt b/tests/Cases/E2E/EntityMappingForAttributes.phpt
@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Nette\DI\Compiler;
 use Nettrine\ORM\DI\OrmAttributesExtension;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
 use Tester\Assert;
 use Tests\Fixtures\EntityMappingCompilerExtensionForAttributes;
 use Tests\Toolkit\Container;
diff --git a/tests/Cases/ManagerRegistry.phpt b/tests/Cases/ManagerRegistry.phpt
@@ -1,7 +1,7 @@
 <?php declare(strict_types = 1);
 
-use Nettrine\ORM\ManagerRegistry;
-use Ninjify\Nunjuck\Toolkit;
+use Contributte\Tester\Toolkit;
+use Doctrine\Persistence\ManagerRegistry;
 use Tester\Assert;
 use Tests\Toolkit\Container;
 
diff --git a/tests/Fixtures/Dummy/DummyEntityManagerDecorator.php b/tests/Fixtures/Dummy/DummyEntityManagerDecorator.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Fixtures\Dummy;
 
-use Nettrine\ORM\EntityManagerDecorator;
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
 
-class DummyEntityManagerDecorator extends EntityManagerDecorator
+final class DummyEntityManagerDecorator extends EntityManagerDecorator
 {
 
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,13 +1,10 @@
 <?php declare(strict_types = 1);
 
-use Ninjify\Nunjuck\Environment;
+use Contributte\Tester\Environment;
 
 if (@!include __DIR__ . '/../vendor/autoload.php') {
 	echo 'Install Nette Tester using `composer update --dev`';
 	exit(1);
 }
 
-// Configure environment
-Environment::setupTester();
-Environment::setupTimezone();
-Environment::setupVariables(__DIR__);
+Environment::setup(__DIR__);

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,9 @@ public function __construct(Container $container)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint`
`24`		`- * @param string\|NULL $className`
	`23`	`+ * {@inheritDoc}`
`25`	`24`	`*/`
`26`		`- public function clear(?string $className = null): void`
	`25`	`+ public function clear($className = null): void`
`27`	`26`	`{`
`28`	`27`	`if ($className === null) {`
`29`	`28`	`$this->instances = [];`
`@@ -36,6 +35,9 @@ public function clear(?string $className = null): void`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
	`38`	`+ /**`
	`39`	`+ * {@inheritDoc}`
	`40`	`+ */`
`39`	`41`	`public function register(mixed $object): void`
`40`	`42`	`{`
`41`	`43`	`if (!is_object($object)) {`
`@@ -46,12 +48,10 @@ public function register(mixed $object): void`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`/**`
`49`		`- * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint`
`50`		`- * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint`
	`51`	`+ * {@inheritDoc}`
`51`	`52`	`*/`
`52`		`- public function resolve(string $className): object`
	`53`	`+ public function resolve($className): object`
`53`	`54`	`{`
`54`		`- /** @var class-string $className */`
`55`	`55`	`$className = trim($className, '\\');`
`56`	`56`
`57`	`57`	`if (isset($this->instances[$className])) {`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Tests\Fixtures\Dummy;`
`4`	`4`
`5`		`-use Nettrine\ORM\EntityManagerDecorator;`
	`5`	`+use Doctrine\ORM\Decorator\EntityManagerDecorator;`
`6`	`6`
`7`		`-class DummyEntityManagerDecorator extends EntityManagerDecorator`
	`7`	`+final class DummyEntityManagerDecorator extends EntityManagerDecorator`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`}`