Merge pull request #70 from norzechowicz/cleanup

Cleanup

Author: Norbert Orzechowicz

.travis.yml

@@ -16,8 +16,6 @@ matrix:
     - php: 5.6
     - php: 7.0
     - php: hhvm
-  allow_failures:
-    - env: DEPENDENCIES='low'
 
 before_install:
   - composer self-update

composer.json

@@ -15,10 +15,10 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "symfony/intl": "~2.3",
-        "symfony/config": "~2.3",
-        "symfony/translation": "~2.3",
-        "symfony/yaml": "~2.3",
+        "symfony/intl": "^2.3|^3.0",
+        "symfony/config": "^2.3|^3.0",
+        "symfony/translation": "^2.3|^3.0",
+        "symfony/yaml": "^2.3|^3.0",
         "thunderer/shortcode": "~0.5"
     },
     "require-dev": {

spec/Coduo/PHPHumanizer/DateTime/FormatterSpec.php

@@ -30,19 +30,23 @@ function let(Translator $translator)
         )->willReturn('10 minut temu');
     }
 
-    function it_format_datetime_diff(Difference $diff)
+    function it_format_datetime_diff()
     {
-        $diff->getUnit()->willReturn(new Minute());
-        $diff->getQuantity()->willReturn(10);
-        $diff->isPast()->willReturn(true);
+        $diff = new Difference(
+            new \DateTime("2015-01-01 00:10:00"),
+            new \DateTime("2015-01-01 00:00:00")
+        );
+        
         $this->formatDifference($diff)->shouldReturn('10 minutes ago');
     }
 
-    function it_format_datetime_diff_for_specific_locale(Difference $diff)
+    function it_format_datetime_diff_for_specific_locale()
     {
-        $diff->getUnit()->willReturn(new Minute());
-        $diff->getQuantity()->willReturn(10);
-        $diff->isPast()->willReturn(true);
+        $diff = new Difference(
+            new \DateTime("2015-01-01 00:10:00"),
+            new \DateTime("2015-01-01 00:00:00")
+        );
+        
         $this->formatDifference($diff, 'pl')->shouldReturn('10 minut temu');
     }
 }

spec/Coduo/PHPHumanizer/DateTime/PreciseFormatterSpec.php

@@ -62,29 +62,23 @@ function let(Translator $translator)
         )->willReturn('через 10 дней, 5 часов');
     }
 
-    function it_format_compound_datetime_diff(PreciseDifference $diff, CompoundResult $dayResult,
-        CompoundResult $hourResult)
+    function it_format_compound_datetime_diff()
     {
-        $dayResult->getUnit()->willReturn(new Day());
-        $dayResult->getQuantity()->willReturn(10);
-        $hourResult->getUnit()->willReturn(new Hour());
-        $hourResult->getQuantity()->willReturn(5);
+        $diff = new PreciseDifference(
+            new \DateTime("2015-01-01 00:00:00"),
+            new \DateTime("2015-01-11 05:00:00")   
+        );
 
-        $diff->getCompoundResults()->willReturn(array($dayResult, $hourResult));
-        $diff->isPast()->willReturn(false);
         $this->formatDifference($diff)->shouldReturn('10 days, 5 hours from now');
     }
 
-    function it_format_compound_datetime_diff_for_specific_locale(PreciseDifference $diff,
-        CompoundResult $dayResult, CompoundResult $hourResult)
+    function it_format_compound_datetime_diff_for_specific_locale()
     {
-        $dayResult->getUnit()->willReturn(new Day());
-        $dayResult->getQuantity()->willReturn(10);
-        $hourResult->getUnit()->willReturn(new Hour());
-        $hourResult->getQuantity()->willReturn(5);
-
-        $diff->getCompoundResults()->willReturn(array($dayResult, $hourResult));
-        $diff->isPast()->willReturn(false);
+        $diff = new PreciseDifference(
+            new \DateTime("2015-01-01 00:00:00"),
+            new \DateTime("2015-01-11 05:00:00")
+        );
+        
         $this->formatDifference($diff, 'ru')->shouldReturn('через 10 дней, 5 часов');
     }
 }

src/Coduo/PHPHumanizer/Collection/Formatter.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Translation\TranslatorInterface;
 
-class Formatter
+final class Formatter
 {
     /**
      * @var \Symfony\Component\Translation\TranslatorInterface

src/Coduo/PHPHumanizer/Collection/Oxford.php

@@ -2,18 +2,29 @@
 
 namespace Coduo\PHPHumanizer\Collection;
 
-class Oxford
+final class Oxford
 {
     /**
      * @var Formatter
      */
     private $formatter;
 
+    /**
+     * Oxford constructor.
+     *
+     * @param Formatter $formatter
+     */
     public function __construct(Formatter $formatter)
     {
         $this->formatter = $formatter;
     }
 
+    /**
+     * @param $collection
+     * @param null $limit
+     *
+     * @return string
+     */
     public function format($collection, $limit = null)
     {
         return $this->formatter->format($collection, $limit);

src/Coduo/PHPHumanizer/CollectionHumanizer.php

@@ -6,8 +6,14 @@
 use Coduo\PHPHumanizer\Collection\Oxford;
 use Coduo\PHPHumanizer\Translator\Builder;
 
-class CollectionHumanizer
+final class CollectionHumanizer
 {
+    /**
+     * @param $collection
+     * @param null $limit
+     * @param string $locale
+     * @return string
+     */
     public static function oxford($collection, $limit = null, $locale = 'en')
     {
         $oxford = new Oxford(

src/Coduo/PHPHumanizer/DateTime/Difference.php

@@ -11,7 +11,7 @@
 use Coduo\PHPHumanizer\DateTime\Unit\Week;
 use Coduo\PHPHumanizer\DateTime\Unit\Year;
 
-class Difference
+final class Difference
 {
     /**
      * @var \DateTime

src/Coduo/PHPHumanizer/DateTime/Difference/CompoundResult.php

@@ -4,7 +4,7 @@
 
 use Coduo\PHPHumanizer\DateTime\Unit;
 
-class CompoundResult
+final class CompoundResult
 {
     /**
      * @var \Coduo\PHPHumanizer\DateTime\Unit

src/Coduo/PHPHumanizer/DateTime/Formatter.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Translation\TranslatorInterface;
 
-class Formatter
+final class Formatter
 {
     /**
      * @var \Symfony\Component\Translation\TranslatorInterface