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
/
ClassAttributesMatcher.php
diff --git
a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
index 13a1746f6f6701e181851a272bc8913402890682..8e976b0a261ff5bceb5257c10251c03365b6ded0 100644
(file)
--- a/
vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
+++ b/
vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
@@
-28,10
+28,10
@@
class ClassAttributesMatcher extends AbstractMatcher
{
$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 nekudotayim operator
if (self::tokenIs($firstToken, self::T_STRING)) {
// second token is the nekudotayim operator
- array_pop($tokens);
+
\
array_pop($tokens);
}
$class = $this->getNamespaceAndClass($tokens);
}
$class = $this->getNamespaceAndClass($tokens);
@@
-42,21
+42,24
@@
class ClassAttributesMatcher extends AbstractMatcher
return [];
}
return [];
}
- $vars = array_merge(
- array_map(
+ $vars =
\
array_merge(
+
\
array_map(
function ($var) {
return '$' . $var;
},
function ($var) {
return '$' . $var;
},
- array_keys($reflection->getStaticProperties())
+
\
array_keys($reflection->getStaticProperties())
),
),
- array_keys($reflection->getConstants())
+
\
array_keys($reflection->getConstants())
);
);
- return array_map(
+ return
\
array_map(
function ($name) use ($class) {
function ($name) use ($class) {
- return $class . '::' . $name;
+ $chunks = \explode('\\', $class);
+ $className = \array_pop($chunks);
+
+ return $className . '::' . $name;
},
},
- array_filter(
+
\
array_filter(
$vars,
function ($var) use ($input) {
return AbstractMatcher::startsWith($input, $var);
$vars,
function ($var) use ($input) {
return AbstractMatcher::startsWith($input, $var);
@@
-70,8
+73,8
@@
class ClassAttributesMatcher extends AbstractMatcher
*/
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($prevToken, self::T_DOUBLE_COLON) && self::tokenIs($token, self::T_STRING):
switch (true) {
case self::tokenIs($prevToken, self::T_DOUBLE_COLON) && self::tokenIs($token, self::T_STRING):