Remove the redundant Strategy namespace

hussainweb · Jan 1, 2018 · f72363f · f72363f
1 parent 04504d9
commit f72363f
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 37 deletions.
diff --git a/src/Strategy/AlgorithmInterface.php → src/Algorithm/AlgorithmInterface.php b/src/Strategy/AlgorithmInterface.php → src/Algorithm/AlgorithmInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy;
+namespace Hussainweb\DateConverter\Algorithm;
 
 use Hussainweb\DateConverter\Value\DateInterface;
 

diff --git a/...Strategy/Algorithm/GregorianAlgorithm.php → src/Algorithm/GregorianAlgorithm.php b/...Strategy/Algorithm/GregorianAlgorithm.php → src/Algorithm/GregorianAlgorithm.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy\Algorithm;
+namespace Hussainweb\DateConverter\Algorithm;
 
-use Hussainweb\DateConverter\Strategy\AlgorithmInterface;
+use Hussainweb\DateConverter\Algorithm\AlgorithmInterface;
 use Hussainweb\DateConverter\Value\DateInterface;
 use Hussainweb\DateConverter\Value\GregorianDate;
 

diff --git a/...gy/Algorithm/Hijri/HijriAlgorithmBase.php → src/Algorithm/Hijri/HijriAlgorithmBase.php b/...gy/Algorithm/Hijri/HijriAlgorithmBase.php → src/Algorithm/Hijri/HijriAlgorithmBase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy\Algorithm\Hijri;
+namespace Hussainweb\DateConverter\Algorithm\Hijri;
 
-use Hussainweb\DateConverter\Strategy\AlgorithmInterface;
+use Hussainweb\DateConverter\Algorithm\AlgorithmInterface;
 use Hussainweb\DateConverter\Value\DateInterface;
 use Hussainweb\DateConverter\Value\HijriDate;
 

diff --git a/...orithm/Hijri/HijriFatimidAstronomical.php → ...orithm/Hijri/HijriFatimidAstronomical.php b/...orithm/Hijri/HijriFatimidAstronomical.php → ...orithm/Hijri/HijriFatimidAstronomical.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy\Algorithm\Hijri;
+namespace Hussainweb\DateConverter\Algorithm\Hijri;
 
 class HijriFatimidAstronomical extends HijriAlgorithmBase
 {

diff --git a/src/Strategy/Algorithm/NativeAlgorithm.php → src/Algorithm/NativeAlgorithm.php b/src/Strategy/Algorithm/NativeAlgorithm.php → src/Algorithm/NativeAlgorithm.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy\Algorithm;
+namespace Hussainweb\DateConverter\Algorithm;
 
-use Hussainweb\DateConverter\Strategy\AlgorithmInterface;
+use Hussainweb\DateConverter\Algorithm\AlgorithmInterface;
 use Hussainweb\DateConverter\Value\DateInterface;
 use Hussainweb\DateConverter\Value\NativeDate;
 

diff --git a/...Strategy/Algorithm/ValidDateTimeCheck.php → src/Algorithm/ValidDateTimeCheck.php b/...Strategy/Algorithm/ValidDateTimeCheck.php → src/Algorithm/ValidDateTimeCheck.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hussainweb\DateConverter\Strategy\Algorithm;
+namespace Hussainweb\DateConverter\Algorithm;
 
 trait ValidDateTimeCheck
 {

diff --git a/src/Formatter/DateFormatter.php b/src/Formatter/DateFormatter.php
@@ -2,7 +2,7 @@
 
 namespace Hussainweb\DateConverter\Formatter;
 
-use Hussainweb\DateConverter\Strategy\AlgorithmInterface;
+use Hussainweb\DateConverter\Algorithm\AlgorithmInterface;
 use Hussainweb\DateConverter\Value\DateInterface;
 
 abstract class DateFormatter implements DateFormatterInterface

diff --git a/src/Value/GregorianDate.php b/src/Value/GregorianDate.php
@@ -4,7 +4,7 @@
 
 use Hussainweb\DateConverter\Formatter\GregorianDateFormatter;
 use Hussainweb\DateConverter\InvalidDateException;
-use Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm;
+use Hussainweb\DateConverter\Algorithm\GregorianAlgorithm;
 
 class GregorianDate extends Date
 {

diff --git a/src/Value/HijriDate.php b/src/Value/HijriDate.php
@@ -4,13 +4,13 @@
 
 use Hussainweb\DateConverter\Formatter\HijriDateFormatter;
 use Hussainweb\DateConverter\InvalidDateException;
-use Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriAlgorithmBase;
+use Hussainweb\DateConverter\Algorithm\Hijri\HijriAlgorithmBase;
 
 class HijriDate extends Date
 {
 
     /**
-     * @var \Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriAlgorithmBase
+     * @var \Hussainweb\DateConverter\Algorithm\Hijri\HijriAlgorithmBase
      */
     protected $algorithm;
 

diff --git a/...tegy/Algorithm/GregorianAlgorithmTest.php → tests/Algorithm/GregorianAlgorithmTest.php b/...tegy/Algorithm/GregorianAlgorithmTest.php → tests/Algorithm/GregorianAlgorithmTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Hussainweb\DateConverter\Tests\Strategy\Algorithm;
+namespace Hussainweb\DateConverter\Tests\Algorithm;
 
-use Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm;
+use Hussainweb\DateConverter\Algorithm\GregorianAlgorithm;
 use Hussainweb\DateConverter\Value\GregorianDate;
 
 /**
  * Test for class GregorianAlgorithm
  *
- * @coversDefaultClass \Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm
+ * @coversDefaultClass \Hussainweb\DateConverter\Algorithm\GregorianAlgorithm
  */
 class GregorianAlgorithmTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm
+     * @var \Hussainweb\DateConverter\Algorithm\GregorianAlgorithm
      */
     protected $algorithm;
 
@@ -57,7 +57,7 @@ public function testInvalidToJulianDay($d, $m, $y)
 
     /**
      * @dataProvider gregorianDateProvider
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\ValidDateTimeCheck::isValidDate
+     * @covers \Hussainweb\DateConverter\Algorithm\ValidDateTimeCheck::isValidDate
      */
     public function testIsValidDate($d, $m, $y)
     {
@@ -66,7 +66,7 @@ public function testIsValidDate($d, $m, $y)
 
     /**
      * @dataProvider invalidGregorianDateProvider
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\ValidDateTimeCheck::isValidDate
+     * @covers \Hussainweb\DateConverter\Algorithm\ValidDateTimeCheck::isValidDate
      */
     public function testIsValidDateInvalid($d, $m, $y)
     {
@@ -75,7 +75,7 @@ public function testIsValidDateInvalid($d, $m, $y)
 
     /**
      * @dataProvider gregorianMonthDaysProvider
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm::getMonthDays
+     * @covers \Hussainweb\DateConverter\Algorithm\GregorianAlgorithm::getMonthDays
      */
     public function testGetMonthDays($m, $y, $days)
     {

diff --git a/...hm/Hijri/HijriFatimidAstronomicalTest.php → ...hm/Hijri/HijriFatimidAstronomicalTest.php b/...hm/Hijri/HijriFatimidAstronomicalTest.php → ...hm/Hijri/HijriFatimidAstronomicalTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Hussainweb\DateConverter\Tests\Strategy\Algorithm\Hijri;
+namespace Hussainweb\DateConverter\Tests\Algorithm\Hijri;
 
-use Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriFatimidAstronomical;
+use Hussainweb\DateConverter\Algorithm\Hijri\HijriFatimidAstronomical;
 use Hussainweb\DateConverter\Value\HijriDate;
 
 /**
  * Test for class HijriFatimidAstronomical
  *
- * @coversDefaultClass \Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriFatimidAstronomical
+ * @coversDefaultClass \Hussainweb\DateConverter\Algorithm\Hijri\HijriFatimidAstronomical
  */
 class HijriFatimidAstronomicalTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriFatimidAstronomical
+     * @var \Hussainweb\DateConverter\Algorithm\Hijri\HijriFatimidAstronomical
      */
     protected $algorithm;
 

diff --git a/...trategy/Algorithm/NativeAlgorithmTest.php → tests/Algorithm/NativeAlgorithmTest.php b/...trategy/Algorithm/NativeAlgorithmTest.php → tests/Algorithm/NativeAlgorithmTest.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Hussainweb\DateConverter\Tests\Strategy\Algorithm;
+namespace Hussainweb\DateConverter\Tests\Algorithm;
 
-use Hussainweb\DateConverter\Strategy\Algorithm\NativeAlgorithm;
+use Hussainweb\DateConverter\Algorithm\NativeAlgorithm;
 use Hussainweb\DateConverter\Value\GregorianDate;
 use Hussainweb\DateConverter\Value\NativeDate;
 
 /**
  * Test for class NativeAlgorithm
  *
- * @coversDefaultClass \Hussainweb\DateConverter\Strategy\Algorithm\NativeAlgorithm
+ * @coversDefaultClass \Hussainweb\DateConverter\Algorithm\NativeAlgorithm
  */
 class NativeAlgorithmTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \Hussainweb\DateConverter\Strategy\Algorithm\NativeAlgorithm
+     * @var \Hussainweb\DateConverter\Algorithm\NativeAlgorithm
      */
     protected $algorithm;
 
@@ -59,7 +59,7 @@ public function testOtherToJulianDay($ts, $d, $m, $y, $jd)
 
     /**
      * @dataProvider nativeDateProvider
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\ValidDateTimeCheck::isValidDate
+     * @covers \Hussainweb\DateConverter\Algorithm\ValidDateTimeCheck::isValidDate
      */
     public function testIsValidDate($ts, $d, $m, $y)
     {
@@ -68,15 +68,15 @@ public function testIsValidDate($ts, $d, $m, $y)
 
     /**
      * @dataProvider invalidNativeDateProvider
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\ValidDateTimeCheck::isValidDate
+     * @covers \Hussainweb\DateConverter\Algorithm\ValidDateTimeCheck::isValidDate
      */
     public function testIsValidDateInvalid($d, $m, $y)
     {
         $this->assertFalse($this->algorithm->isValidDate($d, $m, $y));
     }
 
     /**
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\NativeAlgorithm::getMonthDays
+     * @covers \Hussainweb\DateConverter\Algorithm\NativeAlgorithm::getMonthDays
      * @expectedException \InvalidArgumentException
      */
     public function testExceptionOnGetMonthDays()

diff --git a/tests/Formatter/DateFormatterTest.php b/tests/Formatter/DateFormatterTest.php
@@ -3,7 +3,7 @@
 namespace Hussainweb\DateConverter\Tests\Formatter;
 
 use Hussainweb\DateConverter\Formatter\DateFormatter;
-use Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm;
+use Hussainweb\DateConverter\Algorithm\GregorianAlgorithm;
 use Hussainweb\DateConverter\Value\GregorianDate;
 
 /**

diff --git a/tests/Formatter/GregorianDateFormatterTest.php b/tests/Formatter/GregorianDateFormatterTest.php
@@ -3,7 +3,7 @@
 namespace Hussainweb\DateConverter\Tests\Formatter;
 
 use Hussainweb\DateConverter\Formatter\GregorianDateFormatter;
-use Hussainweb\DateConverter\Strategy\Algorithm\GregorianAlgorithm;
+use Hussainweb\DateConverter\Algorithm\GregorianAlgorithm;
 use Hussainweb\DateConverter\Value\GregorianDate;
 
 /**

diff --git a/tests/Formatter/HijriDateFormatterTest.php b/tests/Formatter/HijriDateFormatterTest.php
@@ -8,7 +8,7 @@
 
 namespace Hussainweb\DateConverter\Tests\Formatter;
 
-use Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriFatimidAstronomical;
+use Hussainweb\DateConverter\Algorithm\Hijri\HijriFatimidAstronomical;
 use Hussainweb\DateConverter\Value\HijriDate;
 
 /**

diff --git a/tests/Value/HijriDateTest.php b/tests/Value/HijriDateTest.php
@@ -3,7 +3,7 @@
 namespace Hussainweb\DateConverter\Tests\Value;
 
 use Hussainweb\DateConverter\Formatter\HijriDateFormatter;
-use Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriAlgorithmBase;
+use Hussainweb\DateConverter\Algorithm\Hijri\HijriAlgorithmBase;
 use Hussainweb\DateConverter\Value\HijriDate;
 
 /**
@@ -15,7 +15,7 @@ class HijriDateTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriAlgorithmBase
+     * @var \Hussainweb\DateConverter\Algorithm\Hijri\HijriAlgorithmBase
      */
     protected $algorithm;
 
@@ -42,7 +42,7 @@ public function testHijriDates($d, $m, $y)
     /**
      * @dataProvider invalidHijriDateProvider
      * @covers ::__construct
-     * @covers \Hussainweb\DateConverter\Strategy\Algorithm\Hijri\HijriAlgorithmBase::isValidDate
+     * @covers \Hussainweb\DateConverter\Algorithm\Hijri\HijriAlgorithmBase::isValidDate
      * @expectedException \Hussainweb\DateConverter\InvalidDateException
      */
     public function testInvalidHijriDates($d, $m, $y)