Move namespace of Gregorian calendar

aeon-php · May 23, 2020 · 820d266 · 820d266
1 parent 527669f
commit 820d266
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/src/Ocelot/Calendar/SolarCalendar.php → src/Ocelot/Calendar/Gregorian/Calendar.php b/src/Ocelot/Calendar/SolarCalendar.php → src/Ocelot/Calendar/Gregorian/Calendar.php
@@ -1,16 +1,11 @@
 <?php
 
-namespace Ocelot\Ocelot\Calendar;
-
-use Ocelot\Ocelot\Calendar\Gregorian\DateTime;
-use Ocelot\Ocelot\Calendar\Gregorian\Day;
-use Ocelot\Ocelot\Calendar\Gregorian\Month;
-use Ocelot\Ocelot\Calendar\Gregorian\Year;
+namespace Ocelot\Ocelot\Calendar\Gregorian;
 
 /**
  * @psalm-immutable
  */
-interface SolarCalendar
+interface Calendar
 {
     public function year() : Year;
 

diff --git a/src/Ocelot/Calendar/GregorianCalendar.php → .../Calendar/Gregorian/GregorianCalendar.php b/src/Ocelot/Calendar/GregorianCalendar.php → .../Calendar/Gregorian/GregorianCalendar.php
@@ -2,18 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Ocelot\Ocelot\Calendar;
-
-use Ocelot\Ocelot\Calendar\Gregorian\DateTime;
-use Ocelot\Ocelot\Calendar\Gregorian\Day;
-use Ocelot\Ocelot\Calendar\Gregorian\Month;
-use Ocelot\Ocelot\Calendar\Gregorian\Time;
-use Ocelot\Ocelot\Calendar\Gregorian\Year;
+namespace Ocelot\Ocelot\Calendar\Gregorian;
 
 /**
  * @psalm-immutable
  */
-final class GregorianCalendar implements SolarCalendar
+final class GregorianCalendar implements Calendar
 {
     public function year(): Year
     {

diff --git a/...Ocelot/Calendar/GregorianCalendarStub.php → ...endar/Gregorian/GregorianCalendarStub.php b/...Ocelot/Calendar/GregorianCalendarStub.php → ...endar/Gregorian/GregorianCalendarStub.php
@@ -2,18 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Ocelot\Ocelot\Calendar;
-
-use Ocelot\Ocelot\Calendar\Gregorian\DateTime;
-use Ocelot\Ocelot\Calendar\Gregorian\Day;
-use Ocelot\Ocelot\Calendar\Gregorian\Month;
-use Ocelot\Ocelot\Calendar\Gregorian\Time;
-use Ocelot\Ocelot\Calendar\Gregorian\Year;
+namespace Ocelot\Ocelot\Calendar\Gregorian;
 
 /**
  * @psalm-immutable
  */
-final class GregorianCalendarStub implements SolarCalendar
+final class GregorianCalendarStub implements Calendar
 {
     private ?\DateTimeImmutable $currentDate;
 

diff --git a/tests/Ocelot/Calendar/Tests/Functional/Gregorian/GregorianCalendarTest.php b/tests/Ocelot/Calendar/Tests/Functional/Gregorian/GregorianCalendarTest.php
@@ -7,7 +7,7 @@
 use Ocelot\Ocelot\Calendar\Gregorian\DateTime;
 use Ocelot\Ocelot\Calendar\Gregorian\TimeInterval;
 use Ocelot\Ocelot\Calendar\Gregorian\TimeUnit;
-use Ocelot\Ocelot\Calendar\GregorianCalendar;
+use Ocelot\Ocelot\Calendar\Gregorian\GregorianCalendar;
 use PHPUnit\Framework\TestCase;
 
 final class GregorianCalendarTest extends TestCase