Namespaced objects and started composer compatibility setup

architech99 · architech99 · commit 3e2d718dc982 · 2014-09-08T22:04:56.000-07:00
diff --git a/USPS/USPSAddress.php b/USPS/USPSAddress.php
@@ -1,4 +1,6 @@
 <?php
+namespace USPS;
+
 /**
  * USPS Address Class
  * used across other class to create addresses represented as objects
diff --git a/USPS/USPSAddressVerify.php b/USPS/USPSAddressVerify.php
@@ -1,4 +1,6 @@
 <?php
+namespace USPS;
+
 /**
  * Load required classes
  */
diff --git a/USPS/USPSBase.php b/USPS/USPSBase.php
@@ -1,8 +1,8 @@
 <?php
-/**
- * Load required classes
- */
-require_once('XMLParser.php');
+namespace USPS;
+
+use Utility\Parsers\XMLParser;
+
 /**
  * USPS Base class
  * used to perform the actual api calls
diff --git a/USPS/USPSCityStateLookup.php b/USPS/USPSCityStateLookup.php
@@ -1,8 +1,6 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
+
 /**
  * USPS City/State lookup
  * used to find a city/state by a zipcode lookup
diff --git a/USPS/USPSFirstClassServiceStandards.php b/USPS/USPSFirstClassServiceStandards.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSInternationalLabel.php b/USPS/USPSInternationalLabel.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSOpenDistributeLabel.php b/USPS/USPSOpenDistributeLabel.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSPriorityLabel.php b/USPS/USPSPriorityLabel.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSRate.php b/USPS/USPSRate.php
@@ -1,8 +1,6 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
+
 /**
  * USPS Rate calculator class
  * used to get a rate for shipping methods
diff --git a/USPS/USPSServiceDeliveryCalculator.php b/USPS/USPSServiceDeliveryCalculator.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSTrackConfirm.php b/USPS/USPSTrackConfirm.php
@@ -1,8 +1,5 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
+namespace USPS;
 
 /**
  */
diff --git a/USPS/USPSZipCodeLookup.php b/USPS/USPSZipCodeLookup.php
@@ -1,9 +1,6 @@
 <?php
-/**
- * Load required classes
- */
-require_once('USPSBase.php');
-require_once('USPSAddress.php');
+namespace USPS;
+
 /**
  * USPS Zip code lookup by city/state
  * used to find a zip code by city/state lookup
@@ -33,10 +30,13 @@ public function lookup() {
   public function getPostFields() {
     return $this->addresses;
   }
+
   /**
    * Add Address to the stack
-   * @param USPSAddress object $data
-   * @param string $id the address unique id
+   *
+   * @param \USPS\USPSAddress $data
+   * @param string            $id the address unique id
+   *
    * @return void
    */
   public function addAddress(USPSAddress $data, $id=null) {
diff --git a/Utility/Parsers/XMLParser.php b/Utility/Parsers/XMLParser.php
@@ -1,4 +1,6 @@
 <?php
+namespace Utility\Parsers;
+
 /**
  * Array2XML: A class to convert array in PHP to XML
  * It also takes into account attributes names unlike SimpleXML in PHP
diff --git a/composer.json b/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "pingdevelopment/usps-php-api",
+    "type": "library",
+    "description": "PHP wrapper for USPS Web Tools API",
+    "keywords": ["usps", "api"],
+    "authors": [
+        {
+            "name": "Vincent Gabriel",
+            "homepage": "http://vadimg.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Peter Adams",
+            "homepage": "https://www.pingdevelopment.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "USPS": "/"
+        }
+    }
+}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 <?php
 +namespace USPS;
++
 /**
  * Load required classes
  */