Move prepared parsers out of \Prepared\Parser namespace

t-regx · Jun 18, 2021 · 9d42280 · 9d42280
1 parent 43aa2ee
commit 9d42280
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 26 deletions.
diff --git a/src/CleanRegex/Builder/PatternBuilder.php b/src/CleanRegex/Builder/PatternBuilder.php
@@ -2,9 +2,9 @@
 namespace TRegx\CleanRegex\Builder;
 
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\StandardStrategy;
-use TRegx\CleanRegex\Internal\Prepared\Parser\InjectParser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\MaskParser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\PreparedParser;
+use TRegx\CleanRegex\Internal\Prepared\InjectParser;
+use TRegx\CleanRegex\Internal\Prepared\MaskParser;
+use TRegx\CleanRegex\Internal\Prepared\PreparedParser;
 use TRegx\CleanRegex\Internal\Prepared\PrepareFacade;
 use TRegx\CleanRegex\Internal\Prepared\Template\NoTemplate;
 use TRegx\CleanRegex\Pattern;

diff --git a/src/CleanRegex/Builder/PcrePatternBuilder.php b/src/CleanRegex/Builder/PcrePatternBuilder.php
@@ -2,8 +2,8 @@
 namespace TRegx\CleanRegex\Builder;
 
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\PcreStrategy;
-use TRegx\CleanRegex\Internal\Prepared\Parser\InjectParser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\PreparedParser;
+use TRegx\CleanRegex\Internal\Prepared\InjectParser;
+use TRegx\CleanRegex\Internal\Prepared\PreparedParser;
 use TRegx\CleanRegex\Internal\Prepared\PrepareFacade;
 use TRegx\CleanRegex\Internal\Prepared\Template\NoTemplate;
 use TRegx\CleanRegex\Pattern;

diff --git a/src/CleanRegex/Builder/TemplateBuilder.php b/src/CleanRegex/Builder/TemplateBuilder.php
@@ -3,11 +3,11 @@
 
 use TRegx\CleanRegex\Exception\TemplateFormatException;
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\DelimiterStrategy;
-use TRegx\CleanRegex\Internal\Prepared\Parser\TemplateParser;
 use TRegx\CleanRegex\Internal\Prepared\PrepareFacade;
 use TRegx\CleanRegex\Internal\Prepared\Template\LiteralToken;
 use TRegx\CleanRegex\Internal\Prepared\Template\MaskToken;
 use TRegx\CleanRegex\Internal\Prepared\Template\Token;
+use TRegx\CleanRegex\Internal\Prepared\TemplateParser;
 use TRegx\CleanRegex\Pattern;
 
 class TemplateBuilder

diff --git a/src/CleanRegex/Internal/Delimiter/Strategy/ParserQuotableAdapter.php b/src/CleanRegex/Internal/Delimiter/Strategy/ParserQuotableAdapter.php
@@ -1,7 +1,7 @@
 <?php
 namespace TRegx\CleanRegex\Internal\Delimiter\Strategy;
 
-use TRegx\CleanRegex\Internal\Prepared\Parser\Parser;
+use TRegx\CleanRegex\Internal\Prepared\Parser;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\AlterationFactory;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Quotable;
 

diff --git a/...Internal/Prepared/Parser/InjectParser.php → ...nRegex/Internal/Prepared/InjectParser.php b/...Internal/Prepared/Parser/InjectParser.php → ...nRegex/Internal/Prepared/InjectParser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace TRegx\CleanRegex\Internal\Prepared;
 
 use InvalidArgumentException;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\QuotableFactory;

diff --git a/...x/Internal/Prepared/Parser/MaskParser.php → ...eanRegex/Internal/Prepared/MaskParser.php b/...x/Internal/Prepared/Parser/MaskParser.php → ...eanRegex/Internal/Prepared/MaskParser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace TRegx\CleanRegex\Internal\Prepared;
 
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\QuotableFactory;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Quotable;

diff --git a/...Regex/Internal/Prepared/Parser/Parser.php → src/CleanRegex/Internal/Prepared/Parser.php b/...Regex/Internal/Prepared/Parser/Parser.php → src/CleanRegex/Internal/Prepared/Parser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace TRegx\CleanRegex\Internal\Prepared;
 
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\QuotableFactory;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Quotable;

diff --git a/src/CleanRegex/Internal/Prepared/PrepareFacade.php b/src/CleanRegex/Internal/Prepared/PrepareFacade.php
@@ -5,7 +5,6 @@
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\DelimiterStrategy;
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\ParserQuotableAdapter;
 use TRegx\CleanRegex\Internal\Delimiter\TrailingBackslashException;
-use TRegx\CleanRegex\Internal\Prepared\Parser\Parser;
 use TRegx\CleanRegex\Pattern;
 
 class PrepareFacade

diff --git a/...ternal/Prepared/Parser/PreparedParser.php → ...egex/Internal/Prepared/PreparedParser.php b/...ternal/Prepared/Parser/PreparedParser.php → ...egex/Internal/Prepared/PreparedParser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace TRegx\CleanRegex\Internal\Prepared;
 
 use InvalidArgumentException;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\CompositeQuotable;

diff --git a/...ternal/Prepared/Parser/TemplateParser.php → ...egex/Internal/Prepared/TemplateParser.php b/...ternal/Prepared/Parser/TemplateParser.php → ...egex/Internal/Prepared/TemplateParser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace TRegx\CleanRegex\Internal\Prepared;
 
 use TRegx\CleanRegex\Exception\InternalCleanRegexException;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\QuotableFactory;

diff --git a/...ternal/Prepared/Parser/MaskParserTest.php → ...egex/Internal/Prepared/MaskParserTest.php b/...ternal/Prepared/Parser/MaskParserTest.php → ...egex/Internal/Prepared/MaskParserTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace Test\Interaction\TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace Test\Interaction\TRegx\CleanRegex\Internal\Prepared;
 
 use PHPUnit\Framework\TestCase;
 use Test\Utils\Impl\ConstantDelimiter;
 use Test\Utils\Impl\NoAlternation;
 use TRegx\CleanRegex\Exception\MaskMalformedPatternException;
-use TRegx\CleanRegex\Internal\Prepared\Parser\MaskParser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\Parser;
+use TRegx\CleanRegex\Internal\Prepared\MaskParser;
+use TRegx\CleanRegex\Internal\Prepared\Parser;
 use TRegx\CleanRegex\Internal\Prepared\PrepareFacade;
 
 class MaskParserTest extends TestCase

diff --git a/test/Interaction/CleanRegex/Internal/Prepared/PrepareFacadeTest.php b/test/Interaction/CleanRegex/Internal/Prepared/PrepareFacadeTest.php
@@ -8,9 +8,9 @@
 use Test\Utils\Impl\ConstantDelimiter;
 use Test\Utils\Impl\MappingAlternation;
 use TRegx\CleanRegex\Internal\Delimiter\Strategy\StandardStrategy;
-use TRegx\CleanRegex\Internal\Prepared\Parser\InjectParser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\Parser;
-use TRegx\CleanRegex\Internal\Prepared\Parser\PreparedParser;
+use TRegx\CleanRegex\Internal\Prepared\InjectParser;
+use TRegx\CleanRegex\Internal\Prepared\Parser;
+use TRegx\CleanRegex\Internal\Prepared\PreparedParser;
 use TRegx\CleanRegex\Internal\Prepared\PrepareFacade;
 use TRegx\CleanRegex\Internal\Prepared\Template\NoTemplate;
 

diff --git a/...rnal/Prepared/Parser/InjectParserTest.php → ...ex/Internal/Prepared/InjectParserTest.php b/...rnal/Prepared/Parser/InjectParserTest.php → ...ex/Internal/Prepared/InjectParserTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared;
 
 use PHPUnit\Framework\TestCase;
 use Test\Utils\Impl\Identity;
 use TRegx\CleanRegex\Internal\Delimiter\TrailingBackslashException;
-use TRegx\CleanRegex\Internal\Prepared\Parser\InjectParser;
+use TRegx\CleanRegex\Internal\Prepared\InjectParser;
 use TRegx\CleanRegex\Internal\Prepared\Template\NoTemplate;
 
 class InjectParserTest extends TestCase

diff --git a/...al/Prepared/Parser/PreparedParserTest.php → .../Internal/Prepared/PreparedParserTest.php b/...al/Prepared/Parser/PreparedParserTest.php → .../Internal/Prepared/PreparedParserTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared;
 
 use PHPUnit\Framework\TestCase;
 use Test\Utils\Impl\Identity;
 use TRegx\CleanRegex\Internal\Delimiter\TrailingBackslashException;
-use TRegx\CleanRegex\Internal\Prepared\Parser\PreparedParser;
+use TRegx\CleanRegex\Internal\Prepared\PreparedParser;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\AlterationFactory;
 
 class PreparedParserTest extends TestCase

diff --git a/...al/Prepared/Parser/TemplateParserTest.php → .../Internal/Prepared/TemplateParserTest.php b/...al/Prepared/Parser/TemplateParserTest.php → .../Internal/Prepared/TemplateParserTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared\Parser;
+namespace Test\Unit\TRegx\CleanRegex\Internal\Prepared;
 
 use PHPUnit\Framework\TestCase;
 use Test\Utils\Impl\RawToken;
 use Test\Utils\Impl\ThrowToken;
 use TRegx\CleanRegex\Internal\Delimiter\TrailingBackslashException;
-use TRegx\CleanRegex\Internal\Prepared\Parser\TemplateParser;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\AlterationFactory;
+use TRegx\CleanRegex\Internal\Prepared\TemplateParser;
 
 class TemplateParserTest extends TestCase
 {

diff --git a/test/Utils/Impl/IdentityParser.php b/test/Utils/Impl/IdentityParser.php
@@ -2,7 +2,7 @@
 namespace Test\Utils\Impl;
 
 use PHPUnit\Framework\Assert;
-use TRegx\CleanRegex\Internal\Prepared\Parser\Parser;
+use TRegx\CleanRegex\Internal\Prepared\Parser;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Factory\QuotableFactory;
 use TRegx\CleanRegex\Internal\Prepared\Quotable\Quotable;