Merge pull request #27 from jakzal/2.0

Drop support for types defined in docblocks

Author: jakzal

.travis.yml

@@ -1,11 +1,10 @@
 language: php
 matrix:
   include:
-  - php: 7.2
-    env: EXECUTE_DEPLOYMENT=true
-  - php: 7.3
+  - php: 7.4
     env: deps=low
   - php: 7.4
+    env: EXECUTE_DEPLOYMENT=true
   fast_finish: true
 before_install:
 - phpenv config-rm xdebug.ini || echo "XDebug not enabled"

Makefile

@@ -71,7 +71,7 @@ package: tools/box
 
 	cd build/phar && \
 	  composer remove phpunit/phpunit --no-update && \
-	  composer config platform.php 7.2 && \
+	  composer config platform.php 7.4 && \
 	  composer update --no-dev -o -a
 
 	tools/box compile
@@ -93,16 +93,16 @@ tools/deptrac:
 	curl -Ls http://get.sensiolabs.de/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
 
 tools/infection: tools/infection.pubkey
-	curl -Ls https://github.com/infection/infection/releases/download/0.15.0/infection.phar -o tools/infection && chmod +x tools/infection
+	curl -Ls https://github.com/infection/infection/releases/download/0.15.1/infection.phar -o tools/infection && chmod +x tools/infection
 
 tools/infection.pubkey:
-	curl -Ls https://github.com/infection/infection/releases/download/0.15.0/infection.phar.pubkey -o tools/infection.pubkey
+	curl -Ls https://github.com/infection/infection/releases/download/0.15.1/infection.phar.pubkey -o tools/infection.pubkey
 
 tools/box:
 	curl -Ls https://github.com/humbug/box/releases/download/3.8.4/box.phar -o tools/box && chmod +x tools/box
 
 tests/phar/tools/phpunit:
-	curl -Ls https://phar.phpunit.de/phpunit-8.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
+	curl -Ls https://phar.phpunit.de/phpunit-9.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
 
 tests/phar/tools/phpunit.d/zalas-phpunit-injector-extension.phar: build/zalas-phpunit-injector-extension.phar
 	cp build/zalas-phpunit-injector-extension.phar tests/phar/tools/phpunit.d/zalas-phpunit-injector-extension.phar

README.md

@@ -73,18 +73,10 @@ class ServiceInjectorTest extends TestCase implements ServiceContainerTestCase
      */
     private LoggerInterface $logger;
 
-    /**
-     * @var LoggerInterface
-     * @inject
-     */
-    private $anotherLogger;
-
-
     public function testThatServicesAreInjected()
     {
         $this->assertInstanceOf(SerializerInterface::class, $this->serializer, 'The service is injectd by its type');
         $this->assertInstanceOf(LoggerInterface::class, $this->logger, 'The service is injected by its id');
-        $this->assertInstanceOf(LoggerInterface::class, $this->anotherLogger, 'The service is injected by its @var type');
     }
 
     public function createServiceContainer(): ContainerInterface
@@ -95,7 +87,6 @@ class ServiceInjectorTest extends TestCase implements ServiceContainerTestCase
 ```
 
 The service is found by its type, or an id if it's given in the `@inject` tag.
-In legacy PHP versions the `@var` annotation can be used.
 
 The `createServiceContainer` method would be usually provided by a base test case or a trait.
 In case of Symfony, such a trait is provided by this package (see the next section).

composer.json

@@ -3,18 +3,18 @@
     "description": "Injects services from a PSR-11 dependency injection container to PHPUnit test cases",
     "type": "library",
     "require": {
-        "php": "^7.2,<8.0",
-        "phpunit/phpunit": "^8.0",
+        "php": "^7.4,<8.0",
+        "phpunit/phpunit": "^9.0",
         "psr/container": "^1.0",
-        "zalas/injector": "^1.3"
+        "zalas/injector": "^2.0"
     },
     "require-dev": {
         "symfony/config": "^3.4 || ^4.4 || ^5.0",
         "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
         "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0",
         "zalas/phpunit-globals": "^2.0",
         "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
-        "zalas/phpunit-doubles": "^1.2",
+        "zalas/phpunit-doubles": "^1.4",
         "phpspec/prophecy": "^1.9"
     },
     "autoload": {
@@ -36,7 +36,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

manifest.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phar xmlns="https://phar.io/xml/manifest/1.0">
     <contains name="zalas/phpunit-injector" version="@@version@@" type="extension">
-        <extension for="phpunit/phpunit" compatible="^8.0"/>
+        <extension for="phpunit/phpunit" compatible="^9.0"/>
     </contains>
 
     <copyright>
@@ -10,6 +10,6 @@
     </copyright>
 
     <requires>
-        <php version="^7.2"/>
+        <php version="^7.4"/>
     </requires>
 </phar>

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.0/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"

src/Symfony/Compiler/Discovery/ClassFinder.php

@@ -5,10 +5,7 @@
 
 class ClassFinder
 {
-    /**
-     * @var string
-     */
-    private $path;
+    private string $path;
 
     public function __construct(string $path = 'tests')
     {

src/Symfony/Compiler/Discovery/PropertyDiscovery.php

@@ -12,15 +12,9 @@
 
 class PropertyDiscovery
 {
-    /**
-     * @var ClassFinder
-     */
-    private $classFinder;
+    private ClassFinder $classFinder;
 
-    /**
-     * @var ExtractorFactory
-     */
-    private $extractorFactory;
+    private ExtractorFactory $extractorFactory;
 
     public function __construct(?ClassFinder $classFinder = null, ?ExtractorFactory $extractorFactory = null)
     {

src/Symfony/Compiler/ExposeServicesForTestsPass.php

@@ -17,10 +17,7 @@
  */
 class ExposeServicesForTestsPass implements CompilerPassInterface
 {
-    /**
-     * @var PropertyDiscovery
-     */
-    private $propertyDiscovery;
+    private PropertyDiscovery $propertyDiscovery;
 
     public function __construct(?PropertyDiscovery $propertyDiscovery = null)
     {

src/Symfony/TestCase/SymfonyKernel.php

@@ -12,10 +12,7 @@
  */
 trait SymfonyKernel
 {
-    /**
-     * @var KernelInterface|null
-     */
-    protected static $kernel;
+    protected static ?KernelInterface $kernel = null;
 
     protected static function bootKernel(array $options = []): KernelInterface
     {

src/TestListener/TestCaseContainerFactory.php

@@ -9,10 +9,7 @@
 
 final class TestCaseContainerFactory implements ContainerFactory
 {
-    /**
-     * @var ServiceContainerTestCase
-     */
-    private $testCase;
+    private ServiceContainerTestCase $testCase;
 
     public function __construct(ServiceContainerTestCase $testCase)
     {

tests/Symfony/TestCase/SymfonyContainerTest.php

@@ -15,16 +15,14 @@ class SymfonyContainerTest extends TestCase implements ServiceContainerTestCase
     use SymfonyContainer;
 
     /**
-     * @var Service1
      * @inject
      */
-    private $service1;
+    private Service1 $service1;
 
     /**
-     * @var Service2
      * @inject foo.service2
      */
-    private $service2;
+    private Service2 $service2;
 
     /**
      * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel

tests/TestListener/Fixtures/Services.php

@@ -6,16 +6,14 @@
 class Services
 {
     /**
-     * @var Service1
      * @inject
      */
-    private $service1;
+    private Service1 $service1;
 
     /**
-     * @var Service2
      * @inject foo.service2
      */
-    private $service2;
+    private Service2 $service2;
 
     public function getService1(): ?Service1
     {

tests/TestListener/ServiceInjectorListenerTest.php

@@ -16,21 +16,16 @@
 class ServiceInjectorListenerTest extends TestCase implements ServiceContainerTestCase
 {
     /**
-     * @var Service1
      * @inject
      */
-    private $service1;
+    private Service1 $service1;
 
     /**
-     * @var Service2
      * @inject foo.service2
      */
-    private $service2;
+    private Service2 $service2;
 
-    /**
-     * @var Service2
-     */
-    private $service2NotInjected;
+    private ?Service2 $service2NotInjected = null;
 
     public function test_it_is_a_phpunit_listener()
     {

tests/phar/tests/PharTest.php

@@ -9,10 +9,9 @@
 class PharTest extends TestCase implements ServiceContainerTestCase
 {
     /**
-     * @var stdClass
      * @inject foo.service
      */
-    private $service;
+    private stdClass $service;
 
     public function test_it_injects_services_into_test_cases()
     {