Merge pull request #252 from oliverklee/cleanup/test-namespace

Move the tests to a separate PHP namespace

Author: sabberworm

composer.json

@@ -18,6 +18,9 @@
     "autoload": {
         "psr-4": { "Sabberworm\\CSS\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Sabberworm\\CSS\\Tests\\": "tests/" }
+    },
     "scripts": {
         "ci": [
             "@ci:static"

tests/CSSList/AtRuleBlockListTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabberworm\CSS\CSSList;
+namespace Sabberworm\CSS\Tests\CSSList;
 
 use Sabberworm\CSS\Parser;
 

tests/CSSList/DocumentTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabberworm\CSS\CSSList;
+namespace Sabberworm\CSS\Tests\CSSList;
 
 use Sabberworm\CSS\Parser;
 

tests/OutputFormatTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace Sabberworm\CSS;
+namespace Sabberworm\CSS\Tests;
+
+use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parser;
 
 class OutputFormatTest extends \PHPUnit\Framework\TestCase
 {
@@ -206,7 +209,7 @@ public function testSpaceBeforeBraces()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\OutputException
+     * @expectedException \Sabberworm\CSS\Parsing\OutputException
      */
     public function testIgnoreExceptionsOff()
     {

tests/ParserTest.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Sabberworm\CSS;
+namespace Sabberworm\CSS\Tests;
 
+use Sabberworm\CSS\CSSList\Document;
 use Sabberworm\CSS\CSSList\KeyFrame;
+use Sabberworm\CSS\Parser;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Property\AtRule;
 use Sabberworm\CSS\Property\Charset;
@@ -11,6 +13,7 @@
 use Sabberworm\CSS\Property\Selector;
 use Sabberworm\CSS\RuleSet\AtRuleSet;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
+use Sabberworm\CSS\Settings;
 use Sabberworm\CSS\Value\Size;
 use Sabberworm\CSS\Value\URL;
 
@@ -522,7 +525,7 @@ public function testListValueRemoval()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\OutputException
+     * @expectedException \Sabberworm\CSS\Parsing\OutputException
      */
     public function testSelectorRemoval()
     {
@@ -680,15 +683,15 @@ public function testKeyframeSelectors()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testLineNameFailure()
     {
         $this->parsedStructureForFile('-empty-grid-linename', Settings::create()->withLenientParsing(false));
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testCalcFailure()
     {
@@ -800,7 +803,7 @@ public function testMissingPropertyValueLenient()
      * @param string $sFileName Filename.
      * @param null|obJeCt $oSettings Settings.
      *
-     * @return CSSList\Document Parsed document.
+     * @return Document Parsed document.
      */
     private function parsedStructureForFile($sFileName, $oSettings = null)
     {
@@ -881,7 +884,7 @@ public function testUnexpectedTokenExceptionLineNo()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testIeHacksStrictParsing()
     {
@@ -964,7 +967,7 @@ public function testTopLevelCommentExtracting()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testMicrosoftFilterStrictParsing()
     {

tests/RuleSet/DeclarationBlockTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabberworm\CSS\RuleSet;
+namespace Sabberworm\CSS\Tests\RuleSet;
 
 use Sabberworm\CSS\Parser;
 use Sabberworm\CSS\Rule\Rule;

tests/RuleSet/LenientParsingTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabberworm\CSS\RuleSet;
+namespace Sabberworm\CSS\Tests\RuleSet;
 
 use Sabberworm\CSS\Parser;
 use Sabberworm\CSS\Settings;
@@ -9,7 +9,7 @@ class LenientParsingTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testFaultToleranceOff()
     {
@@ -31,7 +31,7 @@ public function testFaultToleranceOn()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testEndToken()
     {
@@ -41,7 +41,7 @@ public function testEndToken()
     }
 
     /**
-     * @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+     * @expectedException \Sabberworm\CSS\Parsing\UnexpectedTokenException
      */
     public function testEndToken2()
     {