moved some const from Zend_Measure

sreichel · sreichel · commit 3560cdefbd0f · 2025-11-15T07:46:00.000+01:00
diff --git a/app/code/core/Mage/Core/Helper/Measure/Length.php b/app/code/core/Mage/Core/Helper/Measure/Length.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright  For copyright and license information, read the COPYING.txt file.
+ * @link       /COPYING.txt
+ * @license    Open Software License (OSL 3.0)
+ * @package    Mage_Core
+ */
+
+/**
+ * Length constants
+ *
+ * @package    Mage_Core
+ */
+class Mage_Core_Helper_Measure_Length extends Mage_Core_Helper_Abstract
+{
+    protected $_moduleName = 'Mage_Core';
+
+    public const STANDARD              = 'meter';
+
+    public const CENTIMETER            = 'centimeter';
+
+    public const INCH                  = 'inch';
+}
diff --git a/app/code/core/Mage/Core/Helper/Measure/Weight.php b/app/code/core/Mage/Core/Helper/Measure/Weight.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright  For copyright and license information, read the COPYING.txt file.
+ * @link       /COPYING.txt
+ * @license    Open Software License (OSL 3.0)
+ * @package    Mage_Core
+ */
+
+/**
+ * Weight constants
+ *
+ * @package    Mage_Core
+ */
+class Mage_Core_Helper_Measure_Weight extends Mage_Core_Helper_Abstract
+{
+    protected $_moduleName = 'Mage_Core';
+
+    public const STANDARD                = 'kilogram';
+
+    public const KILOGRAM                = 'kilogram';
+
+    public const OUNCE                   = 'ounce';
+
+    public const POUND                   = 'pounds';
+}
diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php
@@ -36,8 +36,8 @@ public function _construct()
         $weight = round(
             (float) Mage::helper('usa')->convertMeasureWeight(
                 $kgWeight,
-                Zend_Measure_Weight::KILOGRAM,
-                Zend_Measure_Weight::POUND,
+                Mage_Core_Helper_Measure_Weight::KILOGRAM,
+                Mage_Core_Helper_Measure_Weight::POUND,
             ),
             3,
         );
diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php
@@ -7,6 +7,10 @@
  * @package    Mage_Usa
  */
 
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
+use PhpUnitsOfMeasure\PhysicalQuantity\Mass;
+use PhpUnitsOfMeasure\PhysicalQuantity\Length;
+
 /**
  * @package    Mage_Usa
  */
@@ -17,20 +21,16 @@ class Mage_Usa_Helper_Data extends Mage_Core_Helper_Abstract
     /**
      * Convert weight in different measure types
      *
-     * @param  mixed $value
+     * @param  float $value
      * @param  string $sourceWeightMeasure
      * @param  string $toWeightMeasure
-     * @return null|int|string
-     * @throws Zend_Locale_Exception
-     * @throws Zend_Measure_Exception
+     * @return null|float
      */
     public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure)
     {
         if ($value) {
-            $locale = Mage::app()->getLocale()->getLocale();
-            $unitWeight = new Zend_Measure_Weight($value, $sourceWeightMeasure, $locale);
-            $unitWeight->setType($toWeightMeasure);
-            return $unitWeight->getValue();
+            $unitWeight = new Mass($value, $sourceWeightMeasure);
+            return $unitWeight->toUnit($toWeightMeasure);
         }
 
         return null;
@@ -39,20 +39,16 @@ public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeas
     /**
      * Convert dimensions in different measure types
      *
-     * @param  int|string $value
+     * @param  float $value
      * @param  string $sourceDimensionMeasure
      * @param  string $toDimensionMeasure
-     * @return null|int|string
-     * @throws Zend_Locale_Exception
-     * @throws Zend_Measure_Exception
+     * @return null|float
      */
     public function convertMeasureDimension($value, $sourceDimensionMeasure, $toDimensionMeasure)
     {
         if ($value) {
-            $locale = Mage::app()->getLocale()->getLocale();
-            $unitDimension = new Zend_Measure_Length($value, $sourceDimensionMeasure, $locale);
-            $unitDimension->setType($toDimensionMeasure);
-            return $unitDimension->getValue();
+            $unitDimension = new Length($value, $sourceDimensionMeasure);
+            return $unitDimension->toUnit($toDimensionMeasure);
         }
 
         return null;
@@ -61,37 +57,27 @@ public function convertMeasureDimension($value, $sourceDimensionMeasure, $toDime
     /**
      * Get name of measure by its type
      *
-     * @param  $key
+     * @param  string $key
      * @return string
-     * @throws Zend_Measure_Exception
+     * @throws UnknownUnitOfMeasure
      */
     public function getMeasureWeightName($key)
     {
-        $weight = new Zend_Measure_Weight(0);
-        $conversionList = $weight->getConversionList();
-        if (!empty($conversionList[$key]) && !empty($conversionList[$key][1])) {
-            return $conversionList[$key][1];
-        }
-
-        return '';
+        $unit = Mass::getUnit($key);
+        return $unit->getName();
     }
 
     /**
      * Get name of measure by its type
      *
-     * @param  $key
+     * @param  string $key
      * @return string
-     * @throws Zend_Measure_Exception
+     * @throws UnknownUnitOfMeasure
      */
     public function getMeasureDimensionName($key)
     {
-        $weight = new Zend_Measure_Length(0);
-        $conversionList = $weight->getConversionList();
-        if (!empty($conversionList[$key]) && !empty($conversionList[$key][1])) {
-            return $conversionList[$key][1];
-        }
-
-        return '';
+        $unit = Length::getUnit($key);
+        return $unit->getName();
     }
 
     /**
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
@@ -288,29 +288,29 @@ public function setRequest(Varien_Object $request)
         if ($request->getAction() == 'GenerateLabel') {
             $packageParams = $request->getPackageParams();
             $shippingWeight = $request->getPackageWeight();
-            if ($packageParams->getWeightUnits() != Zend_Measure_Weight::POUND) {
+            if ($packageParams->getWeightUnits() != Mage_Core_Helper_Measure_Weight::POUND) {
                 $shippingWeight = round((float) Mage::helper('usa')->convertMeasureWeight(
                     $request->getPackageWeight(),
                     $packageParams->getWeightUnits(),
-                    Zend_Measure_Weight::POUND,
+                    Mage_Core_Helper_Measure_Weight::POUND,
                 ));
             }
 
-            if ($packageParams->getDimensionUnits() != Zend_Measure_Length::INCH) {
+            if ($packageParams->getDimensionUnits() != Mage_Core_Helper_Measure_Length::INCH) {
                 $packageParams->setLength(round((float) Mage::helper('usa')->convertMeasureDimension(
                     $packageParams->getLength(),
                     $packageParams->getDimensionUnits(),
-                    Zend_Measure_Length::INCH,
+                    Mage_Core_Helper_Measure_Length::INCH,
                 )));
                 $packageParams->setWidth(round((float) Mage::helper('usa')->convertMeasureDimension(
                     $packageParams->getWidth(),
                     $packageParams->getDimensionUnits(),
-                    Zend_Measure_Length::INCH,
+                    Mage_Core_Helper_Measure_Length::INCH,
                 )));
                 $packageParams->setHeight(round((float) Mage::helper('usa')->convertMeasureDimension(
                     $packageParams->getHeight(),
                     $packageParams->getDimensionUnits(),
-                    Zend_Measure_Length::INCH,
+                    Mage_Core_Helper_Measure_Length::INCH,
                 )));
             }
 
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
@@ -427,18 +427,18 @@ public function getCode($type, $code = '')
                 '1' => Mage::helper('usa')->__('Specific'),
             ],
             'dimensions_variables'  => [
-                'L'         => Zend_Measure_Weight::POUND,
-                'LB'        => Zend_Measure_Weight::POUND,
-                'POUND'     => Zend_Measure_Weight::POUND,
-                'K'         => Zend_Measure_Weight::KILOGRAM,
-                'KG'        => Zend_Measure_Weight::KILOGRAM,
-                'KILOGRAM'  => Zend_Measure_Weight::KILOGRAM,
-                'I'         => Zend_Measure_Length::INCH,
-                'IN'        => Zend_Measure_Length::INCH,
-                'INCH'      => Zend_Measure_Length::INCH,
-                'C'         => Zend_Measure_Length::CENTIMETER,
-                'CM'        => Zend_Measure_Length::CENTIMETER,
-                'CENTIMETER' => Zend_Measure_Length::CENTIMETER,
+                'L'         => Mage_Core_Helper_Measure_Weight::POUND,
+                'LB'        => Mage_Core_Helper_Measure_Weight::POUND,
+                'POUND'     => Mage_Core_Helper_Measure_Weight::POUND,
+                'K'         => Mage_Core_Helper_Measure_Weight::KILOGRAM,
+                'KG'        => Mage_Core_Helper_Measure_Weight::KILOGRAM,
+                'KILOGRAM'  => Mage_Core_Helper_Measure_Weight::KILOGRAM,
+                'I'         => Mage_Core_Helper_Measure_Length::INCH,
+                'IN'        => Mage_Core_Helper_Measure_Length::INCH,
+                'INCH'      => Mage_Core_Helper_Measure_Length::INCH,
+                'C'         => Mage_Core_Helper_Measure_Length::CENTIMETER,
+                'CM'        => Mage_Core_Helper_Measure_Length::CENTIMETER,
+                'CENTIMETER' => Mage_Core_Helper_Measure_Length::CENTIMETER,
 
             ],
         ];
@@ -537,7 +537,7 @@ public function getDhlProductTitle($code)
     protected function _getWeight($weight, $maxWeight = false, $configWeightUnit = false)
     {
         if ($maxWeight) {
-            $configWeightUnit = Zend_Measure_Weight::KILOGRAM;
+            $configWeightUnit = Mage_Core_Helper_Measure_Weight::KILOGRAM;
         } elseif ($configWeightUnit) {
             $configWeightUnit = $this->getCode('dimensions_variables', $configWeightUnit);
         } else {
@@ -731,10 +731,10 @@ protected function _getDimension($dimension, $configWeightUnit = false)
             $configWeightUnit = $this->getCode('dimensions_variables', $configWeightUnit);
         }
 
-        if ($configWeightUnit == Zend_Measure_Weight::POUND) {
-            $configDimensionUnit = Zend_Measure_Length::INCH;
+        if ($configWeightUnit == Mage_Core_Helper_Measure_Weight::POUND) {
+            $configDimensionUnit = Mage_Core_Helper_Measure_Length::INCH;
         } else {
-            $configDimensionUnit = Zend_Measure_Length::CENTIMETER;
+            $configDimensionUnit = Mage_Core_Helper_Measure_Length::CENTIMETER;
         }
 
         $countryDimensionUnit = $this->getCode('dimensions_variables', $this->_getDimensionUnit());
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -1340,8 +1340,8 @@ protected function _formShipmentRequest(Varien_Object $request)
         $height = $packageParams->getHeight();
         $width = $packageParams->getWidth();
         $length = $packageParams->getLength();
-        $weightUnits = $packageParams->getWeightUnits() == Zend_Measure_Weight::POUND ? 'LB' : 'KG';
-        $dimensionsUnits = $packageParams->getDimensionUnits() == Zend_Measure_Length::INCH ? 'IN' : 'CM';
+        $weightUnits = $packageParams->getWeightUnits() == Mage_Core_Helper_Measure_Weight::POUND ? 'LB' : 'KG';
+        $dimensionsUnits = $packageParams->getDimensionUnits() == Mage_Core_Helper_Measure_Length::INCH ? 'IN' : 'CM';
         $unitPrice = 0;
         $itemsQty = 0;
         $itemsDesc = [];
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -1379,8 +1379,8 @@ protected function _formShipmentRequest(Varien_Object $request)
         $height = $packageParams->getHeight();
         $width = $packageParams->getWidth();
         $length = $packageParams->getLength();
-        $weightUnits = $packageParams->getWeightUnits() == Zend_Measure_Weight::POUND ? 'LBS' : 'KGS';
-        $dimensionsUnits = $packageParams->getDimensionUnits() == Zend_Measure_Length::INCH ? 'IN' : 'CM';
+        $weightUnits = $packageParams->getWeightUnits() == Mage_Core_Helper_Measure_Weight::POUND ? 'LBS' : 'KGS';
+        $dimensionsUnits = $packageParams->getDimensionUnits() == Mage_Core_Helper_Measure_Length::INCH ? 'IN' : 'CM';
 
         $xmlRequest = new SimpleXMLElement('<?xml version = "1.0" ?><ShipmentConfirmRequest xml:lang="en-US"/>');
         $requestPart = $xmlRequest->addChild('Request');
@@ -1797,8 +1797,8 @@ protected function _formShipmentRestRequest(Varien_Object $request): string
         $width = $packageParams->getWidth();
         $length = $packageParams->getLength();
         $weight = $packageParams->getWeight();
-        $weightUnits = $packageParams->getWeightUnits() == Zend_Measure_Weight::POUND ? 'LBS' : 'KGS';
-        $dimensionsUnits = $packageParams->getDimensionUnits() == Zend_Measure_Length::INCH ? 'IN' : 'CM';
+        $weightUnits = $packageParams->getWeightUnits() == Mage_Core_Helper_Measure_Weight::POUND ? 'LBS' : 'KGS';
+        $dimensionsUnits = $packageParams->getDimensionUnits() == Mage_Core_Helper_Measure_Length::INCH ? 'IN' : 'CM';
 
         /**  Shipment API Payload */
         $shipParams = [
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
@@ -1353,11 +1353,11 @@ protected function _formUsExpressShipmentRequest(Varien_Object $request)
         $packageParams = $request->getPackageParams();
 
         $packageWeight = $request->getPackageWeight();
-        if ($packageParams->getWeightUnits() != Zend_Measure_Weight::OUNCE) {
+        if ($packageParams->getWeightUnits() != Mage_Core_Helper_Measure_Weight::OUNCE) {
             $packageWeight = round((float) Mage::helper('usa')->convertMeasureWeight(
                 $request->getPackageWeight(),
                 $packageParams->getWeightUnits(),
-                Zend_Measure_Weight::OUNCE,
+                Mage_Core_Helper_Measure_Weight::OUNCE,
             ));
         }
 
@@ -1424,11 +1424,11 @@ protected function _formUsSignatureConfirmationShipmentRequest(Varien_Object $re
         };
         $packageParams = $request->getPackageParams();
         $packageWeight = $request->getPackageWeight();
-        if ($packageParams->getWeightUnits() != Zend_Measure_Weight::OUNCE) {
+        if ($packageParams->getWeightUnits() != Mage_Core_Helper_Measure_Weight::OUNCE) {
             $packageWeight = round((float) Mage::helper('usa')->convertMeasureWeight(
                 $request->getPackageWeight(),
                 $packageParams->getWeightUnits(),
-                Zend_Measure_Weight::OUNCE,
+                Mage_Core_Helper_Measure_Weight::OUNCE,
             ));
         }
 
@@ -1501,37 +1501,37 @@ protected function _formIntlShipmentRequest(Varien_Object $request)
         $length = $packageParams->getLength();
         $girth = $packageParams->getGirth();
         $packageWeight = $request->getPackageWeight();
-        if ($packageParams->getWeightUnits() != Zend_Measure_Weight::POUND) {
+        if ($packageParams->getWeightUnits() != Mage_Core_Helper_Measure_Weight::POUND) {
             $packageWeight = Mage::helper('usa')->convertMeasureWeight(
                 $request->getPackageWeight(),
                 $packageParams->getWeightUnits(),
-                Zend_Measure_Weight::POUND,
+                Mage_Core_Helper_Measure_Weight::POUND,
             );
         }
 
-        if ($packageParams->getDimensionUnits() != Zend_Measure_Length::INCH) {
+        if ($packageParams->getDimensionUnits() != Mage_Core_Helper_Measure_Length::INCH) {
             $length = round((float) Mage::helper('usa')->convertMeasureDimension(
                 $packageParams->getLength(),
                 $packageParams->getDimensionUnits(),
-                Zend_Measure_Length::INCH,
+                Mage_Core_Helper_Measure_Length::INCH,
             ));
             $width = round((float) Mage::helper('usa')->convertMeasureDimension(
                 $packageParams->getWidth(),
                 $packageParams->getDimensionUnits(),
-                Zend_Measure_Length::INCH,
+                Mage_Core_Helper_Measure_Length::INCH,
             ));
             $height = round((float) Mage::helper('usa')->convertMeasureDimension(
                 $packageParams->getHeight(),
                 $packageParams->getDimensionUnits(),
-                Zend_Measure_Length::INCH,
+                Mage_Core_Helper_Measure_Length::INCH,
             ));
         }
 
-        if ($packageParams->getGirthDimensionUnits() != Zend_Measure_Length::INCH) {
+        if ($packageParams->getGirthDimensionUnits() != Mage_Core_Helper_Measure_Length::INCH) {
             $girth = round((float) Mage::helper('usa')->convertMeasureDimension(
                 $packageParams->getGirth(),
                 $packageParams->getGirthDimensionUnits(),
-                Zend_Measure_Length::INCH,
+                Mage_Core_Helper_Measure_Length::INCH,
             ));
         }
 
@@ -1650,11 +1650,11 @@ protected function _formIntlShipmentRequest(Varien_Object $request)
             $item->setData($itemShipment);
 
             $itemWeight = $item->getWeight() * $item->getQty();
-            if ($packageParams->getWeightUnits() != Zend_Measure_Weight::POUND) {
+            if ($packageParams->getWeightUnits() != Mage_Core_Helper_Measure_Weight::POUND) {
                 $itemWeight = Mage::helper('usa')->convertMeasureWeight(
                     $itemWeight,
                     $packageParams->getWeightUnits(),
-                    Zend_Measure_Weight::POUND,
+                    Mage_Core_Helper_Measure_Weight::POUND,
                 );
             }
 
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
