opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/core/modules/locale/src/StringBase.php
View file

@ -57,7 +57,7 @@ abstract class StringBase implements StringInterface {
* @param object|array $values
* Object or array with initial values.
*/
public function __construct($values = array()) {
public function __construct($values = []) {
$this->setValues((array) $values);
}
@ -137,7 +137,7 @@ abstract class StringBase implements StringInterface {
* {@inheritdoc}
*/
public function getValues(array $fields) {
$values = array();
$values = [];
foreach ($fields as $field) {
if (isset($this->$field)) {
$values[$field] = $this->$field;
@ -151,12 +151,12 @@ abstract class StringBase implements StringInterface {
*/
public function getLocations($check_only = FALSE) {
if (!isset($this->locations) && !$check_only) {
$this->locations = array();
foreach ($this->getStorage()->getLocations(array('sid' => $this->getId())) as $location) {
$this->locations = [];
foreach ($this->getStorage()->getLocations(['sid' => $this->getId()]) as $location) {
$this->locations[$location->type][$location->name] = $location->lid;
}
}
return isset($this->locations) ? $this->locations : array();
return isset($this->locations) ? $this->locations : [];
}
/**