Clean up namespaces

ProfessionalWiki · Feb 16, 2021 · 04fef9a · 04fef9a
1 parent ad98c2f
commit 04fef9a
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 79 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -12,9 +12,8 @@
         <directory name="tests/Unit/Humanize" />
 
         <ignoreFiles>
-            <file name="src/PackagePrivate/Parser.php" />
-            <file name="src/PackagePrivate/RegexMatchesMapper.php" />
             <directory name="src/PackagePrivate/Carbon" />
+            <directory name="src/PackagePrivate/Parser" />
 
             <directory name="vendor" />
 

diff --git a/src/ExtDate.php b/src/ExtDate.php
@@ -4,11 +4,11 @@
 
 namespace EDTF;
 
-use EDTF\PackagePrivate\CoversTrait;
 use EDTF\Exceptions\ExtDateException;
 use EDTF\PackagePrivate\Carbon\CarbonFactory;
 use EDTF\PackagePrivate\Carbon\DatetimeFactoryException;
 use EDTF\PackagePrivate\Carbon\DatetimeFactoryInterface;
+use EDTF\PackagePrivate\CoversTrait;
 
 class ExtDate implements EdtfValue
 {

diff --git a/src/PackagePrivate/Carbon/CarbonFactory.php b/src/PackagePrivate/Carbon/CarbonFactory.php
@@ -6,8 +6,6 @@
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
-use EDTF\PackagePrivate\Carbon\DatetimeFactoryException;
-use EDTF\PackagePrivate\Carbon\DatetimeFactoryInterface;
 
 /**
  * This factory allows us to avoid calling Carbon static methods (i.e. Carbon::create(...)) from code.

diff --git a/src/PackagePrivate/Carbon/DatetimeFactoryInterface.php b/src/PackagePrivate/Carbon/DatetimeFactoryInterface.php
@@ -4,8 +4,6 @@
 
 namespace EDTF\PackagePrivate\Carbon;
 
-use EDTF\PackagePrivate\Carbon\DatetimeFactoryException;
-
 /**
  * FIXME: return type missing
  * TODO: what value does this interface bring?

diff --git a/src/PackagePrivate/ParserState/Date.php → src/PackagePrivate/Parser/Date.php b/src/PackagePrivate/ParserState/Date.php → src/PackagePrivate/Parser/Date.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace EDTF\PackagePrivate\ParserState;
+namespace EDTF\PackagePrivate\Parser;
 
 use Carbon\Carbon;
-use \InvalidArgumentException;
+use InvalidArgumentException;
 
 class Date
 {

diff --git a/...PackagePrivate/ParserState/ParsedData.php → src/PackagePrivate/Parser/ParsedData.php b/...PackagePrivate/ParserState/ParsedData.php → src/PackagePrivate/Parser/ParsedData.php
@@ -1,11 +1,6 @@
 <?php
 
-namespace EDTF\PackagePrivate\ParserState;
-
-use EDTF\PackagePrivate\ParserState\Date;
-use EDTF\PackagePrivate\ParserState\Qualification;
-use EDTF\PackagePrivate\ParserState\Time;
-use EDTF\PackagePrivate\ParserState\Timezone;
+namespace EDTF\PackagePrivate\Parser;
 
 class ParsedData
 {

diff --git a/src/PackagePrivate/Parser.php → src/PackagePrivate/Parser/Parser.php b/src/PackagePrivate/Parser.php → src/PackagePrivate/Parser/Parser.php
@@ -2,14 +2,13 @@
 
 declare(strict_types = 1);
 
-namespace EDTF\PackagePrivate;
+namespace EDTF\PackagePrivate\Parser;
 
 use EDTF\EdtfValue;
 use EDTF\ExtDate;
 use EDTF\ExtDateTime;
 use EDTF\Interval;
 use EDTF\IntervalSide;
-use EDTF\PackagePrivate\ParserState\ParsedData;
 use EDTF\Qualification;
 use EDTF\Season;
 use EDTF\Set;
@@ -36,7 +35,7 @@ class Parser
     public function __construct()
     {
     	// TODO: avoid file read every time an instance is created
-        $patterns = file_get_contents(__DIR__.'/../../config/regex.txt');
+        $patterns = file_get_contents(__DIR__.'/../../../config/regex.txt');
         $this->regexPattern = '/'.$patterns.'/';
 
         $this->mapper = new RegexMatchesMapper();

diff --git a/src/PackagePrivate/ParserValidator.php → ...PackagePrivate/Parser/ParserValidator.php b/src/PackagePrivate/ParserValidator.php → ...PackagePrivate/Parser/ParserValidator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace EDTF\PackagePrivate;
+namespace EDTF\PackagePrivate\Parser;
 
 /**
  * @internal

diff --git a/...kagePrivate/ParserState/Qualification.php → src/PackagePrivate/Parser/Qualification.php b/...kagePrivate/ParserState/Qualification.php → src/PackagePrivate/Parser/Qualification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EDTF\PackagePrivate\ParserState;
+namespace EDTF\PackagePrivate\Parser;
 
 class Qualification
 {

diff --git a/src/PackagePrivate/RegexMatchesMapper.php → ...kagePrivate/Parser/RegexMatchesMapper.php b/src/PackagePrivate/RegexMatchesMapper.php → ...kagePrivate/Parser/RegexMatchesMapper.php
@@ -1,12 +1,6 @@
 <?php
 
-namespace EDTF\PackagePrivate;
-
-use EDTF\PackagePrivate\ParserState\Qualification;
-use EDTF\PackagePrivate\ParserState\Time;
-use EDTF\PackagePrivate\ParserState\Timezone;
-use EDTF\PackagePrivate\ParserState\ParsedData;
-use EDTF\PackagePrivate\ParserState\Date;
+namespace EDTF\PackagePrivate\Parser;
 
 class RegexMatchesMapper
 {

diff --git a/src/PackagePrivate/ParserState/Time.php → src/PackagePrivate/Parser/Time.php b/src/PackagePrivate/ParserState/Time.php → src/PackagePrivate/Parser/Time.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EDTF\PackagePrivate\ParserState;
+namespace EDTF\PackagePrivate\Parser;
 
 class Time
 {

diff --git a/src/PackagePrivate/ParserState/Timezone.php → src/PackagePrivate/Parser/Timezone.php b/src/PackagePrivate/ParserState/Timezone.php → src/PackagePrivate/Parser/Timezone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EDTF\PackagePrivate\ParserState;
+namespace EDTF\PackagePrivate\Parser;
 
 class Timezone
 {

diff --git a/src/PackagePrivate/SaneParser.php b/src/PackagePrivate/SaneParser.php
@@ -5,6 +5,7 @@
 namespace EDTF\PackagePrivate;
 
 use EDTF\EdtfParser;
+use EDTF\PackagePrivate\Parser\Parser;
 use EDTF\ParsingResult;
 
 class SaneParser implements EdtfParser {

diff --git a/src/Season.php b/src/Season.php
@@ -5,7 +5,7 @@
 namespace EDTF;
 
 use EDTF\PackagePrivate\CoversTrait;
-use EDTF\PackagePrivate\Parser;
+use EDTF\PackagePrivate\Parser\Parser;
 
 class Season implements EdtfValue
 {

diff --git a/tests/Functional/EdtfParserTest.php b/tests/Functional/EdtfParserTest.php
@@ -4,16 +4,16 @@
 
 namespace EDTF\Tests\Functional;
 
-use EDTF\PackagePrivate\SaneParser;
 use EDTF\ExampleData\ValidEdtfStrings;
+use EDTF\PackagePrivate\SaneParser;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @covers \EDTF\PackagePrivate\SaneParser
  * @covers \EDTF\ParsingResult
  * @covers \EDTF\ExampleData\ValidEdtfStrings
- * @covers \EDTF\PackagePrivate\Parser
- * @covers \EDTF\PackagePrivate\ParserValidator
+ * @covers \EDTF\PackagePrivate\Parser\Parser
+ * @covers \EDTF\PackagePrivate\Parser\ParserValidator
  */
 class EdtfParserTest extends TestCase {
 

diff --git a/tests/Functional/EdtfTest.php b/tests/Functional/EdtfTest.php
@@ -5,11 +5,11 @@
 namespace EDTF\Tests\Functional;
 
 use EDTF\EdtfValue;
-use EDTF\PackagePrivate\Parser;
+use EDTF\PackagePrivate\Parser\Parser;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Functional
  */
 class EdtfTest extends TestCase

diff --git a/tests/Functional/EdtfValidatorTest.php b/tests/Functional/EdtfValidatorTest.php
@@ -4,15 +4,15 @@
 
 namespace EDTF\Tests\Functional;
 
-use EDTF\PackagePrivate\Validator;
 use EDTF\ExampleData\ValidEdtfStrings;
+use EDTF\PackagePrivate\Validator;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @covers \EDTF\PackagePrivate\Validator
  * @covers \EDTF\ExampleData\ValidEdtfStrings
- * @covers \EDTF\PackagePrivate\Parser
- * @covers \EDTF\PackagePrivate\ParserValidator
+ * @covers \EDTF\PackagePrivate\Parser\Parser
+ * @covers \EDTF\PackagePrivate\Parser\ParserValidator
  */
 class EdtfValidatorTest extends TestCase {
 

diff --git a/tests/Functional/Level0/DateTest.php b/tests/Functional/Level0/DateTest.php
@@ -10,7 +10,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\ExtDate
  * @package EDTF\Tests\Unit
  */

diff --git a/tests/Functional/Level0/DateTimeTest.php b/tests/Functional/Level0/DateTimeTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\ExtDateTime
  * @package EDTF\Tests\Unit
  */

diff --git a/tests/Functional/Level0/IntervalTest.php b/tests/Functional/Level0/IntervalTest.php
@@ -11,7 +11,7 @@
 
 /**
  * @covers \EDTF\Interval
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Unit
  */
 class IntervalTest extends TestCase

diff --git a/tests/Functional/Level1/ExtendedIntervalTest.php b/tests/Functional/Level1/ExtendedIntervalTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\Interval
  * @package EDTF\Tests\Unit
  */

diff --git a/tests/Functional/Level1/PrefixedYearTest.php b/tests/Functional/Level1/PrefixedYearTest.php
@@ -9,7 +9,7 @@
 
 /**
  * @covers \EDTF\ExtDateTime
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Unit
  */
 class PrefixedYearTest extends TestCase

diff --git a/tests/Functional/Level1/QualificationTest.php b/tests/Functional/Level1/QualificationTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\Interval
  * @covers \EDTF\ExtDateTime
  *

diff --git a/tests/Functional/Level1/SeasonTest.php b/tests/Functional/Level1/SeasonTest.php
@@ -9,7 +9,7 @@
 
 /**
  * @covers \EDTF\Season
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  */
 class SeasonTest extends TestCase
 {

diff --git a/tests/Functional/Level2/ExponentialYearTest.php b/tests/Functional/Level2/ExponentialYearTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Functional
  */
 class ExponentialYearTest extends TestCase

diff --git a/tests/Functional/Level2/IntervalTest.php b/tests/Functional/Level2/IntervalTest.php
@@ -10,7 +10,7 @@
 
 /**
  * @covers \EDTF\Interval
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Functional
  */
 class IntervalTest extends TestCase

diff --git a/tests/Functional/Level2/QualificationTest.php b/tests/Functional/Level2/QualificationTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\ExtDate
  * @package EDTF\Tests\Functional
  */

diff --git a/tests/Functional/Level2/SetRepresentationTest.php b/tests/Functional/Level2/SetRepresentationTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\Set
  * @package EDTF\Tests\Functional
  */

diff --git a/tests/Functional/Level2/SignificantDigitsTest.php b/tests/Functional/Level2/SignificantDigitsTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Functional
  */
 class SignificantDigitsTest extends TestCase

diff --git a/tests/Functional/Level2/UnspecifiedDigitTest.php b/tests/Functional/Level2/UnspecifiedDigitTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\ExtDate
  * @package EDTF\Tests\Functional
  */

diff --git a/tests/Functional/StringHumanizerTest.php b/tests/Functional/StringHumanizerTest.php
@@ -5,16 +5,13 @@
 namespace EDTF\Tests\Functional;
 
 use EDTF\EdtfFactory;
-use EDTF\PackagePrivate\SaneParser;
-use EDTF\EdtfValue;
-use EDTF\Humanizer;
 use EDTF\PackagePrivate\Humanize\HumanizerFactory;
 use EDTF\PackagePrivate\Humanize\PrivateStringHumanizer;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @covers \EDTF\PackagePrivate\EnglishHumanizer
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @covers \EDTF\Interval
  * @covers \EDTF\IntervalSide
  */

diff --git a/tests/Unit/Contracts/CoversTraitTest.php → tests/Unit/CoversTraitTest.php b/tests/Unit/Contracts/CoversTraitTest.php → tests/Unit/CoversTraitTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EDTF\Tests\Unit\Contracts;
+namespace EDTF\Tests\Unit;
 
 use EDTF\ExtDate;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Unit/ExtDateTest.php b/tests/Unit/ExtDateTest.php
@@ -5,10 +5,10 @@
 use Carbon\Carbon;
 use EDTF\Exceptions\ExtDateException;
 use EDTF\ExtDate;
-use EDTF\Qualification;
-use EDTF\UnspecifiedDigit;
 use EDTF\PackagePrivate\Carbon\CarbonFactory;
 use EDTF\PackagePrivate\Carbon\DatetimeFactoryException;
+use EDTF\Qualification;
+use EDTF\UnspecifiedDigit;
 use PHPUnit\Framework\TestCase;
 
 /**

diff --git a/tests/Unit/FactoryTrait.php b/tests/Unit/FactoryTrait.php
@@ -10,7 +10,7 @@
 use EDTF\ExtDate;
 use EDTF\ExtDateTime;
 use EDTF\Interval;
-use EDTF\PackagePrivate\Parser;
+use EDTF\PackagePrivate\Parser\Parser;
 use EDTF\Season;
 use EDTF\Set;
 

diff --git a/tests/Unit/PackagePrivate/ParserTest.php → ...Unit/PackagePrivate/Parser/ParserTest.php b/tests/Unit/PackagePrivate/ParserTest.php → ...Unit/PackagePrivate/Parser/ParserTest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace EDTF\Tests\Unit\PackagePrivate;
+namespace EDTF\Tests\Unit\PackagePrivate\Parser;
 
 use EDTF\ExtDate;
 use EDTF\Interval;
-use EDTF\PackagePrivate\Parser;
+use EDTF\PackagePrivate\Parser\Parser;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \EDTF\PackagePrivate\Parser
+ * @covers \EDTF\PackagePrivate\Parser\Parser
  * @package EDTF\Tests\Unit
  */
 class ParserTest extends TestCase