Partial updates of tests

.travis.yml

@@ -4,10 +4,10 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
+  - 7
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --prefer-source --no-interaction --dev
 
-script: phpunit
+script: cd test-cases && phpunit --bootstrap bootstrap.php

composer.json

@@ -15,11 +15,11 @@
         "illuminate/support": "5.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.*"
+        "phpunit/phpunit": "5.*"
     },
     "autoload": {
-        "psr-0": {
-            "Sonnenglas\\AmazonMws": "src/"
+        "psr-4": {
+            "Sonnenglas\\AmazonMws\\": "src"
         }
     },
     "minimum-stability": "stable"

phpunit.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
->
+<phpunit
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        colors="true"
+        strict="false"
+        processIsolation="false"
+        stopOnFailure="true"
+        syntaxCheck="true"
+        backupGlobals="false"
+        bootstrap="tests/bootstrap.php"
+        verbose="true">
     <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+        <testsuite name='all'>
+            <directory>tests/classes/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

src/Sonnenglas/AmazonMws/AmazonCore.php → src/AmazonCore.php

@@ -4,6 +4,7 @@
 use DateTime;
 use Exception;
 
+
 /**
  * Copyright 2013 CPI Group, LLC
  *
@@ -129,7 +130,7 @@ abstract class AmazonCore
      * from the list to use as a response. See <i>setMock</i> for more information.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    protected function __construct($s, $mock = false, $m = null, $config = null)
+    protected function __construct($s, $mock = false, $m = null)
     {
         $this->setConfig();
         $this->setStore($s);

src/Sonnenglas/AmazonMws/AmazonFeed.php → src/AmazonFeed.php

@@ -45,9 +45,9 @@ class AmazonFeed extends AmazonFeedsCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         $this->options['Action'] = 'SubmitFeed';

src/Sonnenglas/AmazonMws/AmazonFeedList.php → src/AmazonFeedList.php

@@ -51,8 +51,8 @@ class AmazonFeedList extends AmazonFeedsCore implements Iterator{
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null){
-        parent::__construct($s, $mock, $m, $config);
+    public function __construct($s, $mock = false, $m = null){
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if(isset($THROTTLE_LIMIT_FEEDLIST)) {

src/Sonnenglas/AmazonMws/AmazonFeedResult.php → src/AmazonFeedResult.php

@@ -46,9 +46,9 @@ class AmazonFeedResult extends AmazonFeedsCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $id = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $id = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if ($id) {

src/Sonnenglas/AmazonMws/AmazonFeedsCore.php → src/AmazonFeedsCore.php

@@ -40,9 +40,9 @@ abstract class AmazonFeedsCore extends AmazonCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         $this->urlbranch = '';

src/Sonnenglas/AmazonMws/AmazonFulfillmentOrder.php → src/AmazonFulfillmentOrder.php

@@ -46,9 +46,9 @@ class AmazonFulfillmentOrder extends AmazonOutboundCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $id = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $id = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         if ($id) {
             $this->setOrderId($id);
@@ -65,7 +65,7 @@ public function __construct($s, $id = null, $mock = false, $m = null, $config =
      */
     public function setOrderId($s)
     {
-        if (is_string($s)) {
+        if ($s !== null) {
             $this->options['SellerFulfillmentOrderId'] = $s;
         } else {
             return false;

src/Sonnenglas/AmazonMws/AmazonFulfillmentOrderCreator.php → src/AmazonFulfillmentOrderCreator.php

@@ -42,9 +42,9 @@ class AmazonFulfillmentOrderCreator extends AmazonOutboundCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         $this->options['Action'] = 'CreateFulfillmentOrder';
     }

src/Sonnenglas/AmazonMws/AmazonFulfillmentOrderList.php → src/AmazonFulfillmentOrderList.php

@@ -48,9 +48,9 @@ class AmazonFulfillmentOrderList extends AmazonOutboundCore implements \Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         $this->options['Action'] = 'ListAllFulfillmentOrders';
     }

src/Sonnenglas/AmazonMws/AmazonFulfillmentPreview.php → src/AmazonFulfillmentPreview.php

@@ -42,9 +42,9 @@ class AmazonFulfillmentPreview extends AmazonOutboundCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         $this->options['Action'] = 'GetFulfillmentPreview';
     }

src/Sonnenglas/AmazonMws/AmazonInboundCore.php → src/AmazonInboundCore.php

@@ -40,9 +40,9 @@ abstract class AmazonInboundCore extends AmazonCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if (isset($AMAZON_VERSION_INBOUND)) {

src/Sonnenglas/AmazonMws/AmazonInventoryCore.php → src/AmazonInventoryCore.php

@@ -40,9 +40,9 @@ abstract class AmazonInventoryCore extends AmazonCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if (isset($AMAZON_VERSION_INVENTORY)) {

src/Sonnenglas/AmazonMws/AmazonInventoryList.php → src/AmazonInventoryList.php

@@ -47,9 +47,9 @@ class AmazonInventoryList extends AmazonInventoryCore implements \Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
     }
 
     /**

src/Sonnenglas/AmazonMws/AmazonOrder.php → src/AmazonOrder.php

@@ -46,9 +46,9 @@ class AmazonOrder extends AmazonOrderCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $id = null, $data = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $id = null, $data = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if ($id) {

src/Sonnenglas/AmazonMws/AmazonOrderCore.php → src/AmazonOrderCore.php

@@ -38,9 +38,9 @@ abstract class AmazonOrderCore extends AmazonCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if (isset($AMAZON_VERSION_ORDERS)) {

src/Sonnenglas/AmazonMws/AmazonOrderItemList.php → src/AmazonOrderItemList.php

@@ -49,9 +49,9 @@ class AmazonOrderItemList extends AmazonOrderCore implements Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $id = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $id = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
 

src/Sonnenglas/AmazonMws/AmazonOrderList.php → src/AmazonOrderList.php

@@ -48,9 +48,9 @@ class AmazonOrderList extends AmazonOrderCore implements Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
         // if (file_exists($this->config)){
         //     include($this->config);

src/Sonnenglas/AmazonMws/AmazonOrderSet.php → src/AmazonOrderSet.php

@@ -49,9 +49,9 @@ class AmazonOrderSet extends AmazonOrderCore implements \Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $o = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $o = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         $this->i = 0;
         include($this->env);
 

src/Sonnenglas/AmazonMws/AmazonOutboundCore.php → src/AmazonOutboundCore.php

@@ -40,9 +40,9 @@ abstract class AmazonOutboundCore extends AmazonCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if (isset($AMAZON_VERSION_OUTBOUND)) {

src/Sonnenglas/AmazonMws/AmazonPackageTracker.php → src/AmazonPackageTracker.php

@@ -44,9 +44,9 @@ class AmazonPackageTracker extends AmazonOutboundCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $id = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $id = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         if ($id) {
             $this->setPackageNumber($id);

src/Sonnenglas/AmazonMws/AmazonParticipationList.php → src/AmazonParticipationList.php

@@ -47,9 +47,9 @@ class AmazonParticipationList extends AmazonSellersCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if (isset($THROTTLE_LIMIT_SELLERS)) {

src/Sonnenglas/AmazonMws/AmazonProduct.php → src/AmazonProduct.php

@@ -44,9 +44,9 @@ class AmazonProduct extends AmazonProductsCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $data = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $data = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
 
         if ($data) {
             $this->loadXML($data);

src/Sonnenglas/AmazonMws/AmazonProductInfo.php → src/AmazonProductInfo.php

@@ -44,9 +44,9 @@ class AmazonProductInfo extends AmazonProductsCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
     }
 
     /**

src/Sonnenglas/AmazonMws/AmazonProductList.php → src/AmazonProductList.php

@@ -43,9 +43,9 @@ class AmazonProductList extends AmazonProductsCore implements \Iterator
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $mock = false, $m = null, $config = null)
+    public function __construct($s, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         $this->options['Action'] = 'GetMatchingProductForId';

src/Sonnenglas/AmazonMws/AmazonProductSearch.php → src/AmazonProductSearch.php

@@ -46,9 +46,9 @@ class AmazonProductSearch extends AmazonProductsCore
      * @param array|string $m [optional] <p>The files (or file) to use in Mock Mode.</p>
      * @param string $config [optional] <p>An alternate config file to set. Used for testing.</p>
      */
-    public function __construct($s, $q = null, $mock = false, $m = null, $config = null)
+    public function __construct($s, $q = null, $mock = false, $m = null)
     {
-        parent::__construct($s, $mock, $m, $config);
+        parent::__construct($s, $mock, $m);
         include($this->env);
 
         if ($q) {