Updated PHPUnit, do not set stops by default, fixes issue #5

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All Notable changes to `skyscanner-php` will be documented in this file
 
+## 2017-12-14
+- Updated PHPUnit
+
 ## 2017-05-26
 - Major refactoring, not renaming the original object properties returned by the API itself
 - Renamed Flights\LivePrices method name `parseFlights` to `getFlights`

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ozdemirburak/skyscanner-php",
     "description": "Unofficial PHP SDK for Skyscanner's API",
-    "keywords": ["skyscanner", "flight", "travel", "trip"],
+    "keywords": ["skyscanner", "skyscanner-api", "flight", "travel", "trip"],
     "homepage": "https://github.com/ozdemirburak/skyscanner-php",
     "license": "MIT",
     "authors": [
@@ -16,8 +16,8 @@
         "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "~4.0|~5.0",
-        "symfony/var-dumper": "~2.8|~3.0"
+        "phpunit/phpunit" : "~5.0|~6.0",
+        "symfony/var-dumper": "~2.8|~3.2"
     },
     "autoload": {
         "psr-4": { "OzdemirBurak\\SkyScanner\\": "src" },

src/Traits/ReferralTrait.php

@@ -21,7 +21,7 @@ trait ReferralTrait
      *
      * @return string
      */
-    public function getReferralLinkByParameters($country, $currency, $locale, $originPlace, $destinationPlace, $outboundPartialDate, $inboundPartialDate, $apiKey)
+    public function getReferralLinkByParameters($country, $currency, $locale, $originPlace, $destinationPlace, $outboundPartialDate, $inboundPartialDate = null, $apiKey = null)
     {
         return $this->referralUrl . implode('/', array_filter([
             $country, $currency, $locale, $originPlace, $destinationPlace, $outboundPartialDate, $inboundPartialDate
@@ -34,7 +34,7 @@ public function getReferralLinkByParameters($country, $currency, $locale, $origi
      *
      * @return string
      */
-    public function getReferralLinkByArrayOfParameters($data, $apiKey)
+    public function getReferralLinkByArrayOfParameters($data, $apiKey = null)
     {
         if (is_array($data)) {
             return $this->referralUrl . implode('/', array_filter($data)) . $this->getApiKeyQuery($apiKey);
@@ -49,6 +49,6 @@ public function getReferralLinkByArrayOfParameters($data, $apiKey)
      */
     protected function getApiKeyQuery($apiKey)
     {
-        return '?apiKey=' . substr($apiKey, 0, 16);
+        return !empty($apiKey) ? '?apiKey=' . substr($apiKey, 0, 16) : '';
     }
 }

src/Travel/Flights/LivePricing.php

@@ -231,7 +231,7 @@ class LivePricing extends TravelService
      *
      * @var int
      */
-    protected $stops = 0;
+    protected $stops;
 
     /**
      * The property to sort on. If specified, you must also specify sortorder

tests/Localisation/CurrencyTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Localisation;
 
 use OzdemirBurak\SkyScanner\Localisation\Currency;
+use PHPUnit\Framework\TestCase;
 
-class CurrencyTest extends \PHPUnit_Framework_TestCase
+class CurrencyTest extends TestCase
 {
     /**
      * @group currency-tests

tests/Localisation/LocaleTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Localisation;
 
 use OzdemirBurak\SkyScanner\Localisation\Locale;
+use PHPUnit\Framework\TestCase;
 
-class LocaleTest extends \PHPUnit_Framework_TestCase
+class LocaleTest extends TestCase
 {
     /**
      * @group locale-tests

tests/Localisation/MarketTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Localisation;
 
 use OzdemirBurak\SkyScanner\Localisation\Market;
+use PHPUnit\Framework\TestCase;
 
-class MarketTest extends \PHPUnit_Framework_TestCase
+class MarketTest extends TestCase
 {
     /**
      * @group market-tests

tests/PlacesTest.php

@@ -4,8 +4,9 @@
 
 use OzdemirBurak\SkyScanner\Exceptions\RestrictedMethodException;
 use OzdemirBurak\SkyScanner\PlacesService;
+use PHPUnit\Framework\TestCase;
 
-class PlacesTest extends \PHPUnit_Framework_TestCase
+class PlacesTest extends TestCase
 {
     /**
      * @group places-tests

tests/Traits/ConsoleTraitTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Traits;
 
 use OzdemirBurak\SkyScanner\Traits\ConsoleTrait;
+use PHPUnit\Framework\TestCase;
 
-class ConsoleTraitTest extends \PHPUnit_Framework_TestCase
+class ConsoleTraitTest extends TestCase
 {
     use ConsoleTrait;
 

tests/Traits/ImageTraitTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Traits;
 
 use OzdemirBurak\SkyScanner\Traits\ImageTrait;
+use PHPUnit\Framework\TestCase;
 
-class ImageTraitTest extends \PHPUnit_Framework_TestCase
+class ImageTraitTest extends TestCase
 {
     use ImageTrait;
 

tests/Traits/ReferralTraitTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Traits;
 
 use OzdemirBurak\SkyScanner\Traits\ReferralTrait;
+use PHPUnit\Framework\TestCase;
 
-class ReferralTraitTest extends \PHPUnit_Framework_TestCase
+class ReferralTraitTest extends TestCase
 {
     use ReferralTrait;
 

tests/Travel/CarHire/LivePricingTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Travel\CarHire;
 
 use OzdemirBurak\SkyScanner\Travel\CarHire\LivePricing;
+use PHPUnit\Framework\TestCase;
 
-class LivePricingTest extends \PHPUnit_Framework_TestCase
+class LivePricingTest extends TestCase
 {
     /**
      * @group cars-live-pricing-methods

tests/Travel/Flights/BrowseCacheTest.php

@@ -4,8 +4,9 @@
 
 use OzdemirBurak\SkyScanner\Exceptions\InvalidMethodException;
 use OzdemirBurak\SkyScanner\Travel\Flights\BrowseCache;
+use PHPUnit\Framework\TestCase;
 
-class BrowseCacheTest extends \PHPUnit_Framework_TestCase
+class BrowseCacheTest extends TestCase
 {
     /**
      * @group browse-cache-methods

tests/Travel/Flights/LivePricingTest.php

@@ -3,8 +3,9 @@
 namespace OzdemirBurak\SkyScanner\Tests\Travel\Flights;
 
 use OzdemirBurak\SkyScanner\Travel\Flights\LivePricing;
+use PHPUnit\Framework\TestCase;
 
-class LivePricingTest extends \PHPUnit_Framework_TestCase
+class LivePricingTest extends TestCase
 {
     /**
      * @group flights-live-pricing-methods