Merge pull request #421 from keradus/phpunit

Upgrade PHPUnit
phpro · Nov 17, 2017 · cbd2c89 · cbd2c89
2 parents 6badbe0 + 0a4a9e1
commit cbd2c89
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -29,6 +29,7 @@ install:
     - IF %PHP%==1 echo memory_limit=1024M >> php.ini
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
     - cd C:\tools
     - appveyor DownloadFile https://getcomposer.org/composer.phar

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "nikic/php-parser": "~2.1",
         "phpspec/phpspec": "^3.2.2",
         "phpspec/prophecy": "^1.6.2",
-        "phpunit/phpunit": "^4.8.31",
+        "phpunit/phpunit": "^5.7.25|^6.4.4",
         "sebastian/comparator": "^1.2.4",
         "sensiolabs/security-checker": "^3.0",
         "squizlabs/php_codesniffer": "~2.4"

diff --git a/test/Linter/Json/JsonLinterTest.php b/test/Linter/Json/JsonLinterTest.php
@@ -6,12 +6,12 @@
 use GrumPHP\Linter\Json\JsonLinter;
 use GrumPHP\Linter\Json\JsonLintError;
 use GrumPHP\Util\Filesystem;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Seld\JsonLint\JsonParser;
 use SplFileInfo;
 
-class JsonLinterTest extends PHPUnit_Framework_TestCase
+class JsonLinterTest extends TestCase
 {
     /**
      * @var JsonLinter

diff --git a/test/Linter/Xml/XmlLinterTest.php b/test/Linter/Xml/XmlLinterTest.php
@@ -5,11 +5,11 @@
 use GrumPHP\Collection\LintErrorsCollection;
 use GrumPHP\Linter\Xml\XmlLinter;
 use GrumPHP\Linter\Xml\XmlLintError;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use SplFileInfo;
 
-class XmlLinterTest extends PHPUnit_Framework_TestCase
+class XmlLinterTest extends TestCase
 {
     /**
      * @var XmlLinter

diff --git a/test/Linter/Yaml/YamlLinterTest.php b/test/Linter/Yaml/YamlLinterTest.php
@@ -6,11 +6,11 @@
 use GrumPHP\Linter\Yaml\YamlLinter;
 use GrumPHP\Linter\Yaml\YamlLintError;
 use GrumPHP\Util\Filesystem;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use SplFileInfo;
 
-class YamlLinterTest extends PHPUnit_Framework_TestCase
+class YamlLinterTest extends TestCase
 {
     /**
      * @var YamlLinter

diff --git a/test/Parser/Php/Visitor/AbstractVisitorTest.php b/test/Parser/Php/Visitor/AbstractVisitorTest.php
@@ -9,10 +9,10 @@
 use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\NodeVisitorAbstract;
 use PhpParser\ParserFactory;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use SplFileInfo;
 
-abstract class AbstractVisitorTest extends PHPUnit_Framework_TestCase
+abstract class AbstractVisitorTest extends TestCase
 {
     /**
      * @test