Re-namespace models, parsers and exceptions (#89)

webignition · web-flow · commit bcb4918f0459 · 2021-10-15T17:07:26.000+01:00
diff --git a/src/Exception/AttributeParserException.php b/src/Exception/AttributeParserException.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parameter\Parser;
-
-use webignition\InternetMediaType\Parser\ParseException;
+namespace webignition\InternetMediaType\Exception;
 
 class AttributeParserException extends ParseException
 {
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parser;
+namespace webignition\InternetMediaType\Exception;
 
 use Throwable;
 
diff --git a/src/Exception/SubtypeParserException.php b/src/Exception/SubtypeParserException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parser;
+namespace webignition\InternetMediaType\Exception;
 
 class SubtypeParserException extends ParseException
 {
diff --git a/src/Exception/TypeParserException.php b/src/Exception/TypeParserException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parser;
+namespace webignition\InternetMediaType\Exception;
 
 class TypeParserException extends ParseException
 {
diff --git a/src/Parameter.php b/src/Parameter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parameter;
+namespace webignition\InternetMediaType;
 
 use webignition\InternetMediaTypeInterface\ParameterInterface;
 
diff --git a/src/Parser/AttributeParser.php b/src/Parser/AttributeParser.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace webignition\InternetMediaType\Parameter\Parser;
+namespace webignition\InternetMediaType\Parser;
 
+use webignition\InternetMediaType\Exception\AttributeParserException;
 use webignition\StringParser\StringParser;
 use webignition\StringParser\UnknownStateException;
 
diff --git a/src/Parser/ParameterParser.php b/src/Parser/ParameterParser.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace webignition\InternetMediaType\Parameter\Parser;
+namespace webignition\InternetMediaType\Parser;
 
-use webignition\InternetMediaType\Parameter\Parameter;
+use webignition\InternetMediaType\Exception\AttributeParserException;
+use webignition\InternetMediaType\Parameter;
 use webignition\InternetMediaTypeInterface\ParameterInterface;
 use webignition\QuotedString\Exception as QuotedStringException;
 use webignition\StringParser\UnknownStateException;
@@ -22,7 +23,7 @@
  *
  * http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
  */
-class Parser
+class ParameterParser
 {
     public function __construct(
         private AttributeParser $attributeParser,
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
@@ -2,13 +2,14 @@
 
 namespace webignition\InternetMediaType\Parser;
 
+use webignition\InternetMediaType\Exception\AttributeParserException;
+use webignition\InternetMediaType\Exception\ParseException;
+use webignition\InternetMediaType\Exception\SubtypeParserException;
+use webignition\InternetMediaType\Exception\TypeParserException;
 use webignition\InternetMediaType\Fixer\AttributeFixer;
 use webignition\InternetMediaType\Fixer\TypeFixer;
 use webignition\InternetMediaType\InternetMediaType;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParser;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
-use webignition\InternetMediaType\Parameter\Parser\Parser as ParameterParser;
-use webignition\InternetMediaType\Parameter\Parser\ValueParser;
+use webignition\InternetMediaType\Parser\ParameterParser as ParameterParser;
 use webignition\InternetMediaTypeInterface\InternetMediaTypeInterface;
 use webignition\InternetMediaTypeInterface\ParameterInterface;
 use webignition\QuotedString\Exception as QuotedStringException;
diff --git a/src/Parser/SubtypeParser.php b/src/Parser/SubtypeParser.php
@@ -2,6 +2,7 @@
 
 namespace webignition\InternetMediaType\Parser;
 
+use webignition\InternetMediaType\Exception\SubtypeParserException;
 use webignition\StringParser\StringParser;
 use webignition\StringParser\UnknownStateException;
 
diff --git a/src/Parser/TypeParser.php b/src/Parser/TypeParser.php
@@ -2,6 +2,7 @@
 
 namespace webignition\InternetMediaType\Parser;
 
+use webignition\InternetMediaType\Exception\TypeParserException;
 use webignition\StringParser\StringParser;
 use webignition\StringParser\UnknownStateException;
 
diff --git a/src/Parser/ValueParser.php b/src/Parser/ValueParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace webignition\InternetMediaType\Parameter\Parser;
+namespace webignition\InternetMediaType\Parser;
 
 use webignition\QuotedString\Exception as QuotedStringException;
 use webignition\QuotedString\Parser as QuotedStringParser;
diff --git a/tests/Exception/AttributeParserExceptionTest.php b/tests/Exception/AttributeParserExceptionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parameter\Parser;
+namespace webignition\Tests\InternetMediaType\Exception;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
+use webignition\InternetMediaType\Exception\AttributeParserException;
 
 class AttributeParserExceptionTest extends TestCase
 {
diff --git a/tests/Exception/SubtypeParserExceptionTest.php b/tests/Exception/SubtypeParserExceptionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parser;
+namespace webignition\Tests\InternetMediaType\Exception;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parser\SubtypeParserException;
+use webignition\InternetMediaType\Exception\SubtypeParserException;
 
 class SubtypeParserExceptionTest extends TestCase
 {
diff --git a/tests/InternetMediaTypeTest.php b/tests/InternetMediaTypeTest.php
@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use webignition\InternetMediaType\InternetMediaType;
-use webignition\InternetMediaType\Parameter\Parameter;
+use webignition\InternetMediaType\Parameter;
 use webignition\InternetMediaTypeInterface\ParameterInterface;
 
 class InternetMediaTypeTest extends TestCase
diff --git a/tests/ParameterTest.php b/tests/ParameterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parameter;
+namespace webignition\Tests\InternetMediaType;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parameter;
+use webignition\InternetMediaType\Parameter;
 
 class ParameterTest extends TestCase
 {
diff --git a/tests/Parser/AttributeParserTest.php b/tests/Parser/AttributeParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parameter\Parser;
+namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParser;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
+use webignition\InternetMediaType\Exception\AttributeParserException;
+use webignition\InternetMediaType\Parser\AttributeParser;
 
 class AttributeParserTest extends TestCase
 {
diff --git a/tests/Parser/ParameterParserTest.php b/tests/Parser/ParameterParserTest.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parameter\Parser;
+namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParser;
-use webignition\InternetMediaType\Parameter\Parser\Parser;
-use webignition\InternetMediaType\Parameter\Parser\ValueParser;
+use webignition\InternetMediaType\Parser\AttributeParser;
+use webignition\InternetMediaType\Parser\ParameterParser;
+use webignition\InternetMediaType\Parser\ValueParser;
 use webignition\QuotedString\Parser as QuotedStringParser;
 
-class ParserTest extends TestCase
+class ParameterParserTest extends TestCase
 {
-    private Parser $parser;
+    private ParameterParser $parser;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->parser = new Parser(
+        $this->parser = new ParameterParser(
             new AttributeParser(),
             new ValueParser(new QuotedStringParser()),
         );
diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php
@@ -3,11 +3,11 @@
 namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
-use webignition\InternetMediaType\Parser\ParseException;
+use webignition\InternetMediaType\Exception\AttributeParserException;
+use webignition\InternetMediaType\Exception\ParseException;
+use webignition\InternetMediaType\Exception\SubtypeParserException;
+use webignition\InternetMediaType\Exception\TypeParserException;
 use webignition\InternetMediaType\Parser\Parser;
-use webignition\InternetMediaType\Parser\SubtypeParserException;
-use webignition\InternetMediaType\Parser\TypeParserException;
 use webignition\InternetMediaTypeInterface\InternetMediaTypeInterface;
 
 class ParserTest extends TestCase
diff --git a/tests/Parser/SubtypeParserTest.php b/tests/Parser/SubtypeParserTest.php
@@ -3,8 +3,8 @@
 namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
+use webignition\InternetMediaType\Exception\SubtypeParserException;
 use webignition\InternetMediaType\Parser\SubtypeParser;
-use webignition\InternetMediaType\Parser\SubtypeParserException;
 
 class SubtypeParserTest extends TestCase
 {
diff --git a/tests/Parser/TypeParserTest.php b/tests/Parser/TypeParserTest.php
@@ -3,8 +3,8 @@
 namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
+use webignition\InternetMediaType\Exception\TypeParserException;
 use webignition\InternetMediaType\Parser\TypeParser;
-use webignition\InternetMediaType\Parser\TypeParserException;
 
 class TypeParserTest extends TestCase
 {
diff --git a/tests/Parser/ValueParserTest.php b/tests/Parser/ValueParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace webignition\Tests\InternetMediaType\Parameter\Parser;
+namespace webignition\Tests\InternetMediaType\Parser;
 
 use PHPUnit\Framework\TestCase;
-use webignition\InternetMediaType\Parameter\Parser\ValueParser;
+use webignition\InternetMediaType\Parser\ValueParser;
 use webignition\QuotedString\Parser as QuotedStringParser;
 
 class ValueParserTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace webignition\InternetMediaType\Parameter\Parser;`
`4`		`-`
`5`		`-use webignition\InternetMediaType\Parser\ParseException;`
	`3`	`+namespace webignition\InternetMediaType\Exception;`
`6`	`4`
`7`	`5`	`class AttributeParserException extends ParseException`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace webignition\InternetMediaType\Parser;`
	`3`	`+namespace webignition\InternetMediaType\Exception;`
`4`	`4`
`5`	`5`	`class SubtypeParserException extends ParseException`
`6`	`6`	`{`