projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
psy
/
psysh
/
src
/
TabCompletion
/
Matcher
/
ObjectAttributesMatcher.php
diff --git
a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
index bed365a8208ce640e4888769b2205ef62f365009..ff44f5ac12f9e2ff524a68841b0d04c006722083 100644
(file)
--- a/
vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
+++ b/
vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
@@
-30,16
+30,16
@@
class ObjectAttributesMatcher extends AbstractContextAwareMatcher
{
$input = $this->getInput($tokens);
{
$input = $this->getInput($tokens);
- $firstToken = array_pop($tokens);
+ $firstToken =
\
array_pop($tokens);
if (self::tokenIs($firstToken, self::T_STRING)) {
// second token is the object operator
if (self::tokenIs($firstToken, self::T_STRING)) {
// second token is the object operator
- array_pop($tokens);
+
\
array_pop($tokens);
}
}
- $objectToken = array_pop($tokens);
- if (!is_array($objectToken)) {
+ $objectToken =
\
array_pop($tokens);
+ if (!
\
is_array($objectToken)) {
return [];
}
return [];
}
- $objectName = str_replace('$', '', $objectToken[1]);
+ $objectName =
\
str_replace('$', '', $objectToken[1]);
try {
$object = $this->getVariable($objectName);
try {
$object = $this->getVariable($objectName);
@@
-47,12
+47,12
@@
class ObjectAttributesMatcher extends AbstractContextAwareMatcher
return [];
}
return [];
}
- if (!is_object($object)) {
+ if (!
\
is_object($object)) {
return [];
}
return [];
}
- return array_filter(
-
array_keys(get_class_vars(
get_class($object))),
+ return
\
array_filter(
+
\array_keys(\get_class_vars(\
get_class($object))),
function ($var) use ($input) {
return AbstractMatcher::startsWith($input, $var);
}
function ($var) use ($input) {
return AbstractMatcher::startsWith($input, $var);
}
@@
-64,8
+64,8
@@
class ObjectAttributesMatcher extends AbstractContextAwareMatcher
*/
public function hasMatched(array $tokens)
{
*/
public function hasMatched(array $tokens)
{
- $token = array_pop($tokens);
- $prevToken = array_pop($tokens);
+ $token =
\
array_pop($tokens);
+ $prevToken =
\
array_pop($tokens);
switch (true) {
case self::tokenIs($token, self::T_OBJECT_OPERATOR):
switch (true) {
case self::tokenIs($token, self::T_OBJECT_OPERATOR):