Skip to content

Commit 65674a9

Browse files
OcramiusOcramius
authored
Merge pull request #29 from laminas/2.13.x-merge-up-into-2.14.x_nlm2HiVi
Merge release 2.13.1 into 2.14.x
2 parents a7e1010 + 327f2ae commit 65674a9

File tree

5 files changed

+138
-146
lines changed

5 files changed

+138
-146
lines changed

‎psalm-baseline.xml‎

Lines changed: 6 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
2+
<files psalm-version="4.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff">
33
<file src="src/AbstractValue.php">
44
<ArgumentTypeCoercion occurrences="1">
55
<code>$newGenerator</code>
@@ -11,9 +11,6 @@
1111
<InvalidMethodCall occurrences="1">
1212
<code>children</code>
1313
</InvalidMethodCall>
14-
<InvalidParamDefault occurrences="1">
15-
<code>Laminas\XmlRpc\Value::constant</code>
16-
</InvalidParamDefault>
1714
<InvalidPropertyFetch occurrences="1">
1815
<code>$value-&gt;member</code>
1916
</InvalidPropertyFetch>
@@ -55,9 +52,6 @@
5552
<code>$value</code>
5653
<code>$value</code>
5754
</MixedAssignment>
58-
<MixedInferredReturnType occurrences="1">
59-
<code>AbstractValue</code>
60-
</MixedInferredReturnType>
6155
<MixedPropertyFetch occurrences="4">
6256
<code>$data-&gt;value</code>
6357
<code>$member-&gt;name</code>
@@ -89,12 +83,6 @@
8983
<UndefinedClass occurrences="1">
9084
<code>new $generator($encoding)</code>
9185
</UndefinedClass>
92-
<UndefinedConstant occurrences="1">
93-
<code>Laminas\XmlRpc\Value::constant</code>
94-
</UndefinedConstant>
95-
<UndefinedDocblockClass occurrences="1">
96-
<code>Laminas\XmlRpc\Value::constant</code>
97-
</UndefinedDocblockClass>
9886
<UndefinedMethod occurrences="1">
9987
<code>generate</code>
10088
</UndefinedMethod>
@@ -107,9 +95,8 @@
10795
<code>$httpRequest-&gt;getUriString() === null</code>
10896
<code>is_array($params)</code>
10997
</DocblockTypeContradiction>
110-
<InvalidArgument occurrences="2">
98+
<InvalidArgument occurrences="1">
11199
<code>$method</code>
112-
<code>$type</code>
113100
</InvalidArgument>
114101
<MixedArgument occurrences="1">
115102
<code>$type</code>
@@ -203,9 +190,6 @@
203190
<DocblockTypeContradiction occurrences="1">
204191
<code>is_string($fault)</code>
205192
</DocblockTypeContradiction>
206-
<InvalidArgument occurrences="1">
207-
<code>AbstractValue::XML_STRING</code>
208-
</InvalidArgument>
209193
<InvalidScalarArgument occurrences="1">
210194
<code>$code</code>
211195
</InvalidScalarArgument>
@@ -310,10 +294,6 @@
310294
<code>! is_string($method)</code>
311295
<code>is_string($request)</code>
312296
</DocblockTypeContradiction>
313-
<InvalidArgument occurrences="2">
314-
<code>$type</code>
315-
<code>AbstractValue::XML_STRING</code>
316-
</InvalidArgument>
317297
<MixedArgument occurrences="1">
318298
<code>$type</code>
319299
</MixedArgument>
@@ -391,9 +371,6 @@
391371
<DocblockTypeContradiction occurrences="1">
392372
<code>is_string($response)</code>
393373
</DocblockTypeContradiction>
394-
<InvalidArgument occurrences="1">
395-
<code>AbstractValue::XML_STRING</code>
396-
</InvalidArgument>
397374
<MixedAssignment occurrences="1">
398375
<code>$valueXml</code>
399376
</MixedAssignment>
@@ -591,9 +568,6 @@
591568
</PossiblyUndefinedMethod>
592569
</file>
593570
<file src="src/Value/AbstractCollection.php">
594-
<InvalidArgument occurrences="1">
595-
<code>self::AUTO_DETECT_TYPE</code>
596-
</InvalidArgument>
597571
<MixedArrayAssignment occurrences="1">
598572
<code>$this-&gt;value[$key]</code>
599573
</MixedArrayAssignment>
@@ -667,9 +641,6 @@
667641
<PropertyNotSetInConstructor occurrences="1">
668642
<code>Boolean</code>
669643
</PropertyNotSetInConstructor>
670-
<RedundantCastGivenDocblockType occurrences="1">
671-
<code>(bool) $value</code>
672-
</RedundantCastGivenDocblockType>
673644
</file>
674645
<file src="src/Value/DateTime.php">
675646
<InvalidScalarArgument occurrences="1">
@@ -745,35 +716,21 @@
745716
</MixedInferredReturnType>
746717
</file>
747718
<file src="test/BigIntegerValueTest.php">
748-
<InvalidArgument occurrences="4">
749-
<code>AbstractValue::XMLRPC_TYPE_I8</code>
750-
<code>AbstractValue::XMLRPC_TYPE_I8</code>
751-
<code>AbstractValue::XML_STRING</code>
752-
<code>AbstractValue::XML_STRING</code>
753-
</InvalidArgument>
754719
<MissingReturnType occurrences="3">
755720
<code>testMarschalBigIntegerFromApacheXmlRpc</code>
756721
<code>testMarschalBigIntegerFromXmlRpc</code>
757722
<code>testMarshalsIntegerForI8ValueByDefaultIfSystemIs64Bit</code>
758723
</MissingReturnType>
759-
<MixedArgument occurrences="1">
760-
<code>$e-&gt;getMessage()</code>
761-
</MixedArgument>
762-
<UndefinedClass occurrences="2">
763-
<code>$e</code>
764-
<code>Exception</code>
765-
</UndefinedClass>
766724
<UnusedVariable occurrences="2">
767725
<code>$bigInteger</code>
768726
<code>$bigInteger</code>
769727
</UnusedVariable>
770728
</file>
771729
<file src="test/ClientTest.php">
772-
<InvalidArgument occurrences="4">
730+
<InvalidArgument occurrences="3">
773731
<code>$method</code>
774732
<code>'1'</code>
775733
<code>'add'</code>
776-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
777734
</InvalidArgument>
778735
<MissingReturnType occurrences="3">
779736
<code>mockHttpClient</code>
@@ -1240,78 +1197,11 @@
12401197
<ForbiddenCode occurrences="1">
12411198
<code>var_dump($x)</code>
12421199
</ForbiddenCode>
1243-
<InvalidArgument occurrences="41">
1244-
<code>$type</code>
1245-
<code>$type</code>
1246-
<code>AbstractValue::AUTO_DETECT_TYPE</code>
1247-
<code>AbstractValue::XMLRPC_TYPE_ARRAY</code>
1248-
<code>AbstractValue::XMLRPC_TYPE_BASE64</code>
1249-
<code>AbstractValue::XMLRPC_TYPE_BASE64</code>
1250-
<code>AbstractValue::XMLRPC_TYPE_BASE64</code>
1251-
<code>AbstractValue::XMLRPC_TYPE_BOOLEAN</code>
1252-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
1253-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
1254-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
1255-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
1256-
<code>AbstractValue::XMLRPC_TYPE_DATETIME</code>
1257-
<code>AbstractValue::XMLRPC_TYPE_DOUBLE</code>
1258-
<code>AbstractValue::XMLRPC_TYPE_DOUBLE</code>
1259-
<code>AbstractValue::XMLRPC_TYPE_DOUBLE</code>
1260-
<code>AbstractValue::XMLRPC_TYPE_I4</code>
1261-
<code>AbstractValue::XMLRPC_TYPE_INTEGER</code>
1262-
<code>AbstractValue::XMLRPC_TYPE_STRING</code>
1263-
<code>AbstractValue::XMLRPC_TYPE_STRUCT</code>
1264-
<code>AbstractValue::XMLRPC_TYPE_STRUCT</code>
1265-
<code>AbstractValue::XML_STRING</code>
1266-
<code>AbstractValue::XML_STRING</code>
1267-
<code>AbstractValue::XML_STRING</code>
1268-
<code>AbstractValue::XML_STRING</code>
1269-
<code>AbstractValue::XML_STRING</code>
1270-
<code>AbstractValue::XML_STRING</code>
1271-
<code>AbstractValue::XML_STRING</code>
1272-
<code>AbstractValue::XML_STRING</code>
1273-
<code>AbstractValue::XML_STRING</code>
1274-
<code>AbstractValue::XML_STRING</code>
1275-
<code>AbstractValue::XML_STRING</code>
1276-
<code>AbstractValue::XML_STRING</code>
1277-
<code>AbstractValue::XML_STRING</code>
1278-
<code>AbstractValue::XML_STRING</code>
1279-
<code>AbstractValue::XML_STRING</code>
1280-
<code>AbstractValue::XML_STRING</code>
1281-
<code>AbstractValue::XML_STRING</code>
1282-
<code>AbstractValue::XML_STRING</code>
1283-
<code>AbstractValue::XML_STRING</code>
1284-
<code>AbstractValue::XML_STRING</code>
1285-
</InvalidArgument>
1286-
<MissingReturnType occurrences="26">
1287-
<code>testArrayMustContainDataElement</code>
1288-
<code>testEmptyXmlRpcArrayResultsInEmptyArray</code>
1289-
<code>testMarshalArrayFromXmlRpc</code>
1200+
<MissingReturnType occurrences="1">
12901201
<code>testMarshalBase64FromString</code>
1291-
<code>testMarshalBase64FromXmlRpc</code>
1292-
<code>testMarshalBooleanFromXmlRpc</code>
1293-
<code>testMarshalDateTimeFromDateTimeAndAutodetectingType</code>
1294-
<code>testMarshalDateTimeFromFromDateTime</code>
1295-
<code>testMarshalDateTimeFromXmlRpc</code>
1296-
<code>testMarshalDoubleFromXmlRpc</code>
1297-
<code>testMarshalI4FromOverlongNativeThrowsException</code>
1298-
<code>testMarshalIntegerFromXmlRpc</code>
1299-
<code>testMarshalNilFromXmlRpc</code>
1300-
<code>testMarshalSerializedObjectAsBase64</code>
1301-
<code>testMarshalStringFromDefault</code>
1302-
<code>testMarshalStringFromXmlRpc</code>
1303-
<code>testMarshalStructFromXmlRpc</code>
1304-
<code>testMarshalStructFromXmlRpcWithEntities</code>
1305-
<code>testMarshallingDoubleWithHigherPrecisionFromNative</code>
1306-
<code>testMarshallingDoubleWithHigherPrecisionFromNativeWithTrailingZeros</code>
1307-
<code>testMarshallingNestedStructFromXmlRpc</code>
1308-
<code>testMarshallingStructWithMemberWithoutName</code>
1309-
<code>testMarshallingStructWithMemberWithoutValue</code>
1310-
<code>testMarshallingStructWithMultibyteValueFromXmlRpcRetainsMultibyteValue</code>
1311-
<code>testMarshallingStructsWithEmptyValueFromXmlRpcShouldRetainKeys</code>
1312-
<code>testXmlRpcValueBase64GeneratedXmlContainsBase64EncodedText</code>
13131202
</MissingReturnType>
1314-
<MixedArgument occurrences="2">
1203+
<MixedArgument occurrences="3">
1204+
<code>$val-&gt;getValue()</code>
13151205
<code>$val-&gt;getValue()</code>
13161206
<code>$val-&gt;getValue()</code>
13171207
</MixedArgument>

‎src/AbstractValue.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ public function generateXml()
201201
* $libXmlOptions parameter; as an example, you might use LIBXML_PARSEHUGE.
202202
* See https://www.php.net/manual/en/libxml.constants.php for a full list.
203203
*
204-
* @param mixed $value
205-
* @param Laminas\XmlRpc\Value::constant $type
204+
* @param mixed $value
205+
* @param self::AUTO_DETECT_TYPE|self::XML* $type
206206
* @param int $libXmlOptions Bitmask of LIBXML options to use for XML * operations
207207
* @throws ValueException
208208
* @return AbstractValue

‎src/Value/Boolean.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace Laminas\XmlRpc\Value;
44

5+
use function filter_var;
6+
7+
use const FILTER_VALIDATE_BOOLEAN;
8+
59
class Boolean extends AbstractScalar
610
{
711
/**
@@ -15,7 +19,7 @@ public function __construct($value)
1519
$this->type = self::XMLRPC_TYPE_BOOLEAN;
1620
// Make sure the value is boolean and then convert it into an integer
1721
// The double conversion is because a bug in the LaminasOptimizer in PHP version 5.0.4
18-
$this->value = (int) (bool) $value;
22+
$this->value = (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
1923
}
2024

2125
/**

‎test/BigIntegerValueTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace LaminasTest\XmlRpc;
66

7+
use Laminas\Math\BigInteger\Exception\RuntimeException;
78
use Laminas\XmlRpc\AbstractValue;
89
use Laminas\XmlRpc\Generator\GeneratorInterface as Generator;
910
use Laminas\XmlRpc\Value\BigInteger;
@@ -31,7 +32,7 @@ protected function setUp(): void
3132
}
3233
try {
3334
new BigInteger(0);
34-
} catch (Exception $e) {
35+
} catch (RuntimeException $e) {
3536
$this->markTestSkipped($e->getMessage());
3637
}
3738
}

0 commit comments

Comments
 (0)