Merge 31738a5 into a615327

.travis.yml

@@ -1,8 +1,7 @@
 language: php
 
 php:
-  - 7.0
-
+  - 7.2
 env:
   matrix:
     - COMPOSER_FLAGS="--prefer-lowest"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `npm-stats-api` will be documented in this file
 
+## 2.0.0 - 2020-09-10
+
+- Require PHP >= 7.2
+- Require Guzzle >= 7.0
+- Fix yearly range that resulted in a 400 request sometimes
+
 ## 1.0.3 - 2020-09-10
 
 - Add support for Guzzle 7

composer.json

@@ -19,11 +19,11 @@
     }
   ],
   "require": {
-    "php": "^7.0",
-    "guzzlehttp/guzzle": "^6.3|^7.0"
+    "php": "^7.2",
+    "guzzlehttp/guzzle": "^7.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~6.0"
+    "phpunit/phpunit": "^8.0.0"
   },
   "autoload": {
     "psr-4": {

src/NpmStats.php

@@ -93,7 +93,7 @@ private function replaceSpecialPeriodsIfApplicable(&$period)
             $period = "2015-01-01:{$currentDate}";
         } else if ($period === self::LAST_YEAR) {
             $currentDate = (new \DateTime)->format("Y-m-d");
-            $beforeDate = (new \DateTime)->modify("-1 year")->format("Y-m-d");
+            $beforeDate = (new \DateTime)->modify("-365 days")->format("Y-m-d");
             $period = "{$beforeDate}:{$currentDate}";
         }
 

tests/NpmStatsTest.php

@@ -12,7 +12,7 @@ class NpmStatsTest extends TestCase
     /** @var \Developmint\NpmStats\NpmStats */
     protected $npmStats;
 
-    public function setUp()
+    public function setUp() : void
     {
         $client = new Client();
 
@@ -63,7 +63,7 @@ public function testItCanRetrieveYearlyStats()
         $result = $this->npmStats->getStats($packageName, NpmStats::LAST_YEAR);
         $this->assertArrayHasKey('start', $result);
         $this->assertArrayHasKey('end', $result);
-        $this->assertEquals((new \DateTime)->modify("-1 year")->format("Y-m-d"), $result["start"]);
+        $this->assertEquals((new \DateTime)->modify("-365 days")->format("Y-m-d"), $result["start"]);
 
         $this->assertEquals($packageName, $result["package"]);
         $this->assertArrayHasKey('downloads', $result);