Add namespaces

composer.json

@@ -21,7 +21,7 @@
     }
   ],
   "require": {
-    "php": ">=5.2",
+    "php": ">=5.6",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*"
@@ -30,6 +30,8 @@
     "phpunit/phpunit": "5.5.*"
   },
   "autoload": {
-    "classmap": ["lib/Shippo/"]
+    "psr-4": {
+      "Shippo\\": "lib/"
+    }
   }
 }

lib/Shippo/Address.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Address extends Shippo_ApiResource
 {
     /**
@@ -13,45 +15,44 @@ public static function classUrl($class)
     {
         return "/v1/addresses";
     }
-    
+
     /**
      * @param array|null $params
      * @param string|null $apiKey
-     *
-     * @return Shippo_Adress Create an Address.
+     * @return static
      */
     public static function create($params = null, $apiKey = null)
     {
         $class = get_class();
         return self::_scopedCreate($class, $params, $apiKey);
     }
-    
+
     /**
-     * @param array|null $params
-     *
-     * @return Shippo_Retrieve Get an address.
+     * @param $id
+     * @param null $apiKey
+     * @return static
      */
     public static function retrieve($id, $apiKey = null)
     {
         $class = get_class();
+
         return self::_scopedRetrieve($class, $id, $apiKey);
     }
-    
+
     /**
-     * @param array|null $params
-     *
-     * @return Shippo_All Get all the addresses.
+     * @param null $params
+     * @param null $apiKey
+     * @return static
      */
     public static function all($params = null, $apiKey = null)
     {
         $class = get_class();
         return self::_scopedAll($class, $params, $apiKey);
     }
-    
+
     /**
-     * @param array|null $params
-     *
-     * @return Shippo_Validate Validate an address.
+     * @param $id
+     * @return mixed
      */
     public static function validate($id)
     {

lib/Shippo/ApiConnectionError.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_ApiConnectionError extends Shippo_Error
 {
 }

lib/Shippo/ApiError.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_ApiError extends Shippo_Error
 {
 }

lib/Shippo/ApiRequestor.php

@@ -1,4 +1,7 @@
 <?php
+
+namespace Shippo;
+
 class Shippo_ApiRequestor
 {
     /**

lib/Shippo/ApiResource.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 abstract class Shippo_ApiResource extends Shippo_Object
 {
     protected static function _scopedRetrieve($class, $id, $apiKey = null)
@@ -8,7 +10,7 @@ protected static function _scopedRetrieve($class, $id, $apiKey = null)
         $instance->refresh();
         return $instance;
     }
-    
+
     /**
      * @returns Shippo_ApiResource The refreshed resource.
      */

lib/Shippo/AttachedObject.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 // e.g. metadata on Shippo objects.
 class Shippo_AttachedObject extends Shippo_Object
 {

lib/Shippo/AuthenticationError.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_AuthenticationError extends Shippo_Error
 {
 }

lib/Shippo/Batch.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Batch extends Shippo_ApiResource
 {
     /**
@@ -17,27 +19,24 @@ public static function classUrl($class)
     /**
      * @param array|null $params
      * @param string|null $apiKey
-     *
-     * @return Shippo_Batch Create a batch shipment object 
+     * @return static
      */
     public static function create($params = null, $apiKey = null)
     {
         $class = get_class();
         return self::_scopedCreate($class, $params, $apiKey);
     }
-    
+
     /**
-     * @param string $id
-     * @param string|null $apiKey
-     *
-     * @return Shippo_Retrieve Retrieves a batch shipment 
+     * @param $id
+     * @param null $apiKey
+     * @return static
      */
     public static function retrieve($id, $apiKey = null)
     {
         $class = get_class();
         return self::_scopedRetrieve($class, $id, $apiKey);
     }
-
      /**
      * @param string $id
      * @param array|null $params

lib/Shippo/CarrierAccount.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_CarrierAccount extends Shippo_ApiResource
 {
     /**
@@ -59,4 +61,4 @@ public static function update($id, $params, $apiKey = null)
         return self::_scopedUpdate($class, $id, $params, $apiKey);
     }
 
-}
+}

lib/Shippo/CurlClient.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class CurlClient
 {
     private static $instance;

lib/Shippo/CustomsDeclaration.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_CustomsDeclaration extends Shippo_ApiResource
 {
     /**

lib/Shippo/CustomsItem.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_CustomsItem extends Shippo_ApiResource
 {
     /**

lib/Shippo/Error.php

@@ -1,7 +1,18 @@
 <?php
 
+namespace Shippo;
+
+use Exception;
+
+
 class Shippo_Error extends Exception
 {
+    protected $httpStatus;
+
+    protected $httpBody;
+
+    protected $jsonBody;
+
     public function __construct($message, $httpStatus = null, $httpBody = null, $jsonBody = null)
     {
         parent::__construct($message);

lib/Shippo/InvalidRequestError.php

@@ -1,7 +1,11 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_InvalidRequestError extends Shippo_Error
 {
+    public $param;
+
     public function __construct($message, $param, $httpStatus = null, $httpBody = null, $jsonBody = null)
     {
         parent::__construct($message, $httpStatus, $httpBody, $jsonBody);

lib/Shippo/List.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_List extends Shippo_Object
 {
     public function all($params = null)

lib/Shippo/Manifest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Manifest extends Shippo_ApiResource
 {
     /**

lib/Shippo/Object.php

@@ -1,5 +1,10 @@
 <?php
 
+namespace Shippo;
+
+use ArrayAccess;
+use Shippo\Util\Shippo_Util_Set;
+
 class Shippo_Object implements ArrayAccess
 {
     /**
@@ -56,7 +61,7 @@ public function __construct($id = null, $apiKey = null)
     public function __set($k, $v)
     {
         if ($v === "") {
-            throw new InvalidArgumentException('You cannot set \'' . $k . '\'to an empty string. ' . 'We interpret empty strings as NULL in requests. ' . 'You may set obj->' . $k . ' = NULL to delete the property');
+            throw new \InvalidArgumentException('You cannot set \'' . $k . '\'to an empty string. ' . 'We interpret empty strings as NULL in requests. ' . 'You may set obj->' . $k . ' = NULL to delete the property');
         }
 
         if (self::$nestedUpdatableAttributes->includes($k) && isset($this->$k) && is_array($v)) {
@@ -179,7 +184,7 @@ public function refreshFrom($values, $apiKey, $partial = false)
                 continue;
 
             if (self::$nestedUpdatableAttributes->includes($k) && is_array($v)) {
-                $this->_values[$k] = Shippo_Object::scopedConstructFrom('Shippo_AttachedObject', $v, $apiKey);
+                $this->_values[$k] = Shippo_Object::scopedConstructFrom(Shippo_AttachedObject::class, $v, $apiKey);
             } else {
                 $this->_values[$k] = Shippo_Util::convertToShippoObject($v, $apiKey);
             }

lib/Shippo/Parcel.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Parcel extends Shippo_ApiResource
 {
     /**

lib/Shippo/Rate.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Rate extends Shippo_ApiResource
 {
     /**

lib/Shippo/RateLimitError.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_RateLimitError extends Shippo_InvalidRequestError
 {
     public function __construct($message, $param, $httpStatus = null, $httpBody = null, $jsonBody = null)

lib/Shippo/Refund.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Refund extends Shippo_ApiResource
 {
     /**

lib/Shippo/Shipment.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Shipment extends Shippo_ApiResource
 {
     /**

lib/Shippo/Shippo.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 abstract class Shippo
 {
     /**

lib/Shippo/SingletonApiResource.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 abstract class Shippo_SingletonApiResource extends Shippo_ApiResource
 {
     protected static function _scopedSingletonRetrieve($class, $apiKey = null)

lib/Shippo/Track.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Track extends Shippo_ApiResource
 {
     /**

lib/Shippo/Transaction.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 class Shippo_Transaction extends Shippo_ApiResource
 {
     /**

lib/Shippo/Util.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo;
+
 abstract class Shippo_Util
 {
     /**
@@ -66,9 +68,9 @@ public static function convertToShippoObject($resp, $apiKey)
             return $mapped;
         } else if (is_array($resp)) {
             if (isset($resp['object_purpose']) && is_string($resp['object_purpose']) && isset($types[$resp['object_purpose']])) {
-                $class = $types[$resp['object_purpose']];
+                $class = "Shippo\\" . $types[$resp['object_purpose']];
             } else {
-                $class = 'Shippo_Object';
+                $class = Shippo_Object::class;
             }
             return Shippo_Object::scopedConstructFrom($class, $resp, $apiKey);
         } else {

lib/Shippo/Util/Set.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Shippo\Util;
+
 class Shippo_Util_Set
 {
     private $_elts;