projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update to Drupal 8.4.6
[yaffs-website]
/
vendor
/
doctrine
/
collections
/
lib
/
Doctrine
/
Common
/
Collections
/
Criteria.php
diff --git
a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
index 3f9d43a8294e7ccce12a7ec137c48c3d9854108a..748a08474800f190d79884071b5fe4cac7c59053 100644
(file)
--- a/
vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
+++ b/
vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
@@
-53,7
+53,7
@@
class Criteria
/**
* @var string[]
*/
/**
* @var string[]
*/
- private $orderings =
array()
;
+ private $orderings =
[]
;
/**
* @var int|null
/**
* @var int|null
@@
-137,9
+137,10
@@
class Criteria
return $this->where($expression);
}
return $this->where($expression);
}
- $this->expression = new CompositeExpression(CompositeExpression::TYPE_AND, array(
- $this->expression, $expression
- ));
+ $this->expression = new CompositeExpression(
+ CompositeExpression::TYPE_AND,
+ [$this->expression, $expression]
+ );
return $this;
}
return $this;
}
@@
-158,9
+159,10
@@
class Criteria
return $this->where($expression);
}
return $this->where($expression);
}
- $this->expression = new CompositeExpression(CompositeExpression::TYPE_OR, array(
- $this->expression, $expression
- ));
+ $this->expression = new CompositeExpression(
+ CompositeExpression::TYPE_OR,
+ [$this->expression, $expression]
+ );
return $this;
}
return $this;
}
@@
-200,7
+202,7
@@
class Criteria
public function orderBy(array $orderings)
{
$this->orderings = array_map(
public function orderBy(array $orderings)
{
$this->orderings = array_map(
- function (
$ordering)
{
+ function (
string $ordering) : string
{
return strtoupper($ordering) === Criteria::ASC ? Criteria::ASC : Criteria::DESC;
},
$orderings
return strtoupper($ordering) === Criteria::ASC ? Criteria::ASC : Criteria::DESC;
},
$orderings