From e6d03df3603ec3bb444eddfc95447e70a4b2a8f7 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Sun, 29 Oct 2017 17:29:16 -0700 Subject: [PATCH] refactor(index): rename isGlobal to isMember isGlobal was confusing because a non-member can be considered global vs namespaced --- src/CompletionProvider.php | 6 +++--- src/Definition.php | 5 +++-- src/DefinitionResolver.php | 2 +- .../cases/WithReturnTypehints.php.expected.json | 10 +++++----- ...sClassMembersShouldNotBeSymbols.php.expected.json | 2 +- .../arrayValueShouldBeBoolean.php.expected.json | 4 ++-- .../cases/caseStatement1.php.expected.json | 2 +- .../cases/classDefinition1.php.expected.json | 6 +++--- .../cases/classProperty1.php.expected.json | 8 ++++---- tests/Validation/cases/constants.php.expected.json | 6 +++--- tests/Validation/cases/constants2.php.expected.json | 6 +++--- tests/Validation/cases/constants3.php.expected.json | 6 +++--- tests/Validation/cases/constants4.php.expected.json | 6 +++--- tests/Validation/cases/constants5.php.expected.json | 6 +++--- ...constantsInFunctionParamDefault.php.expected.json | 4 ++-- .../docBlocksOnNamespaceDefinition.php.expected.json | 2 +- tests/Validation/cases/exceptions1.php.expected.json | 2 +- .../Validation/cases/ifStatement1.php.expected.json | 2 +- .../cases/interfaceProperty.php.expected.json | 2 +- .../magicConstantsShouldBeGlobal.php.expected.json | 2 +- tests/Validation/cases/magicConsts.php.expected.json | 4 ++-- .../Validation/cases/memberAccess1.php.expected.json | 6 +++--- .../Validation/cases/memberAccess2.php.expected.json | 6 +++--- .../Validation/cases/memberAccess3.php.expected.json | 6 +++--- .../Validation/cases/memberAccess4.php.expected.json | 6 +++--- .../Validation/cases/memberAccess5.php.expected.json | 6 +++--- tests/Validation/cases/memberCall1.php.expected.json | 6 +++--- .../cases/methodReturnType.php.expected.json | 4 ++-- .../cases/multipleNamespaces.php.expected.json | 12 ++++++------ .../multiplePreceedingComments.php.expected.json | 4 ++-- tests/Validation/cases/nameToken.php.expected.json | 4 ++-- tests/Validation/cases/namespaces2.php.expected.json | 2 +- tests/Validation/cases/namespaces5.php.expected.json | 2 +- tests/Validation/cases/namespaces6.php.expected.json | 2 +- tests/Validation/cases/namespaces8.php.expected.json | 2 +- .../cases/objectCreation.php.expected.json | 6 +++--- .../cases/objectCreation2.php.expected.json | 8 ++++---- .../cases/objectCreation3.php.expected.json | 4 ++-- tests/Validation/cases/param1.php.expected.json | 4 ++-- tests/Validation/cases/parent1.php.expected.json | 10 +++++----- tests/Validation/cases/parent3.php.expected.json | 10 +++++----- .../Validation/cases/propertyName1.php.expected.json | 4 ++-- .../Validation/cases/propertyName2.php.expected.json | 4 ++-- tests/Validation/cases/returnType.php.expected.json | 4 ++-- .../cases/scopedPropertyAccess.php.expected.json | 6 +++--- .../cases/scopedPropertyAccess2.php.expected.json | 2 +- .../cases/scopedPropertyAccess3.php.expected.json | 4 ++-- .../cases/scopedPropertyAccess5.php.expected.json | 4 ++-- tests/Validation/cases/self1.php.expected.json | 10 +++++----- tests/Validation/cases/self2.php.expected.json | 10 +++++----- tests/Validation/cases/self3.php.expected.json | 10 +++++----- tests/Validation/cases/self4.php.expected.json | 6 +++--- tests/Validation/cases/self5.php.expected.json | 6 +++--- tests/Validation/cases/static1.php.expected.json | 10 +++++----- tests/Validation/cases/static2.php.expected.json | 10 +++++----- tests/Validation/cases/static3.php.expected.json | 10 +++++----- tests/Validation/cases/static4.php.expected.json | 6 +++--- .../cases/staticMethodReturnType.php.expected.json | 6 +++--- .../cases/stringVariable.php.expected.json | 6 +++--- ...QualifiedNameOutsideOfNamespace.php.expected.json | 2 +- .../verifyFqsenOnClassProperty.php.expected.json | 6 +++--- 61 files changed, 165 insertions(+), 164 deletions(-) diff --git a/src/CompletionProvider.php b/src/CompletionProvider.php index 2414ead1..9a000e65 100644 --- a/src/CompletionProvider.php +++ b/src/CompletionProvider.php @@ -210,7 +210,7 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi // Collect all definitions that match any of the prefixes foreach ($this->index->getDefinitions() as $fqn => $def) { foreach ($prefixes as $prefix) { - if (substr($fqn, 0, strlen($prefix)) === $prefix && !$def->isGlobal) { + if (substr($fqn, 0, strlen($prefix)) === $prefix && $def->isMember) { $list->items[] = CompletionItem::fromDefinition($def); } } @@ -243,7 +243,7 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi // Collect all definitions that match any of the prefixes foreach ($this->index->getDefinitions() as $fqn => $def) { foreach ($prefixes as $prefix) { - if (substr(strtolower($fqn), 0, strlen($prefix)) === strtolower($prefix) && !$def->isGlobal) { + if (substr(strtolower($fqn), 0, strlen($prefix)) === strtolower($prefix) && $def->isMember) { $list->items[] = CompletionItem::fromDefinition($def); } } @@ -316,7 +316,7 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi if ( // Exclude methods, properties etc. - $def->isGlobal + !$def->isMember && ( !$prefix || ( diff --git a/src/Definition.php b/src/Definition.php index 9a485c46..c27f8717 100644 --- a/src/Definition.php +++ b/src/Definition.php @@ -39,12 +39,13 @@ class Definition public $extends; /** - * Only true for classes, interfaces, traits, functions and non-class constants + * False for classes, interfaces, traits, functions and non-class constants + * True for methods, properties and class constants * This is so methods and properties are not suggested in the global scope * * @var bool */ - public $isGlobal; + public $isMember; /** * True if this definition is affected by global namespace fallback (global function or global constant) diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php index f6d82c5b..93f961d7 100644 --- a/src/DefinitionResolver.php +++ b/src/DefinitionResolver.php @@ -181,7 +181,7 @@ public function createDefinitionFromNode(Node $node, string $fqn = null): Defini ); // Interfaces, classes, traits, namespaces, functions, and global const elements - $def->isGlobal = ( + $def->isMember = !( $node instanceof PhpParser\ClassLike || ($node instanceof Node\Statement\NamespaceDefinition && $node->name !== null) || diff --git a/tests/Validation/cases/WithReturnTypehints.php.expected.json b/tests/Validation/cases/WithReturnTypehints.php.expected.json index 26b00e23..d11f2718 100644 --- a/tests/Validation/cases/WithReturnTypehints.php.expected.json +++ b/tests/Validation/cases/WithReturnTypehints.php.expected.json @@ -20,7 +20,7 @@ "Fixtures\\Prophecy": { "fqn": "Fixtures\\Prophecy", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -41,7 +41,7 @@ "extends": [ "Fixtures\\Prophecy\\EmptyClass" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -60,7 +60,7 @@ "Fixtures\\Prophecy\\WithReturnTypehints->getSelf()": { "fqn": "Fixtures\\Prophecy\\WithReturnTypehints->getSelf()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -80,7 +80,7 @@ "Fixtures\\Prophecy\\WithReturnTypehints->getName()": { "fqn": "Fixtures\\Prophecy\\WithReturnTypehints->getName()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -100,7 +100,7 @@ "Fixtures\\Prophecy\\WithReturnTypehints->getParent()": { "fqn": "Fixtures\\Prophecy\\WithReturnTypehints->getParent()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json b/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json index b0625d7d..51343f17 100644 --- a/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json +++ b/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json @@ -4,7 +4,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json b/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json index d58986de..107877e0 100644 --- a/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json +++ b/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json @@ -4,7 +4,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -23,7 +23,7 @@ "A->foo": { "fqn": "A->foo", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/caseStatement1.php.expected.json b/tests/Validation/cases/caseStatement1.php.expected.json index 573dd17b..97467493 100644 --- a/tests/Validation/cases/caseStatement1.php.expected.json +++ b/tests/Validation/cases/caseStatement1.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/classDefinition1.php.expected.json b/tests/Validation/cases/classDefinition1.php.expected.json index 6c418b7a..670b5de7 100644 --- a/tests/Validation/cases/classDefinition1.php.expected.json +++ b/tests/Validation/cases/classDefinition1.php.expected.json @@ -11,7 +11,7 @@ "TestNamespace": { "fqn": "TestNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "TestNamespace\\A": { "fqn": "TestNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "TestNamespace\\A->a": { "fqn": "TestNamespace\\A->a", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/classProperty1.php.expected.json b/tests/Validation/cases/classProperty1.php.expected.json index e00107e3..921bf0b1 100644 --- a/tests/Validation/cases/classProperty1.php.expected.json +++ b/tests/Validation/cases/classProperty1.php.expected.json @@ -11,7 +11,7 @@ "TestNamespace": { "fqn": "TestNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "TestNamespace\\TestClass": { "fqn": "TestNamespace\\TestClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "TestNamespace\\TestClass->testProperty": { "fqn": "TestNamespace\\TestClass->testProperty", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -69,7 +69,7 @@ "TestNamespace\\TestClass->testMethod()": { "fqn": "TestNamespace\\TestClass->testMethod()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constants.php.expected.json b/tests/Validation/cases/constants.php.expected.json index d629870d..a76c0597 100644 --- a/tests/Validation/cases/constants.php.expected.json +++ b/tests/Validation/cases/constants.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::suite()": { "fqn": "MyNamespace\\A::suite()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constants2.php.expected.json b/tests/Validation/cases/constants2.php.expected.json index 66c678fc..ae5a2cef 100644 --- a/tests/Validation/cases/constants2.php.expected.json +++ b/tests/Validation/cases/constants2.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::suite()": { "fqn": "MyNamespace\\A::suite()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constants3.php.expected.json b/tests/Validation/cases/constants3.php.expected.json index 03f00ba0..c6ad9226 100644 --- a/tests/Validation/cases/constants3.php.expected.json +++ b/tests/Validation/cases/constants3.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::suite()": { "fqn": "MyNamespace\\A::suite()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constants4.php.expected.json b/tests/Validation/cases/constants4.php.expected.json index 62ce430d..bc46cf17 100644 --- a/tests/Validation/cases/constants4.php.expected.json +++ b/tests/Validation/cases/constants4.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A->suite()": { "fqn": "MyNamespace\\A->suite()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constants5.php.expected.json b/tests/Validation/cases/constants5.php.expected.json index bb441c87..6bd7b8e9 100644 --- a/tests/Validation/cases/constants5.php.expected.json +++ b/tests/Validation/cases/constants5.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "MyNamespace\\Mbstring": { "fqn": "MyNamespace\\Mbstring", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -46,7 +46,7 @@ "MyNamespace\\Mbstring::MB_CASE_FOLD": { "fqn": "MyNamespace\\Mbstring::MB_CASE_FOLD", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json b/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json index 8f9a2126..b49f5a9e 100644 --- a/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json +++ b/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json @@ -8,7 +8,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "A->b()": { "fqn": "A->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json b/tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json index 73f6bee1..dd1737a2 100644 --- a/tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json +++ b/tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json @@ -4,7 +4,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/exceptions1.php.expected.json b/tests/Validation/cases/exceptions1.php.expected.json index a4a71d16..c1ee1bde 100644 --- a/tests/Validation/cases/exceptions1.php.expected.json +++ b/tests/Validation/cases/exceptions1.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/ifStatement1.php.expected.json b/tests/Validation/cases/ifStatement1.php.expected.json index 18efe9f1..98e65720 100644 --- a/tests/Validation/cases/ifStatement1.php.expected.json +++ b/tests/Validation/cases/ifStatement1.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/interfaceProperty.php.expected.json b/tests/Validation/cases/interfaceProperty.php.expected.json index 178834d9..10c49f04 100644 --- a/tests/Validation/cases/interfaceProperty.php.expected.json +++ b/tests/Validation/cases/interfaceProperty.php.expected.json @@ -4,7 +4,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json b/tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json index f62d214a..a9c2162b 100644 --- a/tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json +++ b/tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json @@ -11,7 +11,7 @@ "B": { "fqn": "B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/magicConsts.php.expected.json b/tests/Validation/cases/magicConsts.php.expected.json index a37791ba..6f863b9c 100644 --- a/tests/Validation/cases/magicConsts.php.expected.json +++ b/tests/Validation/cases/magicConsts.php.expected.json @@ -8,7 +8,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -27,7 +27,7 @@ "A::$deprecationsTriggered": { "fqn": "A::$deprecationsTriggered", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberAccess1.php.expected.json b/tests/Validation/cases/memberAccess1.php.expected.json index 7f9630ae..c039e5e3 100644 --- a/tests/Validation/cases/memberAccess1.php.expected.json +++ b/tests/Validation/cases/memberAccess1.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::a()": { "fqn": "MyNamespace\\A::a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberAccess2.php.expected.json b/tests/Validation/cases/memberAccess2.php.expected.json index 7b3ce1d3..50902a1d 100644 --- a/tests/Validation/cases/memberAccess2.php.expected.json +++ b/tests/Validation/cases/memberAccess2.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::a()": { "fqn": "MyNamespace\\A::a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberAccess3.php.expected.json b/tests/Validation/cases/memberAccess3.php.expected.json index 520dae8b..d91b27df 100644 --- a/tests/Validation/cases/memberAccess3.php.expected.json +++ b/tests/Validation/cases/memberAccess3.php.expected.json @@ -26,7 +26,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -45,7 +45,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -64,7 +64,7 @@ "MyNamespace\\A::getInitializer()": { "fqn": "MyNamespace\\A::getInitializer()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberAccess4.php.expected.json b/tests/Validation/cases/memberAccess4.php.expected.json index 1d51b859..0b7e1bf9 100644 --- a/tests/Validation/cases/memberAccess4.php.expected.json +++ b/tests/Validation/cases/memberAccess4.php.expected.json @@ -17,7 +17,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -36,7 +36,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -55,7 +55,7 @@ "MyNamespace\\A->testRequest()": { "fqn": "MyNamespace\\A->testRequest()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberAccess5.php.expected.json b/tests/Validation/cases/memberAccess5.php.expected.json index 57aca0ae..050cf3b2 100644 --- a/tests/Validation/cases/memberAccess5.php.expected.json +++ b/tests/Validation/cases/memberAccess5.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "MyNamespace\\ParseErrorsTest": { "fqn": "MyNamespace\\ParseErrorsTest", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -46,7 +46,7 @@ "MyNamespace\\ParseErrorsTest->setUp()": { "fqn": "MyNamespace\\ParseErrorsTest->setUp()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/memberCall1.php.expected.json b/tests/Validation/cases/memberCall1.php.expected.json index 416a705f..d02d7e3c 100644 --- a/tests/Validation/cases/memberCall1.php.expected.json +++ b/tests/Validation/cases/memberCall1.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\ParseErrorsTest": { "fqn": "MyNamespace\\ParseErrorsTest", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\ParseErrorsTest->setAccount()": { "fqn": "MyNamespace\\ParseErrorsTest->setAccount()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/methodReturnType.php.expected.json b/tests/Validation/cases/methodReturnType.php.expected.json index 54d79d6a..2c89994e 100644 --- a/tests/Validation/cases/methodReturnType.php.expected.json +++ b/tests/Validation/cases/methodReturnType.php.expected.json @@ -8,7 +8,7 @@ "FooClass": { "fqn": "FooClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -27,7 +27,7 @@ "FooClass->foo()": { "fqn": "FooClass->foo()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/multipleNamespaces.php.expected.json b/tests/Validation/cases/multipleNamespaces.php.expected.json index 30fe5967..fa51f2dd 100644 --- a/tests/Validation/cases/multipleNamespaces.php.expected.json +++ b/tests/Validation/cases/multipleNamespaces.php.expected.json @@ -17,7 +17,7 @@ "MyNamespace1": { "fqn": "MyNamespace1", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -36,7 +36,7 @@ "MyNamespace1\\B": { "fqn": "MyNamespace1\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -55,7 +55,7 @@ "MyNamespace1\\B->b()": { "fqn": "MyNamespace1\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -75,7 +75,7 @@ "MyNamespace2": { "fqn": "MyNamespace2", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -96,7 +96,7 @@ "extends": [ "MyNamespace2\\MyNamespace1\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -115,7 +115,7 @@ "MyNamespace2\\A->a()": { "fqn": "MyNamespace2\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/multiplePreceedingComments.php.expected.json b/tests/Validation/cases/multiplePreceedingComments.php.expected.json index 5ca3dd7c..96cbb4a8 100644 --- a/tests/Validation/cases/multiplePreceedingComments.php.expected.json +++ b/tests/Validation/cases/multiplePreceedingComments.php.expected.json @@ -4,7 +4,7 @@ "Foo": { "fqn": "Foo", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -23,7 +23,7 @@ "Foo->fn()": { "fqn": "Foo->fn()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/nameToken.php.expected.json b/tests/Validation/cases/nameToken.php.expected.json index 0ecd53f5..c06217b2 100644 --- a/tests/Validation/cases/nameToken.php.expected.json +++ b/tests/Validation/cases/nameToken.php.expected.json @@ -4,7 +4,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -23,7 +23,7 @@ "A->b()": { "fqn": "A->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/namespaces2.php.expected.json b/tests/Validation/cases/namespaces2.php.expected.json index 42243e53..0dffc9f2 100644 --- a/tests/Validation/cases/namespaces2.php.expected.json +++ b/tests/Validation/cases/namespaces2.php.expected.json @@ -17,7 +17,7 @@ "MyNamespace1": { "fqn": "MyNamespace1", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/namespaces5.php.expected.json b/tests/Validation/cases/namespaces5.php.expected.json index 5ffe02d2..e609ca24 100644 --- a/tests/Validation/cases/namespaces5.php.expected.json +++ b/tests/Validation/cases/namespaces5.php.expected.json @@ -26,7 +26,7 @@ "B": { "fqn": "B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/namespaces6.php.expected.json b/tests/Validation/cases/namespaces6.php.expected.json index 1657f281..bf5a045c 100644 --- a/tests/Validation/cases/namespaces6.php.expected.json +++ b/tests/Validation/cases/namespaces6.php.expected.json @@ -4,7 +4,7 @@ "A\\B": { "fqn": "A\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/namespaces8.php.expected.json b/tests/Validation/cases/namespaces8.php.expected.json index 71017d9a..d3036477 100644 --- a/tests/Validation/cases/namespaces8.php.expected.json +++ b/tests/Validation/cases/namespaces8.php.expected.json @@ -14,7 +14,7 @@ "LanguageServer\\Tests\\Utils": { "fqn": "LanguageServer\\Tests\\Utils", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/objectCreation.php.expected.json b/tests/Validation/cases/objectCreation.php.expected.json index a8fce0fe..8fec38f6 100644 --- a/tests/Validation/cases/objectCreation.php.expected.json +++ b/tests/Validation/cases/objectCreation.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -46,7 +46,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/objectCreation2.php.expected.json b/tests/Validation/cases/objectCreation2.php.expected.json index 2ec83144..e5465283 100644 --- a/tests/Validation/cases/objectCreation2.php.expected.json +++ b/tests/Validation/cases/objectCreation2.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -68,7 +68,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/objectCreation3.php.expected.json b/tests/Validation/cases/objectCreation3.php.expected.json index f0cc31a7..d2d3e2fd 100644 --- a/tests/Validation/cases/objectCreation3.php.expected.json +++ b/tests/Validation/cases/objectCreation3.php.expected.json @@ -8,7 +8,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -27,7 +27,7 @@ "A->a()": { "fqn": "A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/param1.php.expected.json b/tests/Validation/cases/param1.php.expected.json index 33c99db0..40cfbd1d 100644 --- a/tests/Validation/cases/param1.php.expected.json +++ b/tests/Validation/cases/param1.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "MyNamespace\\init()": { "fqn": "MyNamespace\\init()", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/parent1.php.expected.json b/tests/Validation/cases/parent1.php.expected.json index eab232e7..8b29461e 100644 --- a/tests/Validation/cases/parent1.php.expected.json +++ b/tests/Validation/cases/parent1.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -71,7 +71,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -90,7 +90,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/parent3.php.expected.json b/tests/Validation/cases/parent3.php.expected.json index aedb4b2d..1e51b84a 100644 --- a/tests/Validation/cases/parent3.php.expected.json +++ b/tests/Validation/cases/parent3.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/propertyName1.php.expected.json b/tests/Validation/cases/propertyName1.php.expected.json index 42b2ee9b..cc31ed63 100644 --- a/tests/Validation/cases/propertyName1.php.expected.json +++ b/tests/Validation/cases/propertyName1.php.expected.json @@ -4,7 +4,7 @@ "MyClass": { "fqn": "MyClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -23,7 +23,7 @@ "MyClass->mainPropertyName": { "fqn": "MyClass->mainPropertyName", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/propertyName2.php.expected.json b/tests/Validation/cases/propertyName2.php.expected.json index 5a5c9148..d4efb424 100644 --- a/tests/Validation/cases/propertyName2.php.expected.json +++ b/tests/Validation/cases/propertyName2.php.expected.json @@ -4,7 +4,7 @@ "MyClass": { "fqn": "MyClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -23,7 +23,7 @@ "MyClass->mainPropertyName": { "fqn": "MyClass->mainPropertyName", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/returnType.php.expected.json b/tests/Validation/cases/returnType.php.expected.json index cf9cc639..20cdadf1 100644 --- a/tests/Validation/cases/returnType.php.expected.json +++ b/tests/Validation/cases/returnType.php.expected.json @@ -11,7 +11,7 @@ "TestNamespace": { "fqn": "TestNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "TestNamespace\\whatever()": { "fqn": "TestNamespace\\whatever()", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/scopedPropertyAccess.php.expected.json b/tests/Validation/cases/scopedPropertyAccess.php.expected.json index 52b6e7a1..ec50c7ad 100644 --- a/tests/Validation/cases/scopedPropertyAccess.php.expected.json +++ b/tests/Validation/cases/scopedPropertyAccess.php.expected.json @@ -11,7 +11,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -30,7 +30,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -49,7 +49,7 @@ "MyNamespace\\A::a()": { "fqn": "MyNamespace\\A::a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/scopedPropertyAccess2.php.expected.json b/tests/Validation/cases/scopedPropertyAccess2.php.expected.json index e5f6850c..e1712cd1 100644 --- a/tests/Validation/cases/scopedPropertyAccess2.php.expected.json +++ b/tests/Validation/cases/scopedPropertyAccess2.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/scopedPropertyAccess3.php.expected.json b/tests/Validation/cases/scopedPropertyAccess3.php.expected.json index aa508bcb..913721b7 100644 --- a/tests/Validation/cases/scopedPropertyAccess3.php.expected.json +++ b/tests/Validation/cases/scopedPropertyAccess3.php.expected.json @@ -11,7 +11,7 @@ "A": { "fqn": "A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -30,7 +30,7 @@ "A::$a": { "fqn": "A::$a", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/scopedPropertyAccess5.php.expected.json b/tests/Validation/cases/scopedPropertyAccess5.php.expected.json index bd4ee700..7e56123c 100644 --- a/tests/Validation/cases/scopedPropertyAccess5.php.expected.json +++ b/tests/Validation/cases/scopedPropertyAccess5.php.expected.json @@ -17,7 +17,7 @@ "TestClass": { "fqn": "TestClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -36,7 +36,7 @@ "TestClass::$testProperty": { "fqn": "TestClass::$testProperty", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/self1.php.expected.json b/tests/Validation/cases/self1.php.expected.json index eb37fc7f..2ce8e43a 100644 --- a/tests/Validation/cases/self1.php.expected.json +++ b/tests/Validation/cases/self1.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/self2.php.expected.json b/tests/Validation/cases/self2.php.expected.json index 2280b1a0..cc00e3a1 100644 --- a/tests/Validation/cases/self2.php.expected.json +++ b/tests/Validation/cases/self2.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/self3.php.expected.json b/tests/Validation/cases/self3.php.expected.json index 3f692992..9f25ba15 100644 --- a/tests/Validation/cases/self3.php.expected.json +++ b/tests/Validation/cases/self3.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/self4.php.expected.json b/tests/Validation/cases/self4.php.expected.json index ec3ae076..7f7b25e1 100644 --- a/tests/Validation/cases/self4.php.expected.json +++ b/tests/Validation/cases/self4.php.expected.json @@ -23,7 +23,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -42,7 +42,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -61,7 +61,7 @@ "MyNamespace\\A::suite()": { "fqn": "MyNamespace\\A::suite()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, diff --git a/tests/Validation/cases/self5.php.expected.json b/tests/Validation/cases/self5.php.expected.json index 67276894..eb418323 100644 --- a/tests/Validation/cases/self5.php.expected.json +++ b/tests/Validation/cases/self5.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -27,7 +27,7 @@ "MyNamespace\\A": { "fqn": "MyNamespace\\A", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -46,7 +46,7 @@ "MyNamespace\\A->typesProvider()": { "fqn": "MyNamespace\\A->typesProvider()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/static1.php.expected.json b/tests/Validation/cases/static1.php.expected.json index 69f8de01..453edc8b 100644 --- a/tests/Validation/cases/static1.php.expected.json +++ b/tests/Validation/cases/static1.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/static2.php.expected.json b/tests/Validation/cases/static2.php.expected.json index 17f9a664..87e8e9ae 100644 --- a/tests/Validation/cases/static2.php.expected.json +++ b/tests/Validation/cases/static2.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/static3.php.expected.json b/tests/Validation/cases/static3.php.expected.json index f6e51893..37524ea7 100644 --- a/tests/Validation/cases/static3.php.expected.json +++ b/tests/Validation/cases/static3.php.expected.json @@ -14,7 +14,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -33,7 +33,7 @@ "MyNamespace\\B": { "fqn": "MyNamespace\\B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -52,7 +52,7 @@ "MyNamespace\\B->b()": { "fqn": "MyNamespace\\B->b()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -74,7 +74,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -93,7 +93,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/static4.php.expected.json b/tests/Validation/cases/static4.php.expected.json index 3d05edeb..4bcdd9d7 100644 --- a/tests/Validation/cases/static4.php.expected.json +++ b/tests/Validation/cases/static4.php.expected.json @@ -8,7 +8,7 @@ "MyNamespace": { "fqn": "MyNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -29,7 +29,7 @@ "extends": [ "MyNamespace\\B" ], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -48,7 +48,7 @@ "MyNamespace\\A->a()": { "fqn": "MyNamespace\\A->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/staticMethodReturnType.php.expected.json b/tests/Validation/cases/staticMethodReturnType.php.expected.json index c178f0a5..e6661ecb 100644 --- a/tests/Validation/cases/staticMethodReturnType.php.expected.json +++ b/tests/Validation/cases/staticMethodReturnType.php.expected.json @@ -8,7 +8,7 @@ "FooClass": { "fqn": "FooClass", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -27,7 +27,7 @@ "FooClass::staticFoo()": { "fqn": "FooClass::staticFoo()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": true, "canBeInstantiated": false, @@ -47,7 +47,7 @@ "FooClass->bar()": { "fqn": "FooClass->bar()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/stringVariable.php.expected.json b/tests/Validation/cases/stringVariable.php.expected.json index fed8a235..1d4c7e36 100644 --- a/tests/Validation/cases/stringVariable.php.expected.json +++ b/tests/Validation/cases/stringVariable.php.expected.json @@ -8,7 +8,7 @@ "B": { "fqn": "B", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -27,7 +27,7 @@ "B->hi": { "fqn": "B->hi", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -47,7 +47,7 @@ "B->a()": { "fqn": "B->a()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json b/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json index f6860939..509907c9 100644 --- a/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json +++ b/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json @@ -8,7 +8,7 @@ "SomeNamespace": { "fqn": "SomeNamespace", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": false, diff --git a/tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json b/tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json index f6851bf8..662a7ed7 100644 --- a/tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json +++ b/tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json @@ -11,7 +11,7 @@ "Foo": { "fqn": "Foo", "extends": [], - "isGlobal": true, + "isMember": false, "roamed": false, "isStatic": false, "canBeInstantiated": true, @@ -30,7 +30,7 @@ "Foo->bar": { "fqn": "Foo->bar", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false, @@ -50,7 +50,7 @@ "Foo->foo()": { "fqn": "Foo->foo()", "extends": [], - "isGlobal": false, + "isMember": true, "roamed": false, "isStatic": false, "canBeInstantiated": false,