From: William Desportes Date: Wed, 13 Sep 2023 11:39:59 +0200 Subject: Skip all tests that require easymock Origin: vendor Forwarded: not-needed --- tests/UnitTest/ContainerBuilderTest.php | 6 ++++-- tests/UnitTest/Definition/InstanceDefinitionTest.php | 4 ++-- tests/UnitTest/Definition/ReferenceTest.php | 4 ++-- tests/UnitTest/Definition/Resolver/ArrayResolverTest.php | 3 +-- tests/UnitTest/Definition/Resolver/DecoratorResolverTest.php | 3 +-- .../Definition/Resolver/EnvironmentVariableResolverTest.php | 3 +-- .../UnitTest/Definition/Resolver/FactoryParameterResolverTest.php | 3 +-- tests/UnitTest/Definition/Resolver/FactoryResolverTest.php | 8 ++++++-- tests/UnitTest/Definition/Resolver/InstanceInjectorTest.php | 3 +-- tests/UnitTest/Definition/Resolver/ObjectCreatorTest.php | 3 +-- tests/UnitTest/Definition/Resolver/ResolverDispatcherTest.php | 3 +-- tests/UnitTest/Definition/StringDefinitionTest.php | 7 +++++-- tests/UnitTest/Definition/ValueDefinitionTest.php | 4 ++-- 13 files changed, 28 insertions(+), 26 deletions(-) diff --git a/tests/UnitTest/ContainerBuilderTest.php b/tests/UnitTest/ContainerBuilderTest.php index c354002..2a608f4 100644 --- a/tests/UnitTest/ContainerBuilderTest.php +++ b/tests/UnitTest/ContainerBuilderTest.php @@ -11,7 +11,7 @@ use DI\Definition\Source\SourceCache; use DI\Definition\ValueDefinition; use DI\Test\IntegrationTest\BaseContainerTest; use DI\Test\UnitTest\Fixtures\FakeContainer; -use EasyMock\EasyMock; +//use EasyMock\EasyMock; use PHPUnit\Framework\Attributes\RequiresPhp; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -22,7 +22,7 @@ use Psr\Container\ContainerInterface; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\ContainerBuilder::class)] class ContainerBuilderTest extends TestCase { - use EasyMock; + //use EasyMock; private static function getProperty(object $object, string $propertyName) { @@ -110,6 +110,7 @@ class ContainerBuilderTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_allow_to_set_a_wrapper_container() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $otherContainer = $this->easyMock(ContainerInterface::class); $builder = new ContainerBuilder(FakeContainer::class); @@ -245,6 +246,7 @@ class ContainerBuilderTest extends TestCase $result = $builder->enableDefinitionCache(); $this->assertSame($builder, $result); + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $result = $builder->wrapContainer($this->easyMock(ContainerInterface::class)); $this->assertSame($builder, $result); } diff --git a/tests/UnitTest/Definition/InstanceDefinitionTest.php b/tests/UnitTest/Definition/InstanceDefinitionTest.php index b5e6735..ec0a486 100644 --- a/tests/UnitTest/Definition/InstanceDefinitionTest.php +++ b/tests/UnitTest/Definition/InstanceDefinitionTest.php @@ -6,7 +6,6 @@ namespace DI\Test\UnitTest\Definition; use DI\Definition\InstanceDefinition; use DI\Definition\ObjectDefinition; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; /** @@ -15,7 +14,6 @@ use PHPUnit\Framework\TestCase; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\InstanceDefinition::class)] class InstanceDefinitionTest extends TestCase { - use EasyMock; /** * @test @@ -25,6 +23,7 @@ class InstanceDefinitionTest extends TestCase { $instance = new \stdClass(); + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $definition = new InstanceDefinition($instance, $this->easyMock(ObjectDefinition::class)); $this->assertSame($instance, $definition->getInstance()); @@ -36,6 +35,7 @@ class InstanceDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_contain_an_object_definition() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $objectDefinition = $this->easyMock(ObjectDefinition::class); $definition = new InstanceDefinition(new \stdClass(), $objectDefinition); diff --git a/tests/UnitTest/Definition/ReferenceTest.php b/tests/UnitTest/Definition/ReferenceTest.php index 4ef02a8..b9817c6 100644 --- a/tests/UnitTest/Definition/ReferenceTest.php +++ b/tests/UnitTest/Definition/ReferenceTest.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace DI\Test\UnitTest\Definition; use DI\Definition\Reference; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -15,7 +14,6 @@ use Psr\Container\ContainerInterface; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Reference::class)] class ReferenceTest extends TestCase { - use EasyMock; /** * @test @@ -46,6 +44,7 @@ class ReferenceTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easySpy(ContainerInterface::class, [ 'get' => 42, ]); @@ -61,6 +60,7 @@ class ReferenceTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_be_resolvable() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easySpy(ContainerInterface::class, [ 'has' => true, ]); diff --git a/tests/UnitTest/Definition/Resolver/ArrayResolverTest.php b/tests/UnitTest/Definition/Resolver/ArrayResolverTest.php index 111a8a2..db388e7 100644 --- a/tests/UnitTest/Definition/Resolver/ArrayResolverTest.php +++ b/tests/UnitTest/Definition/Resolver/ArrayResolverTest.php @@ -9,7 +9,6 @@ use DI\Definition\ArrayDefinition; use DI\Definition\ObjectDefinition; use DI\Definition\Resolver\ArrayResolver; use DI\Definition\Resolver\DefinitionResolver; -use EasyMock\EasyMock; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use DI\DependencyException; @@ -20,7 +19,6 @@ use DI\DependencyException; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\ArrayResolver::class)] class ArrayResolverTest extends TestCase { - use EasyMock; private MockObject|DefinitionResolver $parentResolver; @@ -28,6 +26,7 @@ class ArrayResolverTest extends TestCase public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->parentResolver = $this->easyMock(DefinitionResolver::class); $this->resolver = new ArrayResolver($this->parentResolver); } diff --git a/tests/UnitTest/Definition/Resolver/DecoratorResolverTest.php b/tests/UnitTest/Definition/Resolver/DecoratorResolverTest.php index b6efbad..9eea615 100644 --- a/tests/UnitTest/Definition/Resolver/DecoratorResolverTest.php +++ b/tests/UnitTest/Definition/Resolver/DecoratorResolverTest.php @@ -8,7 +8,6 @@ use DI\Definition\DecoratorDefinition; use DI\Definition\Resolver\DecoratorResolver; use DI\Definition\Resolver\DefinitionResolver; use DI\Definition\ValueDefinition; -use EasyMock\EasyMock; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -20,7 +19,6 @@ use DI\Definition\Exception\InvalidDefinition; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\DecoratorResolver::class)] class DecoratorResolverTest extends TestCase { - use EasyMock; private DecoratorResolver $resolver; @@ -28,6 +26,7 @@ class DecoratorResolverTest extends TestCase public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $this->parentResolver = $this->easyMock(DefinitionResolver::class); $this->resolver = new DecoratorResolver($container, $this->parentResolver); diff --git a/tests/UnitTest/Definition/Resolver/EnvironmentVariableResolverTest.php b/tests/UnitTest/Definition/Resolver/EnvironmentVariableResolverTest.php index 0ffb8ae..4aa31a8 100644 --- a/tests/UnitTest/Definition/Resolver/EnvironmentVariableResolverTest.php +++ b/tests/UnitTest/Definition/Resolver/EnvironmentVariableResolverTest.php @@ -8,7 +8,6 @@ use DI\Definition\Reference; use DI\Definition\EnvironmentVariableDefinition; use DI\Definition\Resolver\DefinitionResolver; use DI\Definition\Resolver\EnvironmentVariableResolver; -use EasyMock\EasyMock; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use DI\Definition\Exception\InvalidDefinition; @@ -19,7 +18,6 @@ use DI\Definition\Exception\InvalidDefinition; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\EnvironmentVariableResolver::class)] class EnvironmentVariableResolverTest extends TestCase { - use EasyMock; private EnvironmentVariableResolver $resolver; private MockObject|DefinitionResolver $parentResolver; @@ -31,6 +29,7 @@ class EnvironmentVariableResolverTest extends TestCase public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->parentResolver = $this->easyMock(DefinitionResolver::class); $variableReader = function ($variableName) { diff --git a/tests/UnitTest/Definition/Resolver/FactoryParameterResolverTest.php b/tests/UnitTest/Definition/Resolver/FactoryParameterResolverTest.php index a2e23e6..4bb09c2 100644 --- a/tests/UnitTest/Definition/Resolver/FactoryParameterResolverTest.php +++ b/tests/UnitTest/Definition/Resolver/FactoryParameterResolverTest.php @@ -8,7 +8,6 @@ use DI\Container; use DI\Factory\RequestedEntry; use DI\Invoker\FactoryParameterResolver; use DI\Test\UnitTest\Definition\Resolver\Fixture\NoConstructor; -use EasyMock\EasyMock; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -19,7 +18,6 @@ use Psr\Container\ContainerInterface; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Invoker\FactoryParameterResolver::class)] class FactoryParameterResolverTest extends TestCase { - use EasyMock; private FactoryParameterResolver $resolver; private MockObject|ContainerInterface $container; @@ -27,6 +25,7 @@ class FactoryParameterResolverTest extends TestCase public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->container = $this->easyMock(ContainerInterface::class); $this->resolver = new FactoryParameterResolver($this->container); $this->requestedEntry = $this->easyMock(RequestedEntry::class); diff --git a/tests/UnitTest/Definition/Resolver/FactoryResolverTest.php b/tests/UnitTest/Definition/Resolver/FactoryResolverTest.php index e89c816..e0d665f 100644 --- a/tests/UnitTest/Definition/Resolver/FactoryResolverTest.php +++ b/tests/UnitTest/Definition/Resolver/FactoryResolverTest.php @@ -11,7 +11,6 @@ use DI\Definition\Resolver\FactoryResolver; use DI\NotFoundException; use DI\Test\UnitTest\Definition\Resolver\Fixture\FixtureClass; use DI\Test\UnitTest\Definition\Resolver\Fixture\NoConstructor; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; use DI\Definition\Exception\InvalidDefinition; @@ -22,7 +21,6 @@ use DI\Definition\Exception\InvalidDefinition; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\FactoryResolver::class)] class FactoryResolverTest extends TestCase { - use EasyMock; /** * @test @@ -30,6 +28,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve_callables() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $resolver = new FactoryResolver($container, $this->easyMock(DefinitionResolver::class)); @@ -48,6 +47,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_inject_container() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $resolver = new FactoryResolver($container, $this->easyMock(DefinitionResolver::class)); @@ -66,6 +66,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_throw_if_the_factory_is_not_callable() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->expectException(InvalidDefinition::class); $this->expectExceptionMessage('Entry "foo" cannot be resolved: factory \'Hello world\' is neither a callable nor a valid container entry'); $container = $this->easyMock(ContainerInterface::class); @@ -85,6 +86,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_throw_if_not_enough_parameters() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->expectException(InvalidDefinition::class); $this->expectExceptionMessage('Entry "foo" cannot be resolved: Unable to invoke the callable because no value was given for parameter 3 ($c)'); $container = $this->easyMock(ContainerInterface::class); @@ -102,6 +104,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_inject_parameters() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $resolver = new FactoryResolver($container, $this->easyMock(DefinitionResolver::class)); @@ -125,6 +128,7 @@ class FactoryResolverTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve_nested_definition_in_parameters() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $parentResolver = $this->easyMock(DefinitionResolver::class); $resolver = new FactoryResolver($container, $parentResolver); diff --git a/tests/UnitTest/Definition/Resolver/InstanceInjectorTest.php b/tests/UnitTest/Definition/Resolver/InstanceInjectorTest.php index 4ba3f1c..87198ed 100644 --- a/tests/UnitTest/Definition/Resolver/InstanceInjectorTest.php +++ b/tests/UnitTest/Definition/Resolver/InstanceInjectorTest.php @@ -12,7 +12,6 @@ use DI\Definition\Resolver\InstanceInjector; use DI\Definition\Resolver\ResolverDispatcher; use DI\Proxy\ProxyFactory; use DI\Test\UnitTest\Definition\Resolver\Fixture\FixtureClass; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; /** @@ -21,7 +20,6 @@ use PHPUnit\Framework\TestCase; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\InstanceInjector::class)] class InstanceInjectorTest extends TestCase { - use EasyMock; /** * @test @@ -59,6 +57,7 @@ class InstanceInjectorTest extends TestCase private function buildResolver(): InstanceInjector { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); /** @var ResolverDispatcher $resolverDispatcher */ $resolverDispatcher = $this->easyMock(ResolverDispatcher::class); /** @var ProxyFactory $factory */ diff --git a/tests/UnitTest/Definition/Resolver/ObjectCreatorTest.php b/tests/UnitTest/Definition/Resolver/ObjectCreatorTest.php index a9173b8..ded03b5 100644 --- a/tests/UnitTest/Definition/Resolver/ObjectCreatorTest.php +++ b/tests/UnitTest/Definition/Resolver/ObjectCreatorTest.php @@ -14,7 +14,6 @@ use DI\Test\UnitTest\Definition\Resolver\Fixture\FixtureAbstractClass; use DI\Test\UnitTest\Definition\Resolver\Fixture\FixtureClass; use DI\Test\UnitTest\Definition\Resolver\Fixture\FixtureInterface; use DI\Test\UnitTest\Definition\Resolver\Fixture\NoConstructor; -use EasyMock\EasyMock; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use DI\Definition\Exception\InvalidDefinition; @@ -26,7 +25,6 @@ use DI\Definition\Exception\InvalidDefinition; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\ParameterResolver::class)] class ObjectCreatorTest extends TestCase { - use EasyMock; private MockObject|DefinitionResolver $parentResolver; @@ -34,6 +32,7 @@ class ObjectCreatorTest extends TestCase public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $proxyFactory = $this->easyMock(ProxyFactory::class); $this->parentResolver = $this->easyMock(DefinitionResolver::class); diff --git a/tests/UnitTest/Definition/Resolver/ResolverDispatcherTest.php b/tests/UnitTest/Definition/Resolver/ResolverDispatcherTest.php index 5bebfe1..91ec2e4 100644 --- a/tests/UnitTest/Definition/Resolver/ResolverDispatcherTest.php +++ b/tests/UnitTest/Definition/Resolver/ResolverDispatcherTest.php @@ -9,7 +9,6 @@ use DI\Definition\Resolver\ResolverDispatcher; use DI\Definition\StringDefinition; use DI\Definition\ValueDefinition; use DI\Proxy\ProxyFactory; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -19,12 +18,12 @@ use Psr\Container\ContainerInterface; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\Resolver\ResolverDispatcher::class)] class ResolverDispatcherTest extends TestCase { - use EasyMock; private ResolverDispatcher $resolver; public function setUp(): void { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $proxyFactory = $this->easyMock(ProxyFactory::class); $this->resolver = new ResolverDispatcher($container, $proxyFactory); diff --git a/tests/UnitTest/Definition/StringDefinitionTest.php b/tests/UnitTest/Definition/StringDefinitionTest.php index aa1b268..5ff2356 100644 --- a/tests/UnitTest/Definition/StringDefinitionTest.php +++ b/tests/UnitTest/Definition/StringDefinitionTest.php @@ -6,7 +6,6 @@ namespace DI\Test\UnitTest\Definition; use DI\Definition\StringDefinition; use DI\NotFoundException; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; use DI\DependencyException; @@ -17,7 +16,6 @@ use DI\DependencyException; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\StringDefinition::class)] class StringDefinitionTest extends TestCase { - use EasyMock; public function test_getters() { @@ -34,6 +32,7 @@ class StringDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_be_resolvable() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $definition = new StringDefinition('foo'); @@ -47,6 +46,7 @@ class StringDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve_bare_strings() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $definition = new StringDefinition('bar'); @@ -60,6 +60,7 @@ class StringDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve_references() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class, [ 'get' => 'bar', ]); @@ -75,6 +76,7 @@ class StringDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_resolve_multiple_references() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easySpy(ContainerInterface::class); $container->expects($this->exactly(2)) ->method('get') @@ -97,6 +99,7 @@ class StringDefinitionTest extends TestCase #[\PHPUnit\Framework\Attributes\Test] public function should_throw_on_unknown_entry_name() { + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $this->expectException(DependencyException::class); $this->expectExceptionMessage('Error while parsing string expression for entry \'foo\': No entry or class found for \'test\''); $container = $this->easyMock(ContainerInterface::class, [ diff --git a/tests/UnitTest/Definition/ValueDefinitionTest.php b/tests/UnitTest/Definition/ValueDefinitionTest.php index 0b638f8..01c1d42 100644 --- a/tests/UnitTest/Definition/ValueDefinitionTest.php +++ b/tests/UnitTest/Definition/ValueDefinitionTest.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace DI\Test\UnitTest\Definition; use DI\Definition\ValueDefinition; -use EasyMock\EasyMock; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -15,7 +14,6 @@ use Psr\Container\ContainerInterface; #[\PHPUnit\Framework\Attributes\CoversClass(\DI\Definition\ValueDefinition::class)] class ValueDefinitionTest extends TestCase { - use EasyMock; public function test_getters() { @@ -33,6 +31,7 @@ class ValueDefinitionTest extends TestCase public function should_be_resolvable() { $definition = new ValueDefinition('foo'); + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $this->assertTrue($definition->isResolvable($container)); } @@ -44,6 +43,7 @@ class ValueDefinitionTest extends TestCase public function should_resolve() { $definition = new ValueDefinition('bar'); + $this->markTestSkipped('Requires mnapoli/phpunit-easymock'); $container = $this->easyMock(ContainerInterface::class); $this->assertEquals('bar', $definition->resolve($container)); }