Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/3520' into develop

Forward port #3520

Conflicts:
	library/Zend/Http/Response/Stream.php
  • Loading branch information...
commit 420991f097bc666f9b76a4eb7bfdcc4390aa16ca 2 parents ce1b8ba + 4801dff
@weierophinney weierophinney authored
View
2  library/Zend/Db/Sql/Delete.php
@@ -124,7 +124,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
} elseif (is_string($pkey)) {
// Otherwise, if still a string, do something intelligent with the PHP type provided
- if (is_null($pvalue)) {
+ if ($pvalue === null) {
// map PHP null to SQL IS NULL expression
$predicate = new Predicate\IsNull($pkey, $pvalue);
} elseif (is_array($pvalue)) {
View
2  library/Zend/Db/Sql/Insert.php
@@ -219,7 +219,7 @@ public function getSqlString(PlatformInterface $adapterPlatform = null)
if ($value instanceof Expression) {
$exprData = $this->processExpression($value, $adapterPlatform);
$values[] = $exprData->getSql();
- } elseif (is_null($value)) {
+ } elseif ($value === null) {
$values[] = 'NULL';
} else {
$values[] = $adapterPlatform->quoteValue($value);
View
4 library/Zend/Db/Sql/Predicate/Between.php
@@ -28,10 +28,10 @@ public function __construct($identifier = null, $minValue = null, $maxValue = nu
if ($identifier) {
$this->setIdentifier($identifier);
}
- if (!is_null($minValue)) {
+ if ($minValue !== null) {
$this->setMinValue($minValue);
}
- if (!is_null($maxValue)) {
+ if ($maxValue !== null) {
$this->setMaxValue($maxValue);
}
}
View
2  library/Zend/Db/Sql/Select.php
@@ -260,7 +260,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
} elseif (is_string($pkey)) {
// Otherwise, if still a string, do something intelligent with the PHP type provided
- if (is_null($pvalue)) {
+ if ($pvalue === null) {
// map PHP null to SQL IS NULL expression
$predicate = new Predicate\IsNull($pkey, $pvalue);
} elseif (is_array($pvalue)) {
View
6 library/Zend/Db/Sql/Update.php
@@ -119,7 +119,7 @@ public function set(array $values, $flag = self::VALUES_SET)
*/
public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
{
- if (is_null($predicate)) {
+ if ($predicate === null) {
throw new Exception\InvalidArgumentException('Predicate cannot be null');
}
@@ -145,7 +145,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
} elseif (is_string($pkey)) {
// Otherwise, if still a string, do something intelligent with the PHP type provided
- if (is_null($pvalue)) {
+ if ($pvalue === null) {
// map PHP null to SQL IS NULL expression
$predicate = new Predicate\IsNull($pkey, $pvalue);
} elseif (is_array($pvalue)) {
@@ -269,7 +269,7 @@ public function getSqlString(PlatformInterface $adapterPlatform = null)
if ($value instanceof Expression) {
$exprData = $this->processExpression($value, $adapterPlatform);
$setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
- } elseif (is_null($value)) {
+ } elseif ($value === null) {
$setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = NULL';
} else {
$setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $adapterPlatform->quoteValue($value);
View
2  library/Zend/Form/Element/Select.php
@@ -75,7 +75,7 @@ public function setValueOptions(array $options)
$this->valueOptions = $options;
// Update InArrayValidator validator haystack
- if (!is_null($this->validator)) {
+ if (null !== $this->validator) {
if ($this->validator instanceof InArrayValidator){
$validator = $this->validator;
}
View
2  library/Zend/Http/Client.php
@@ -606,7 +606,7 @@ public function setStream($streamfile = true)
*/
public function getStream()
{
- if (!is_null($this->streamName)) {
+ if (null !== $this->streamName) {
return $this->streamName;
}
View
2  library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -61,7 +61,7 @@ public function getEscaper()
*/
public function setEncoding($encoding)
{
- if (!is_null($this->escaper)) {
+ if (null !== $this->escaper) {
throw new Exception\InvalidArgumentException(
'Character encoding settings cannot be changed once the Helper has been used or '
. ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
View
2  library/Zend/View/Model/JsonModel.php
@@ -61,7 +61,7 @@ public function serialize()
$variables = ArrayUtils::iteratorToArray($variables);
}
- if (!is_null($this->jsonpCallback)) {
+ if (null !== $this->jsonpCallback) {
return $this->jsonpCallback.'('.Json::encode($variables).');';
}
return Json::encode($variables);
View
2  library/Zend/View/Renderer/JsonRenderer.php
@@ -102,7 +102,7 @@ public function setJsonpCallback($callback)
*/
public function hasJsonpCallback()
{
- return !is_null($this->jsonpCallback);
+ return (null !== $this->jsonpCallback);
}
/**
View
2  library/Zend/XmlRpc/AbstractValue.php
@@ -254,7 +254,7 @@ public static function getXmlRpcTypeByValue($value)
return self::XMLRPC_TYPE_DOUBLE;
} elseif (is_bool($value)) {
return self::XMLRPC_TYPE_BOOLEAN;
- } elseif (is_null($value)) {
+ } elseif (null === $value) {
return self::XMLRPC_TYPE_NIL;
} elseif (is_string($value)) {
return self::XMLRPC_TYPE_STRING;
Please sign in to comment.
Something went wrong with that request. Please try again.