Disable bigint for 64 bit machines

CHANGELOG.md

@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+Disables use of BigInteger for XMLRPC i8 type if host machine is 64-bit.
 
 ### Deprecated
 

docs/book/client.md

@@ -133,8 +133,8 @@ XML-RPC Type     | `Zend\XmlRpc\AbstractValue` Constant               | `Zend\Xm
 ---------------- | -------------------------------------------------- | --------------------------
 int              | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_INTEGER`   | `Zend\XmlRpc\Value\Integer`
 i4               | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_I4`        | `Zend\XmlRpc\Value\Integer`
-i8               | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_I8`        | `Zend\XmlRpc\Value\BigInteger`
-ex:i8            | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_APACHEI8`  | `Zend\XmlRpc\Value\BigInteger`
+i8               | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_I8`        | `Zend\XmlRpc\Value\BigInteger` or `Zend\XmlRpc\Value\Integer` if machine is 64-bit
+ex:i8            | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_APACHEI8`  | `Zend\XmlRpc\Value\BigInteger` or `Zend\XmlRpc\Value\Integer` if machine is 64-bit
 double           | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_DOUBLE`    | `Zend\XmlRpc\ValueDouble`
 boolean          | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_BOOLEAN`   | `Zend\XmlRpc\Value\Boolean`
 string           | `Zend\XmlRpc\AbstractValue::XMLRPC_TYPE_STRING`    | `Zend\XmlRpc\Value\Text`

src/AbstractValue.php

@@ -43,6 +43,14 @@ abstract class AbstractValue
      */
     protected $xml;
 
+    /**
+     * True if BigInteger should be used for XMLRPC i8 types
+     *
+     * @internal
+     * @var bool
+     */
+    public static $USE_BIGINT_FOR_I8 = PHP_INT_SIZE < 8;
+
     /**
      * @var \Zend\XmlRpc\Generator\GeneratorInterface
      */
@@ -193,7 +201,7 @@ public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE)
             case self::XMLRPC_TYPE_I8:
                 // fall through to the next case
             case self::XMLRPC_TYPE_APACHEI8:
-                return new Value\BigInteger($value);
+                return self::$USE_BIGINT_FOR_I8 ? new Value\BigInteger($value) : new Value\Integer($value);
 
             case self::XMLRPC_TYPE_DOUBLE:
                 return new Value\Double($value);
@@ -337,7 +345,7 @@ protected static function xmlStringToNativeXmlRpc($xml)
             case self::XMLRPC_TYPE_APACHEI8:
                 // Fall through to the next case
             case self::XMLRPC_TYPE_I8:
-                $xmlrpcValue = new Value\BigInteger($value);
+                $xmlrpcValue = self::$USE_BIGINT_FOR_I8 ? new Value\BigInteger($value) : new Value\Integer($value);
                 break;
             case self::XMLRPC_TYPE_DOUBLE:
                 $xmlrpcValue = new Value\Double($value);

test/BigIntegerValueTest.php

@@ -12,15 +12,22 @@
 use PHPUnit\Framework\TestCase;
 use Zend\XmlRpc\AbstractValue;
 use Zend\XmlRpc\Value\BigInteger;
+use Zend\XmlRpc\Value\Integer;
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
  * @group      Zend_XmlRpc
  */
 class BigIntegerValueTest extends TestCase
 {
+    /** @var null|bool */
+    protected $useBigIntForI8Flag;
+
     public function setUp()
     {
+        $this->useBigIntForI8Flag = AbstractValue::$USE_BIGINT_FOR_I8;
+        AbstractValue::$USE_BIGINT_FOR_I8 = true;
+
         if (extension_loaded('gmp')) {
             $this->markTestSkipped('gmp causes test failure');
         }
@@ -31,6 +38,12 @@ public function setUp()
         }
     }
 
+    public function tearDown()
+    {
+        AbstractValue::$USE_BIGINT_FOR_I8 = $this->useBigIntForI8Flag;
+        $this->useBigIntForI8Flag = null;
+    }
+
     // BigInteger
 
     /**
@@ -136,4 +149,22 @@ public function wrapXml($xml)
     {
         return $xml . "\n";
     }
+
+    public function testMarshalsIntegerForI8ValueByDefaultIfSystemIs64Bit()
+    {
+        if ($this->useBigIntForI8Flag) {
+            $this->markTestSkipped('Test only valid for 64bit systems');
+        }
+
+        AbstractValue::$USE_BIGINT_FOR_I8 = $this->useBigIntForI8Flag;
+        $integerValue = PHP_INT_MAX;
+
+        $value = AbstractValue::getXmlRpcValue(
+            $integerValue,
+            AbstractValue::XMLRPC_TYPE_I8
+        );
+
+        $this->assertEquals(AbstractValue::XMLRPC_TYPE_INTEGER, $value->getType());
+        $this->assertSame($integerValue, $value->getValue());
+    }
 }