Merge branch 'release/2.7.3'

meanbee · Jan 19, 2016 · 9393001 · 9393001
2 parents ef99ae0 + a1d3471
commit 9393001
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php
@@ -40,8 +40,8 @@ class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail
      */
     public function __construct()
     {
-        require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php');
-        require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/src/Data.php');
+        require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/Src/CalculateMethod.php');
+        require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/Src/Data.php');
 
         $this->calculateMethodClass = new Meanbee_RoyalmailPHPLibrary_CalculateMethod();
         $this->dataClass = new Meanbee_RoyalmailPHPLibrary_Data(

diff --git a/app/code/community/Meanbee/Royalmail/etc/config.xml b/app/code/community/Meanbee/Royalmail/etc/config.xml
@@ -22,7 +22,7 @@
 <config>
     <modules>
         <Meanbee_Royalmail>
-            <version>2.7.0</version>
+            <version>2.7.2</version>
             <depends>
                 <Mage_Shipping />
             </depends>

diff --git a/...yalmailPHPLibrary/src/CalculateMethod.php → ...yalmailPHPLibrary/Src/CalculateMethod.php b/...yalmailPHPLibrary/src/CalculateMethod.php → ...yalmailPHPLibrary/Src/CalculateMethod.php
@@ -52,11 +52,11 @@ public function getMethods($country_code, $package_value, $package_weight)
 
         $sortedDeliveryMethods = array($data->calculateMethods($country_code, $package_value, $package_weight));
 
-        $results = [];
+        $results = array();
 
         foreach ($sortedDeliveryMethods as $shippingMethod) {
             foreach ($shippingMethod as $item) {
-                $method = new Meanbee_RoyalmailPHPLibrary_src_Method();
+                $method = new Meanbee_RoyalmailPHPLibrary_Src_Method();
                 $method->countryCode = $country_code;
                 $method->shippingMethodName = $item['shippingMethodName'];
                 $method->minimumWeight = $item['minimumWeight'];

diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php → lib/Meanbee/RoyalmailPHPLibrary/Src/Data.php b/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php → lib/Meanbee/RoyalmailPHPLibrary/Src/Data.php
diff --git a/...eanbee/RoyalmailPHPLibrary/src/Method.php → ...eanbee/RoyalmailPHPLibrary/Src/Method.php b/...eanbee/RoyalmailPHPLibrary/src/Method.php → ...eanbee/RoyalmailPHPLibrary/Src/Method.php
@@ -1,6 +1,6 @@
 <?php
 
-class Meanbee_RoyalmailPHPLibrary_src_Method
+class Meanbee_RoyalmailPHPLibrary_Src_Method
 {
     // The shipping code name of the method
     public $shippingMethodName;

diff --git a/package.xml b/package.xml
@@ -1,5 +1,5 @@
 <_>
-   <form_key>QwJX3XS3dAhahdvS</form_key>
+   <form_key>y0ShjLGrOcqkOAlh</form_key>
    <name>Meanbee_Royalmail</name>
    <channel>community</channel>
    <version_ids>
@@ -9,13 +9,9 @@
    <description>Automatically calculated Royal Mail delivery methods.</description>
    <license>Open Software License v3.0 (OSL-3.0)</license>
    <license_uri>http://www.opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>2.7.1</version>
+   <version>2.7.2</version>
    <stability>stable</stability>
-   <notes>*Added additional Royalmail shipping methods
-
-*Fixed incorrect name error
-
-*Fixed PHP 5.4 and lower error</notes>
+   <notes>* Fixed PHP 5.3 error</notes>
    <authors>
       <name>
          <name>Meanbee</name>
@@ -27,7 +23,7 @@
          <email>[email protected]</email>
       </email>
    </authors>
-   <depends_php_min>5.2.0</depends_php_min>
+   <depends_php_min>5.3.0</depends_php_min>
    <depends_php_max>7.1.0</depends_php_max>
    <depends>
       <package>
@@ -44,7 +40,7 @@
             <max/>
          </max>
          <files>
-            <files>                      </files>
+            <files>                       </files>
          </files>
       </package>
       <extension>