Laravel version update

Laravel version update
This commit is contained in:
Manish Verma
2018-08-06 18:48:58 +05:30
parent d143048413
commit 126fbb0255
13678 changed files with 1031482 additions and 778530 deletions

View File

@@ -5,11 +5,13 @@ namespace JmesPath;
* Returns data from the input array that matches a JMESPath expression.
*
* @param string $expression Expression to search.
* @param mixed $data Data to search.
* @param mixed $data Data to search.
*
* @return mixed|null
*/
function search($expression, $data)
{
return Env::search($expression, $data);
if (!function_exists(__NAMESPACE__ . '\search')) {
function search($expression, $data)
{
return Env::search($expression, $data);
}
}

View File

@@ -401,8 +401,8 @@ class TreeCompiler
$this->write('$value = !Utils::isEqual(%s, %s);', $a, $b);
} else {
$this->write(
'$value = is_int(%s) && is_int(%s) && %s %s %s;',
$a, $b, $a, $node['value'], $b
'$value = (is_int(%s) || is_float(%s)) && (is_int(%s) || is_float(%s)) && %s %s %s;',
$a, $a, $b, $b, $a, $node['value'], $b
);
}

View File

@@ -220,7 +220,7 @@ class TreeInterpreter
*/
private static function relativeCmp($left, $right, $cmp)
{
if (!is_int($left) || !is_int($right)) {
if (!(is_int($left) || is_float($left)) || !(is_int($right) || is_float($right))) {
return false;
}