Use PHPUnit 8.5

Author: olvlvl

.gitignore

@@ -1,3 +1,4 @@
+.phpunit.result.cache
 build
 composer.lock
 vendor

Dockerfile

@@ -17,8 +17,4 @@ RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
     php /tmp/composer-setup.php && \
     mv composer.phar /usr/local/bin/composer
 
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.phar && \
-    chmod +x phpunit && \
-    mv phpunit /usr/local/bin/phpunit
-
 WORKDIR app

Makefile

@@ -1,26 +1,32 @@
-PHPUNIT=$(shell which phpunit)
+PHPUNIT_VERSION = phpunit-8.5.phar
+PHPUNIT_FILENAME = build/$(PHPUNIT_VERSION)
+PHPUNIT = php $(PHPUNIT_FILENAME)
 
 vendor:
 	@composer install
 
+$(PHPUNIT_FILENAME):
+	mkdir -p build
+	curl -o $(PHPUNIT_FILENAME) -L https://phar.phpunit.de/$(PHPUNIT_VERSION)
+
 test: test-setup
-	@php -d xdebug.coverage_enable=0 $(PHPUNIT)
+	@$(PHPUNIT)
 
 test-coverage: test-setup
 	@mkdir -p build/coverage
 	@$(PHPUNIT) --coverage-html build/coverage
 
 test-coveralls: test-setup
 	@mkdir -p build/logs
-	composer require satooshi/php-coveralls '^2.0'
+	composer require php-coveralls/php-coveralls '^2.0'
 	@$(PHPUNIT) --coverage-clover build/logs/clover.xml
 	php vendor/bin/php-coveralls -v
 
 test-container:
 	@docker-compose run --rm app sh
 	@docker-compose down
 
-test-setup: vendor
+test-setup: vendor $(PHPUNIT_FILENAME)
 	@rm -f tests/sandbox/*
 
 .PHONY: all test test-container test-coverage test-coveralls test-setup

tests/InterfaceResolver/BasicInterfaceResolverTest.php

@@ -14,6 +14,7 @@
 use ArrayIterator;
 use DateTimeImmutable;
 use DateTimeInterface;
+use LogicException;
 use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver\BasicInterfaceResolver;
 use PHPUnit\Framework\TestCase;
 
@@ -24,25 +25,29 @@ class BasicInterfaceResolverTest extends TestCase
 {
     /**
      * @test
-     * @expectedException \LogicException
-     * @expectedExceptionMessageRegExp /Don't know which interface to choose from for ArrayIterator: Iterator,/
      * @throws \Exception
      */
     public function shouldFailIfClassImplementsManyInterfaces()
     {
         $stu = new BasicInterfaceResolver();
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessageMatches(
+            "/Don't know which interface to choose from for ArrayIterator: Iterator,/"
+        );
         $stu->resolveInterface(ArrayIterator::class);
     }
 
     /**
      * @test
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Unable to determine the interface to implement for anUndefinedClass.
      * @throws \Exception
      */
     public function shouldFailIfClassDoesNotExist()
     {
         $stu = new BasicInterfaceResolver();
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage("Unable to determine the interface to implement for anUndefinedClass.");
         $stu->resolveInterface('anUndefinedClass');
     }
 

tests/ProxyDumperTest.php

@@ -14,6 +14,7 @@
 use ArrayAccess;
 use ArrayIterator;
 use ArrayObject;
+use InvalidArgumentException;
 use olvlvl\SymfonyDependencyInjectionProxy\FactoryRenderer;
 use olvlvl\SymfonyDependencyInjectionProxy\InterfaceResolver;
 use olvlvl\SymfonyDependencyInjectionProxy\ProxyDumper;
@@ -65,8 +66,6 @@ public function provideIsProxyCandidate(): array
     /**
      * @test
      * @dataProvider provideEmptyFactoryCode
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Missing factory code to construct the service `aServiceId`.
      * @throws \Exception
      */
     public function shouldFailIfFactoryCodeIsEmpty($factoryCode)
@@ -76,6 +75,8 @@ public function shouldFailIfFactoryCodeIsEmpty($factoryCode)
             $this->prophesize(FactoryRenderer::class)->reveal()
         );
 
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Missing factory code to construct the service `aServiceId`.");
         $stu->getProxyFactoryCode(new Definition(), 'aServiceId', $factoryCode);
     }