Merge pull request #46 from php-translation/patch-phpunit

Use PHPUnit 6

Author: Nyholm

composer.json

@@ -16,7 +16,7 @@
         "doctrine/annotations": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.5 || ^5.4",
+        "phpunit/phpunit": "^4.8.36 || ^5.5 || ^6.2",
         "symfony/translation": "^3.0",
         "symfony/twig-bridge": "^3.0"
     },

phpunit.xml.dist

@@ -25,7 +25,7 @@
             <directory suffix=".php">./</directory>
             <exclude>
                 <directory>vendor</directory>
-                <directory>Tests</directory>
+                <directory>tests</directory>
             </exclude>
         </whitelist>
     </filter>

tests/Functional/BladeTest.php

@@ -11,14 +11,15 @@
 
 namespace Translation\Extractor\Tests\Functional;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 use Translation\Extractor\FileExtractor\BladeFileExtractor;
 use Translation\Extractor\Model\SourceCollection;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-final class BladeTest extends \PHPUnit_Framework_TestCase
+final class BladeTest extends TestCase
 {
     private function getSourceLocations($relativePath)
     {

tests/Functional/Visitor/Php/BasePHPVisitorTest.php

@@ -11,14 +11,15 @@
 
 namespace Translation\Extractor\Tests\Functional\Visitor\Php;
 
+use PHPUnit\Framework\TestCase;
 use Translation\Extractor\FileExtractor\PHPFileExtractor;
 use Symfony\Component\Finder\Finder;
 use Translation\Extractor\Model\SourceCollection;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-abstract class BasePHPVisitorTest extends \PHPUnit_Framework_TestCase
+abstract class BasePHPVisitorTest extends TestCase
 {
     /**
      * @param $visitor

tests/Functional/Visitor/Twig/BaseTwigVisitorTest.php

@@ -11,14 +11,15 @@
 
 namespace Translation\Extractor\Tests\Functional\Visitor\Twig;
 
+use PHPUnit\Framework\TestCase;
 use Translation\Extractor\FileExtractor\TwigFileExtractor;
 use Symfony\Component\Finder\Finder;
 use Translation\Extractor\Model\SourceCollection;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-abstract class BaseTwigVisitorTest extends \PHPUnit_Framework_TestCase
+abstract class BaseTwigVisitorTest extends TestCase
 {
     protected function getSourceLocations($visitor, $relativePath)
     {

tests/Smoke/AllExtractorsTest.php

@@ -11,6 +11,7 @@
 
 namespace Translation\Extractor\Tests\Smoke;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 use Translation\Extractor\Extractor;
 use Translation\Extractor\FileExtractor\PHPFileExtractor;
@@ -30,7 +31,7 @@
  *
  * @author Tobias Nyholm <[email protected]>
  */
-class AllExtractorsTest extends \PHPUnit_Framework_TestCase
+class AllExtractorsTest extends TestCase
 {
     public function testNoException()
     {

tests/Unit/Model/SourceLocationTest.php

@@ -11,16 +11,17 @@
 
 namespace Translation\Extractor\Tests\Unit\Model;
 
+use PHPUnit\Framework\TestCase;
 use Translation\Extractor\Model\SourceLocation;
 
-class SourceLocationTest extends \PHPUnit_Framework_TestCase
+class SourceLocationTest extends TestCase
 {
     public function testCreateHere()
     {
         $location = SourceLocation::createHere('foobar', ['foo' => 'bar']);
 
         $this->assertContains('tests/Unit/Model/SourceLocationTest.php', $location->getPath());
-        $this->assertEquals(20, $location->getLine());
+        $this->assertEquals(21, $location->getLine());
 
         $this->assertEquals('foobar', $location->getMessage());
         $this->assertEquals(['foo' => 'bar'], $location->getContext());