Merge pull request #383 from oliverklee/cleanup/phpunit-upgrade

Author: sabberworm

config/php-cs-fixer.php

@@ -12,8 +12,15 @@
             // Disable constant visibility from the PSR12 rule set as this would break compatibility with PHP < 7.1.
             'visibility_required' => ['elements' => ['property', 'method']],
 
+            '@PHPUnit50Migration:risky' => true,
+            '@PHPUnit52Migration:risky' => true,
+            '@PHPUnit54Migration:risky' => true,
+            '@PHPUnit55Migration:risky' => true,
+            '@PHPUnit56Migration:risky' => true,
+            '@PHPUnit57Migration:risky' => true,
+
             'php_unit_construct' => true,
-            'php_unit_dedicate_assert' => ['target' => '5.0'],
+            'php_unit_dedicate_assert' => ['target' => '5.6'],
             'php_unit_expectation' => ['target' => '5.6'],
             'php_unit_fqcn_annotation' => true,
             'php_unit_method_casing' => true,

tests/OutputFormatTest.php

@@ -6,6 +6,7 @@
 use Sabberworm\CSS\CSSList\Document;
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Parser;
+use Sabberworm\CSS\Parsing\OutputException;
 
 /**
  * @covers \Sabberworm\CSS\OutputFormat
@@ -268,12 +269,12 @@ public function spaceBeforeBraces()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\OutputException
-     *
      * @test
      */
     public function ignoreExceptionsOff()
     {
+        $this->expectException(OutputException::class);
+
         $aBlocks = $this->oDocument->getAllDeclarationBlocks();
         $oFirstBlock = $aBlocks[0];
         $oFirstBlock->removeSelector('.main');

tests/ParserTest.php

@@ -7,6 +7,8 @@
 use Sabberworm\CSS\CSSList\KeyFrame;
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Parser;
+use Sabberworm\CSS\Parsing\OutputException;
+use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Property\AtRule;
 use Sabberworm\CSS\Property\Charset;
@@ -601,12 +603,12 @@ public function listValueRemoval()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\OutputException
-     *
      * @test
      */
     public function selectorRemoval()
     {
+        $this->expectException(OutputException::class);
+
         $oDoc = self::parsedStructureForFile('1readme');
         $aBlocks = $oDoc->getAllDeclarationBlocks();
         $oBlock1 = $aBlocks[0];
@@ -805,22 +807,22 @@ public function keyframeSelectors()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function lineNameFailure()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         self::parsedStructureForFile('-empty-grid-linename', Settings::create()->withLenientParsing(false));
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function calcFailure()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         self::parsedStructureForFile('-calc-no-space-around-minus', Settings::create()->withLenientParsing(false));
     }
 
@@ -887,45 +889,46 @@ public function trailingWhitespace()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function charsetFailure1()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         self::parsedStructureForFile('-charset-after-rule', Settings::create()->withLenientParsing(false));
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function charsetFailure2()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         self::parsedStructureForFile('-charset-in-block', Settings::create()->withLenientParsing(false));
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\SourceException
-     *
      * @test
      */
     public function unopenedClosingBracketFailure()
     {
+        $this->expectException(SourceException::class);
+
         self::parsedStructureForFile('-unopened-close-brackets', Settings::create()->withLenientParsing(false));
     }
 
     /**
      * Ensure that a missing property value raises an exception.
      *
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      * @covers \Sabberworm\CSS\Value\Value::parseValue()
      *
      * @test
      */
     public function missingPropertyValueStrict()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         self::parsedStructureForFile('missing-property-value', Settings::create()->withLenientParsing(false));
     }
 
@@ -1025,12 +1028,12 @@ public function lineNumbersParsing()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function unexpectedTokenExceptionLineNo()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         $oParser = new Parser("\ntest: 1;", Settings::create()->beStrict());
         try {
             $oParser->parse();
@@ -1041,12 +1044,12 @@ public function unexpectedTokenExceptionLineNo()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function ieHacksStrictParsing()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         // We can't strictly parse IE hacks.
         self::parsedStructureForFile('ie-hacks', Settings::create()->beStrict());
     }
@@ -1138,12 +1141,12 @@ public function topLevelCommentExtracting()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function microsoftFilterStrictParsing()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         $oDoc = self::parsedStructureForFile('ms-filter', Settings::create()->beStrict());
     }
 

tests/RuleSet/LenientParsingTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Sabberworm\CSS\Parser;
+use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Settings;
 
 /**
@@ -21,12 +22,12 @@
 class LenientParsingTest extends TestCase
 {
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function faultToleranceOff()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
@@ -48,24 +49,24 @@ public function faultToleranceOn()
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function endToken()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         $sFile = __DIR__ . '/../fixtures/-end-token.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
 
     /**
-     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
-     *
      * @test
      */
     public function endToken2()
     {
+        $this->expectException(UnexpectedTokenException::class);
+
         $sFile = __DIR__ . '/../fixtures/-end-token-2.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();