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
/
ArrayCollection.php
diff --git
a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
index 7ddd068e56264f73e8a2e492c5c7e9b71daf8876..0bebce20005efa240ccd6b60b1da429c00f6eff8 100644
(file)
--- a/
vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
+++ b/
vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
@@
-50,7
+50,7
@@
class ArrayCollection implements Collection, Selectable
*
* @param array $elements
*/
*
* @param array $elements
*/
- public function __construct(array $elements =
array()
)
+ public function __construct(array $elements =
[]
)
{
$this->elements = $elements;
}
{
$this->elements = $elements;
}
@@
-177,7
+177,8
@@
class ArrayCollection implements Collection, Selectable
public function offsetSet($offset, $value)
{
if ( ! isset($offset)) {
public function offsetSet($offset, $value)
{
if ( ! isset($offset)) {
- return $this->add($value);
+ $this->add($value);
+ return;
}
$this->set($offset, $value);
}
$this->set($offset, $value);
@@
-190,7
+191,7
@@
class ArrayCollection implements Collection, Selectable
*/
public function offsetUnset($offset)
{
*/
public function offsetUnset($offset)
{
-
return
$this->remove($offset);
+ $this->remove($offset);
}
/**
}
/**
@@
-236,7
+237,7
@@
class ArrayCollection implements Collection, Selectable
*/
public function get($key)
{
*/
public function get($key)
{
- return
isset($this->elements[$key]) ? $this->elements[$key] :
null;
+ return
$this->elements[$key] ??
null;
}
/**
}
/**
@@
-301,6
+302,8
@@
class ArrayCollection implements Collection, Selectable
/**
* {@inheritDoc}
/**
* {@inheritDoc}
+ *
+ * @return static
*/
public function map(Closure $func)
{
*/
public function map(Closure $func)
{
@@
-309,6
+312,8
@@
class ArrayCollection implements Collection, Selectable
/**
* {@inheritDoc}
/**
* {@inheritDoc}
+ *
+ * @return static
*/
public function filter(Closure $p)
{
*/
public function filter(Closure $p)
{
@@
-334,7
+339,7
@@
class ArrayCollection implements Collection, Selectable
*/
public function partition(Closure $p)
{
*/
public function partition(Closure $p)
{
- $matches = $noMatches =
array()
;
+ $matches = $noMatches =
[]
;
foreach ($this->elements as $key => $element) {
if ($p($key, $element)) {
foreach ($this->elements as $key => $element) {
if ($p($key, $element)) {
@@
-344,7
+349,7
@@
class ArrayCollection implements Collection, Selectable
}
}
}
}
- return
array($this->createFrom($matches), $this->createFrom($noMatches))
;
+ return
[$this->createFrom($matches), $this->createFrom($noMatches)]
;
}
/**
}
/**
@@
-362,7
+367,7
@@
class ArrayCollection implements Collection, Selectable
*/
public function clear()
{
*/
public function clear()
{
- $this->elements =
array()
;
+ $this->elements =
[]
;
}
/**
}
/**