diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php index 1145df0..2bbb565 100644 --- a/tests/Validation/ValidationTest.php +++ b/tests/Validation/ValidationTest.php @@ -21,48 +21,37 @@ use RecursiveIteratorIterator; use Sabre\Event\Loop; use Microsoft\PhpParser; -$frameworksDir = realpath(__DIR__ . '/../../validation/frameworks'); - class ValidationTest extends TestCase { - public function frameworkErrorProvider() + public function validationTestProvider() { - global $frameworksDir; - $frameworks = glob($frameworksDir . '/*', GLOB_ONLYDIR); - $testProviderArray = array(); - foreach ($frameworks as $frameworkDir) { - $frameworkName = basename($frameworkDir); - if ($frameworkName !== '_cases') { - continue; - } + $testCasesDir = realpath(__DIR__ . '/../../validation/frameworks/_cases'); - $iterator = new RecursiveDirectoryIterator($frameworkDir); - $skipped = json_decode(file_get_contents(__DIR__ . '/skipped.json')); + $iterator = new RecursiveDirectoryIterator($testCasesDir); + $disabled = json_decode(file_get_contents(__DIR__ . '/disabled.json')); - foreach (new RecursiveIteratorIterator($iterator) as $file) { - if (strpos(\strrev((string)$file), \strrev(".php")) === 0 && !\in_array(basename((string)$file), $skipped)) { - if ($file->getSize() < 100000) { - $testProviderArray[$frameworkName . "::" . $file->getBasename()] = [$file->getPathname(), $frameworkName]; - } + foreach (new RecursiveIteratorIterator($iterator) as $file) { + if (strpos(\strrev((string)$file), \strrev(".php")) === 0 && !\in_array(basename((string)$file), $disabled)) { + if ($file->getSize() < 100000) { + $testProviderArray[] = [$file->getPathname()]; } } } - if (count($testProviderArray) === 0) { - throw new Exception("ERROR: Validation testsuite frameworks not found - run `git submodule update --init --recursive` to download."); - } - return $testProviderArray; } /** + * This test loads the test cases specified in .php files under cases/ and looks at the whole set of + * Definitions and References produced. It reads the expected results from associated .json files + * and compares to the actual result. If they don't match, the test fails and it writes the new baseline + * to the .json file. * @group validation - * @dataProvider frameworkErrorProvider + * @dataProvider validationTestProvider * @param $testCaseFile - * @param $frameworkName */ - public function testDefinitionErrors($testCaseFile, $frameworkName) + public function testDefinitionsAndReferences($testCaseFile) { $fileContents = file_get_contents($testCaseFile); $actualValues = $this->getActualTestValues($testCaseFile, $fileContents); @@ -84,9 +73,7 @@ class ValidationTest extends TestCase } } catch (\Throwable $e) { $outputFile = getExpectedValuesFile($testCaseFile); - if ($frameworkName === '_cases') { - file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)); - } + file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)); throw $e; } @@ -94,8 +81,6 @@ class ValidationTest extends TestCase private function getActualTestValues($filename, $fileContents): array { - global $frameworksDir; - $index = new Index(); $parser = new PhpParser\Parser(); $docBlockFactory = DocBlockFactory::createInstance(); @@ -115,10 +100,10 @@ class ValidationTest extends TestCase ); // Turn references into relative paths + $testCasesDir = realpath(__DIR__ . '/../../validation/frameworks/_cases'); foreach ($refsAndDefs['references'] as $key => $list) { - $fixedPathRefs = array_map(function ($ref) { - global $frameworksDir; - return str_replace($frameworksDir, '.', $ref); + $fixedPathRefs = array_map(function ($ref) use ($testCasesDir) { + return str_replace($testCasesDir, '.', $ref); }, $list); $refsAndDefs['references']->$key = $fixedPathRefs; @@ -128,7 +113,7 @@ class ValidationTest extends TestCase foreach ($refsAndDefs['definitions'] as $key => $def) { if ($def !== null && $def->symbolInformation !== null && $def->symbolInformation->location !== null && $def->symbolInformation->location->uri !== null) { - $def->symbolInformation->location->uri = str_replace($frameworksDir, '.', $def->symbolInformation->location->uri); + $def->symbolInformation->location->uri = str_replace($testCasesDir, '.', $def->symbolInformation->location->uri); } } diff --git a/tests/Validation/skipped.json b/tests/Validation/disabled.json similarity index 100% rename from tests/Validation/skipped.json rename to tests/Validation/disabled.json diff --git a/validation/frameworks/_cases/WithReturnTypehints.php.expected.json b/validation/frameworks/_cases/WithReturnTypehints.php.expected.json index dd00cd5..43dc4b5 100644 --- a/validation/frameworks/_cases/WithReturnTypehints.php.expected.json +++ b/validation/frameworks/_cases/WithReturnTypehints.php.expected.json @@ -1,13 +1,13 @@ { "references": { "Fixtures\\Prophecy\\EmptyClass": [ - "./_cases/WithReturnTypehints.php" + "./WithReturnTypehints.php" ], "self": [ - "./_cases/WithReturnTypehints.php" + "./WithReturnTypehints.php" ], "parent": [ - "./_cases/WithReturnTypehints.php" + "./WithReturnTypehints.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "Fixtures\\Prophecy", "kind": 3, "location": { - "uri": "./_cases/WithReturnTypehints.php" + "uri": "./WithReturnTypehints.php" }, "containerName": "Fixtures" }, @@ -38,7 +38,7 @@ "name": "WithReturnTypehints", "kind": 5, "location": { - "uri": "./_cases/WithReturnTypehints.php" + "uri": "./WithReturnTypehints.php" }, "containerName": "Fixtures\\Prophecy" }, @@ -54,7 +54,7 @@ "name": "getSelf", "kind": 6, "location": { - "uri": "./_cases/WithReturnTypehints.php" + "uri": "./WithReturnTypehints.php" }, "containerName": "Fixtures\\Prophecy\\WithReturnTypehints" }, @@ -71,7 +71,7 @@ "name": "getName", "kind": 6, "location": { - "uri": "./_cases/WithReturnTypehints.php" + "uri": "./WithReturnTypehints.php" }, "containerName": "Fixtures\\Prophecy\\WithReturnTypehints" }, @@ -88,7 +88,7 @@ "name": "getParent", "kind": 6, "location": { - "uri": "./_cases/WithReturnTypehints.php" + "uri": "./WithReturnTypehints.php" }, "containerName": "Fixtures\\Prophecy\\WithReturnTypehints" }, diff --git a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json b/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json index b0a0982..727210b 100644 --- a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json +++ b/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json @@ -10,7 +10,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/anonymousClassMembersShouldNotBeSymbols.php" + "uri": "./anonymousClassMembersShouldNotBeSymbols.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json b/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json index c461f3e..4acb4ba 100644 --- a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json +++ b/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json @@ -10,7 +10,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/arrayValueShouldBeBoolean.php" + "uri": "./arrayValueShouldBeBoolean.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "foo", "kind": 7, "location": { - "uri": "./_cases/arrayValueShouldBeBoolean.php" + "uri": "./arrayValueShouldBeBoolean.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/caseStatement1.php.expected.json b/validation/frameworks/_cases/caseStatement1.php.expected.json index c302139..8d8d968 100644 --- a/validation/frameworks/_cases/caseStatement1.php.expected.json +++ b/validation/frameworks/_cases/caseStatement1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\A": [ - "./_cases/caseStatement1.php" + "./caseStatement1.php" ], "A": [ - "./_cases/caseStatement1.php" + "./caseStatement1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/caseStatement1.php" + "uri": "./caseStatement1.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/classDefinition1.php.expected.json b/validation/frameworks/_cases/classDefinition1.php.expected.json index efd937a..f135c15 100644 --- a/validation/frameworks/_cases/classDefinition1.php.expected.json +++ b/validation/frameworks/_cases/classDefinition1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "TestNamespace\\A": [ - "./_cases/classDefinition1.php" + "./classDefinition1.php" ], "TestNamespace\\A->a": [ - "./_cases/classDefinition1.php" + "./classDefinition1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "TestNamespace", "kind": 3, "location": { - "uri": "./_cases/classDefinition1.php" + "uri": "./classDefinition1.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/classDefinition1.php" + "uri": "./classDefinition1.php" }, "containerName": "TestNamespace" }, @@ -49,7 +49,7 @@ "name": "a", "kind": 7, "location": { - "uri": "./_cases/classDefinition1.php" + "uri": "./classDefinition1.php" }, "containerName": "TestNamespace\\A" }, diff --git a/validation/frameworks/_cases/classProperty1.php.expected.json b/validation/frameworks/_cases/classProperty1.php.expected.json index 56c8782..4469987 100644 --- a/validation/frameworks/_cases/classProperty1.php.expected.json +++ b/validation/frameworks/_cases/classProperty1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "SomeNamespace\\Goo": [ - "./_cases/classProperty1.php" + "./classProperty1.php" ], "SomeNamespace": [ - "./_cases/classProperty1.php" + "./classProperty1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "TestNamespace", "kind": 3, "location": { - "uri": "./_cases/classProperty1.php" + "uri": "./classProperty1.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "TestClass", "kind": 5, "location": { - "uri": "./_cases/classProperty1.php" + "uri": "./classProperty1.php" }, "containerName": "TestNamespace" }, @@ -49,7 +49,7 @@ "name": "testProperty", "kind": 7, "location": { - "uri": "./_cases/classProperty1.php" + "uri": "./classProperty1.php" }, "containerName": "TestNamespace\\TestClass" }, @@ -66,7 +66,7 @@ "name": "testMethod", "kind": 6, "location": { - "uri": "./_cases/classProperty1.php" + "uri": "./classProperty1.php" }, "containerName": "TestNamespace\\TestClass" }, diff --git a/validation/frameworks/_cases/constants.php.expected.json b/validation/frameworks/_cases/constants.php.expected.json index 228f838..b38fbb8 100644 --- a/validation/frameworks/_cases/constants.php.expected.json +++ b/validation/frameworks/_cases/constants.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\BYE": [ - "./_cases/constants.php" + "./constants.php" ], "BYE": [ - "./_cases/constants.php" + "./constants.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/constants.php" + "uri": "./constants.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/constants.php" + "uri": "./constants.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "suite", "kind": 6, "location": { - "uri": "./_cases/constants.php" + "uri": "./constants.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/constants2.php.expected.json b/validation/frameworks/_cases/constants2.php.expected.json index 0404006..978d0bf 100644 --- a/validation/frameworks/_cases/constants2.php.expected.json +++ b/validation/frameworks/_cases/constants2.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\BYE": [ - "./_cases/constants2.php" + "./constants2.php" ], "BYE": [ - "./_cases/constants2.php" + "./constants2.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/constants2.php" + "uri": "./constants2.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/constants2.php" + "uri": "./constants2.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "suite", "kind": 6, "location": { - "uri": "./_cases/constants2.php" + "uri": "./constants2.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/constants3.php.expected.json b/validation/frameworks/_cases/constants3.php.expected.json index 0ddad8c..6f8b700 100644 --- a/validation/frameworks/_cases/constants3.php.expected.json +++ b/validation/frameworks/_cases/constants3.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\T_NEW": [ - "./_cases/constants3.php" + "./constants3.php" ], "T_NEW": [ - "./_cases/constants3.php" + "./constants3.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/constants3.php" + "uri": "./constants3.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/constants3.php" + "uri": "./constants3.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "suite", "kind": 6, "location": { - "uri": "./_cases/constants3.php" + "uri": "./constants3.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/constants4.php.expected.json b/validation/frameworks/_cases/constants4.php.expected.json index a1fe663..0d962ef 100644 --- a/validation/frameworks/_cases/constants4.php.expected.json +++ b/validation/frameworks/_cases/constants4.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\HI": [ - "./_cases/constants4.php" + "./constants4.php" ], "HI": [ - "./_cases/constants4.php" + "./constants4.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/constants4.php" + "uri": "./constants4.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/constants4.php" + "uri": "./constants4.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "suite", "kind": 6, "location": { - "uri": "./_cases/constants4.php" + "uri": "./constants4.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/constants5.php.expected.json b/validation/frameworks/_cases/constants5.php.expected.json index c7ebff9..d7a1983 100644 --- a/validation/frameworks/_cases/constants5.php.expected.json +++ b/validation/frameworks/_cases/constants5.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MyNamespace\\PHP_INT_MAX": [ - "./_cases/constants5.php" + "./constants5.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/constants5.php" + "uri": "./constants5.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "Mbstring", "kind": 5, "location": { - "uri": "./_cases/constants5.php" + "uri": "./constants5.php" }, "containerName": "MyNamespace" }, @@ -46,7 +46,7 @@ "name": "MB_CASE_FOLD", "kind": 14, "location": { - "uri": "./_cases/constants5.php" + "uri": "./constants5.php" }, "containerName": "MyNamespace\\Mbstring" }, diff --git a/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json b/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json index 89613e9..cb24cfd 100644 --- a/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json +++ b/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MY_CONSTANT": [ - "./_cases/constantsInFunctionParamDefault.php" + "./constantsInFunctionParamDefault.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "A", "kind": 11, "location": { - "uri": "./_cases/constantsInFunctionParamDefault.php" + "uri": "./constantsInFunctionParamDefault.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/constantsInFunctionParamDefault.php" + "uri": "./constantsInFunctionParamDefault.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json b/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json index 1e72d0d..dbd85f6 100644 --- a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json +++ b/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json @@ -10,7 +10,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/docBlocksOnNamespaceDefinition.php" + "uri": "./docBlocksOnNamespaceDefinition.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/exceptions1.php.expected.json b/validation/frameworks/_cases/exceptions1.php.expected.json index 1204779..4298194 100644 --- a/validation/frameworks/_cases/exceptions1.php.expected.json +++ b/validation/frameworks/_cases/exceptions1.php.expected.json @@ -10,7 +10,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/exceptions1.php" + "uri": "./exceptions1.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/functionUse.php.expected.json b/validation/frameworks/_cases/functionUse.php.expected.json index 5ecb0b8..5c9af19 100644 --- a/validation/frameworks/_cases/functionUse.php.expected.json +++ b/validation/frameworks/_cases/functionUse.php.expected.json @@ -1,10 +1,10 @@ { "references": { "A": [ - "./_cases/functionUse.php" + "./functionUse.php" ], "A->b()": [ - "./_cases/functionUse.php" + "./functionUse.php" ] }, "definitions": [] diff --git a/validation/frameworks/_cases/functionUse2.php.expected.json b/validation/frameworks/_cases/functionUse2.php.expected.json index b58c001..f3609bd 100644 --- a/validation/frameworks/_cases/functionUse2.php.expected.json +++ b/validation/frameworks/_cases/functionUse2.php.expected.json @@ -1,10 +1,10 @@ { "references": { "LanguageServer": [ - "./_cases/functionUse2.php" + "./functionUse2.php" ], "LanguageServer\\timeout()": [ - "./_cases/functionUse2.php" + "./functionUse2.php" ] }, "definitions": [] diff --git a/validation/frameworks/_cases/ifStatement1.php.expected.json b/validation/frameworks/_cases/ifStatement1.php.expected.json index 1341d08..d412ee1 100644 --- a/validation/frameworks/_cases/ifStatement1.php.expected.json +++ b/validation/frameworks/_cases/ifStatement1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\A": [ - "./_cases/ifStatement1.php" + "./ifStatement1.php" ], "A": [ - "./_cases/ifStatement1.php" + "./ifStatement1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/ifStatement1.php" + "uri": "./ifStatement1.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/interfaceProperty.php.expected.json b/validation/frameworks/_cases/interfaceProperty.php.expected.json index 56dbc27..955456b 100644 --- a/validation/frameworks/_cases/interfaceProperty.php.expected.json +++ b/validation/frameworks/_cases/interfaceProperty.php.expected.json @@ -10,7 +10,7 @@ "name": "A", "kind": 11, "location": { - "uri": "./_cases/interfaceProperty.php" + "uri": "./interfaceProperty.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json b/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json index 95737a9..f40036e 100644 --- a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json +++ b/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json @@ -10,7 +10,7 @@ "name": "B", "kind": 3, "location": { - "uri": "./_cases/magicConstantsShouldBeGlobal.php" + "uri": "./magicConstantsShouldBeGlobal.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/magicConsts.php.expected.json b/validation/frameworks/_cases/magicConsts.php.expected.json index ddbe096..e9b187f 100644 --- a/validation/frameworks/_cases/magicConsts.php.expected.json +++ b/validation/frameworks/_cases/magicConsts.php.expected.json @@ -10,7 +10,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/magicConsts.php" + "uri": "./magicConsts.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "deprecationsTriggered", "kind": 7, "location": { - "uri": "./_cases/magicConsts.php" + "uri": "./magicConsts.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/memberAccess1.php.expected.json b/validation/frameworks/_cases/memberAccess1.php.expected.json index 66601b8..a8d7ff3 100644 --- a/validation/frameworks/_cases/memberAccess1.php.expected.json +++ b/validation/frameworks/_cases/memberAccess1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\a": [ - "./_cases/memberAccess1.php" + "./memberAccess1.php" ], "MyNamespace\\a->a()": [ - "./_cases/memberAccess1.php" + "./memberAccess1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberAccess1.php" + "uri": "./memberAccess1.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/memberAccess1.php" + "uri": "./memberAccess1.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/memberAccess1.php" + "uri": "./memberAccess1.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/memberAccess2.php.expected.json b/validation/frameworks/_cases/memberAccess2.php.expected.json index ad94aa6..dd2493b 100644 --- a/validation/frameworks/_cases/memberAccess2.php.expected.json +++ b/validation/frameworks/_cases/memberAccess2.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\a": [ - "./_cases/memberAccess2.php" + "./memberAccess2.php" ], "MyNamespace\\a->a()": [ - "./_cases/memberAccess2.php" + "./memberAccess2.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberAccess2.php" + "uri": "./memberAccess2.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/memberAccess2.php" + "uri": "./memberAccess2.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/memberAccess2.php" + "uri": "./memberAccess2.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/memberAccess3.php.expected.json b/validation/frameworks/_cases/memberAccess3.php.expected.json index 68e4ae3..60db5b5 100644 --- a/validation/frameworks/_cases/memberAccess3.php.expected.json +++ b/validation/frameworks/_cases/memberAccess3.php.expected.json @@ -1,25 +1,25 @@ { "references": { "MyNamespace\\ClassLoader": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "Closure::bind()": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "Closure": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "MyNamespace\\ClassLoader->prefixesPsr0": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "MyNamespace\\ComposerStaticInitIncludePath": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "MyNamespace\\ComposerStaticInitIncludePath::$prefixesPsr0": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ], "MyNamespace\\ClassLoader::class": [ - "./_cases/memberAccess3.php" + "./memberAccess3.php" ] }, "definitions": { @@ -32,7 +32,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberAccess3.php" + "uri": "./memberAccess3.php" }, "containerName": "" }, @@ -48,7 +48,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/memberAccess3.php" + "uri": "./memberAccess3.php" }, "containerName": "MyNamespace" }, @@ -64,7 +64,7 @@ "name": "getInitializer", "kind": 6, "location": { - "uri": "./_cases/memberAccess3.php" + "uri": "./memberAccess3.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/memberAccess4.php.expected.json b/validation/frameworks/_cases/memberAccess4.php.expected.json index c6b939e..78208ce 100644 --- a/validation/frameworks/_cases/memberAccess4.php.expected.json +++ b/validation/frameworks/_cases/memberAccess4.php.expected.json @@ -1,16 +1,16 @@ { "references": { "MyNamespace\\Request::create()": [ - "./_cases/memberAccess4.php" + "./memberAccess4.php" ], "MyNamespace\\Request": [ - "./_cases/memberAccess4.php" + "./memberAccess4.php" ], "MyNamespace\\Url->toString()": [ - "./_cases/memberAccess4.php" + "./memberAccess4.php" ], "MyNamespace\\Url": [ - "./_cases/memberAccess4.php" + "./memberAccess4.php" ] }, "definitions": { @@ -23,7 +23,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberAccess4.php" + "uri": "./memberAccess4.php" }, "containerName": "" }, @@ -39,7 +39,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/memberAccess4.php" + "uri": "./memberAccess4.php" }, "containerName": "MyNamespace" }, @@ -55,7 +55,7 @@ "name": "testRequest", "kind": 6, "location": { - "uri": "./_cases/memberAccess4.php" + "uri": "./memberAccess4.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/memberAccess5.php.expected.json b/validation/frameworks/_cases/memberAccess5.php.expected.json index 60392c4..6e23151 100644 --- a/validation/frameworks/_cases/memberAccess5.php.expected.json +++ b/validation/frameworks/_cases/memberAccess5.php.expected.json @@ -10,7 +10,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberAccess5.php" + "uri": "./memberAccess5.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "ParseErrorsTest", "kind": 5, "location": { - "uri": "./_cases/memberAccess5.php" + "uri": "./memberAccess5.php" }, "containerName": "MyNamespace" }, @@ -42,7 +42,7 @@ "name": "setUp", "kind": 6, "location": { - "uri": "./_cases/memberAccess5.php" + "uri": "./memberAccess5.php" }, "containerName": "MyNamespace\\ParseErrorsTest" }, diff --git a/validation/frameworks/_cases/memberCall1.php.expected.json b/validation/frameworks/_cases/memberCall1.php.expected.json index b2f8a88..a94a843 100644 --- a/validation/frameworks/_cases/memberCall1.php.expected.json +++ b/validation/frameworks/_cases/memberCall1.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\AccountInterface": [ - "./_cases/memberCall1.php" + "./memberCall1.php" ], "MyNamespace\\A": [ - "./_cases/memberCall1.php" + "./memberCall1.php" ], "MyNamespace\\AccountInterface->getAccount()": [ - "./_cases/memberCall1.php" + "./memberCall1.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/memberCall1.php" + "uri": "./memberCall1.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "ParseErrorsTest", "kind": 5, "location": { - "uri": "./_cases/memberCall1.php" + "uri": "./memberCall1.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "setAccount", "kind": 6, "location": { - "uri": "./_cases/memberCall1.php" + "uri": "./memberCall1.php" }, "containerName": "MyNamespace\\ParseErrorsTest" }, diff --git a/validation/frameworks/_cases/multipleNamespaces.php.expected.json b/validation/frameworks/_cases/multipleNamespaces.php.expected.json index 5e630c0..5bf8760 100644 --- a/validation/frameworks/_cases/multipleNamespaces.php.expected.json +++ b/validation/frameworks/_cases/multipleNamespaces.php.expected.json @@ -1,16 +1,16 @@ { "references": { "MyNamespace2\\MyNamespace1\\B": [ - "./_cases/multipleNamespaces.php" + "./multipleNamespaces.php" ], "MyNamespace2\\MyNamespace1": [ - "./_cases/multipleNamespaces.php" + "./multipleNamespaces.php" ], "MyNamespace2": [ - "./_cases/multipleNamespaces.php" + "./multipleNamespaces.php" ], "MyNamespace2\\A->b()": [ - "./_cases/multipleNamespaces.php" + "./multipleNamespaces.php" ] }, "definitions": { @@ -23,7 +23,7 @@ "name": "MyNamespace1", "kind": 3, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "" }, @@ -39,7 +39,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "MyNamespace1" }, @@ -55,7 +55,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "MyNamespace1\\B" }, @@ -72,7 +72,7 @@ "name": "MyNamespace2", "kind": 3, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "" }, @@ -90,7 +90,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "MyNamespace2" }, @@ -106,7 +106,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/multipleNamespaces.php" + "uri": "./multipleNamespaces.php" }, "containerName": "MyNamespace2\\A" }, diff --git a/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json b/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json index 686aa45..fe34f9a 100644 --- a/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json +++ b/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json @@ -10,7 +10,7 @@ "name": "Foo", "kind": 5, "location": { - "uri": "./_cases/multiplePreceedingComments.php" + "uri": "./multiplePreceedingComments.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "fn", "kind": 6, "location": { - "uri": "./_cases/multiplePreceedingComments.php" + "uri": "./multiplePreceedingComments.php" }, "containerName": "Foo" }, diff --git a/validation/frameworks/_cases/nameToken.php.expected.json b/validation/frameworks/_cases/nameToken.php.expected.json index 836cf20..42b9a08 100644 --- a/validation/frameworks/_cases/nameToken.php.expected.json +++ b/validation/frameworks/_cases/nameToken.php.expected.json @@ -10,7 +10,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/nameToken.php" + "uri": "./nameToken.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/nameToken.php" + "uri": "./nameToken.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/namespaces2.php.expected.json b/validation/frameworks/_cases/namespaces2.php.expected.json index b3f73eb..d4b4034 100644 --- a/validation/frameworks/_cases/namespaces2.php.expected.json +++ b/validation/frameworks/_cases/namespaces2.php.expected.json @@ -1,16 +1,16 @@ { "references": { "NS1\\C": [ - "./_cases/namespaces2.php" + "./namespaces2.php" ], "NS1": [ - "./_cases/namespaces2.php" + "./namespaces2.php" ], "NS1\\I": [ - "./_cases/namespaces2.php" + "./namespaces2.php" ], "NS1\\T": [ - "./_cases/namespaces2.php" + "./namespaces2.php" ] }, "definitions": { @@ -23,7 +23,7 @@ "name": "MyNamespace1", "kind": 3, "location": { - "uri": "./_cases/namespaces2.php" + "uri": "./namespaces2.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/namespaces4.php.expected.json b/validation/frameworks/_cases/namespaces4.php.expected.json index 6d3d4ca..a15b0a9 100644 --- a/validation/frameworks/_cases/namespaces4.php.expected.json +++ b/validation/frameworks/_cases/namespaces4.php.expected.json @@ -1,10 +1,10 @@ { "references": { "a\\b": [ - "./_cases/namespaces4.php" + "./namespaces4.php" ], "a": [ - "./_cases/namespaces4.php" + "./namespaces4.php" ] }, "definitions": [] diff --git a/validation/frameworks/_cases/namespaces5.php.expected.json b/validation/frameworks/_cases/namespaces5.php.expected.json index ef19aef..8c0b27d 100644 --- a/validation/frameworks/_cases/namespaces5.php.expected.json +++ b/validation/frameworks/_cases/namespaces5.php.expected.json @@ -1,25 +1,25 @@ { "references": { "LanguageServer\\Protocol": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer\\Protocol\\TextDocumentIdentifier": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer\\Protocol\\Position": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer\\Protocol\\ReferenceContext": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer\\Protocol\\Location": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ], "LanguageServer\\Protocol\\Range": [ - "./_cases/namespaces5.php" + "./namespaces5.php" ] }, "definitions": { @@ -32,7 +32,7 @@ "name": "B", "kind": 3, "location": { - "uri": "./_cases/namespaces5.php" + "uri": "./namespaces5.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/namespaces6.php.expected.json b/validation/frameworks/_cases/namespaces6.php.expected.json index 0acbf4a..6a3fa81 100644 --- a/validation/frameworks/_cases/namespaces6.php.expected.json +++ b/validation/frameworks/_cases/namespaces6.php.expected.json @@ -10,7 +10,7 @@ "name": "A\\B", "kind": 3, "location": { - "uri": "./_cases/namespaces6.php" + "uri": "./namespaces6.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/namespaces8.php.expected.json b/validation/frameworks/_cases/namespaces8.php.expected.json index ec654b6..20dd6fc 100644 --- a/validation/frameworks/_cases/namespaces8.php.expected.json +++ b/validation/frameworks/_cases/namespaces8.php.expected.json @@ -1,7 +1,7 @@ { "references": { "LanguageServer": [ - "./_cases/namespaces8.php" + "./namespaces8.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "LanguageServer\\Tests\\Utils", "kind": 3, "location": { - "uri": "./_cases/namespaces8.php" + "uri": "./namespaces8.php" }, "containerName": "LanguageServer\\Tests" }, diff --git a/validation/frameworks/_cases/objectCreation.php.expected.json b/validation/frameworks/_cases/objectCreation.php.expected.json index 070a8f7..2a1cfa7 100644 --- a/validation/frameworks/_cases/objectCreation.php.expected.json +++ b/validation/frameworks/_cases/objectCreation.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MyNamespace\\A->inline_diff_renderer": [ - "./_cases/objectCreation.php" + "./objectCreation.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/objectCreation.php" + "uri": "./objectCreation.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/objectCreation.php" + "uri": "./objectCreation.php" }, "containerName": "MyNamespace" }, @@ -46,7 +46,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/objectCreation.php" + "uri": "./objectCreation.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/objectCreation2.php.expected.json b/validation/frameworks/_cases/objectCreation2.php.expected.json index e887559..3968842 100644 --- a/validation/frameworks/_cases/objectCreation2.php.expected.json +++ b/validation/frameworks/_cases/objectCreation2.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\B->hi()": [ - "./_cases/objectCreation2.php" + "./objectCreation2.php" ], "MyNamespace\\B": [ - "./_cases/objectCreation2.php" + "./objectCreation2.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/objectCreation2.php" + "uri": "./objectCreation2.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/objectCreation2.php" + "uri": "./objectCreation2.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/objectCreation2.php" + "uri": "./objectCreation2.php" }, "containerName": "MyNamespace" }, @@ -65,7 +65,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/objectCreation2.php" + "uri": "./objectCreation2.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/objectCreation3.php.expected.json b/validation/frameworks/_cases/objectCreation3.php.expected.json index 745f5d4..a411754 100644 --- a/validation/frameworks/_cases/objectCreation3.php.expected.json +++ b/validation/frameworks/_cases/objectCreation3.php.expected.json @@ -1,7 +1,7 @@ { "references": { "A->args": [ - "./_cases/objectCreation3.php" + "./objectCreation3.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/objectCreation3.php" + "uri": "./objectCreation3.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/objectCreation3.php" + "uri": "./objectCreation3.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/param1.php.expected.json b/validation/frameworks/_cases/param1.php.expected.json index c086acc..c3f977e 100644 --- a/validation/frameworks/_cases/param1.php.expected.json +++ b/validation/frameworks/_cases/param1.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MyNamespace\\Hi": [ - "./_cases/param1.php" + "./param1.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/param1.php" + "uri": "./param1.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "init", "kind": 12, "location": { - "uri": "./_cases/param1.php" + "uri": "./param1.php" }, "containerName": "MyNamespace" }, diff --git a/validation/frameworks/_cases/parent1.php.expected.json b/validation/frameworks/_cases/parent1.php.expected.json index 2503280..dfe8caa 100644 --- a/validation/frameworks/_cases/parent1.php.expected.json +++ b/validation/frameworks/_cases/parent1.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\B": [ - "./_cases/parent1.php" + "./parent1.php" ], "parent": [ - "./_cases/parent1.php" + "./parent1.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/parent1.php" + "uri": "./parent1.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/parent1.php" + "uri": "./parent1.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/parent1.php" + "uri": "./parent1.php" }, "containerName": "MyNamespace\\B" }, @@ -68,7 +68,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/parent1.php" + "uri": "./parent1.php" }, "containerName": "MyNamespace" }, @@ -84,7 +84,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/parent1.php" + "uri": "./parent1.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/parent3.php.expected.json b/validation/frameworks/_cases/parent3.php.expected.json index 37e227f..9065e30 100644 --- a/validation/frameworks/_cases/parent3.php.expected.json +++ b/validation/frameworks/_cases/parent3.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/parent3.php" + "./parent3.php" ], "MyNamespace\\B->b()": [ - "./_cases/parent3.php" + "./parent3.php" ], "parent": [ - "./_cases/parent3.php" + "./parent3.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/parent3.php" + "uri": "./parent3.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/parent3.php" + "uri": "./parent3.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/parent3.php" + "uri": "./parent3.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/parent3.php" + "uri": "./parent3.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/parent3.php" + "uri": "./parent3.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/propertyName1.php.expected.json b/validation/frameworks/_cases/propertyName1.php.expected.json index 56d754c..a79f79c 100644 --- a/validation/frameworks/_cases/propertyName1.php.expected.json +++ b/validation/frameworks/_cases/propertyName1.php.expected.json @@ -10,7 +10,7 @@ "name": "MyClass", "kind": 5, "location": { - "uri": "./_cases/propertyName1.php" + "uri": "./propertyName1.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "mainPropertyName", "kind": 7, "location": { - "uri": "./_cases/propertyName1.php" + "uri": "./propertyName1.php" }, "containerName": "MyClass" }, diff --git a/validation/frameworks/_cases/propertyName2.php.expected.json b/validation/frameworks/_cases/propertyName2.php.expected.json index 7adecee..45c54a7 100644 --- a/validation/frameworks/_cases/propertyName2.php.expected.json +++ b/validation/frameworks/_cases/propertyName2.php.expected.json @@ -10,7 +10,7 @@ "name": "MyClass", "kind": 5, "location": { - "uri": "./_cases/propertyName2.php" + "uri": "./propertyName2.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "mainPropertyName", "kind": 7, "location": { - "uri": "./_cases/propertyName2.php" + "uri": "./propertyName2.php" }, "containerName": "MyClass" }, diff --git a/validation/frameworks/_cases/returnType.php.expected.json b/validation/frameworks/_cases/returnType.php.expected.json index aa49588..e131837 100644 --- a/validation/frameworks/_cases/returnType.php.expected.json +++ b/validation/frameworks/_cases/returnType.php.expected.json @@ -1,10 +1,10 @@ { "references": { "TestNamespace\\TestClass": [ - "./_cases/returnType.php" + "./returnType.php" ], "TestNamespace\\TestClass2": [ - "./_cases/returnType.php" + "./returnType.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "TestNamespace", "kind": 3, "location": { - "uri": "./_cases/returnType.php" + "uri": "./returnType.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "whatever", "kind": 12, "location": { - "uri": "./_cases/returnType.php" + "uri": "./returnType.php" }, "containerName": "TestNamespace" }, diff --git a/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json index 6968698..9d3864b 100644 --- a/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json +++ b/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\A::a()": [ - "./_cases/scopedPropertyAccess.php" + "./scopedPropertyAccess.php" ], "MyNamespace\\A": [ - "./_cases/scopedPropertyAccess.php" + "./scopedPropertyAccess.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/scopedPropertyAccess.php" + "uri": "./scopedPropertyAccess.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/scopedPropertyAccess.php" + "uri": "./scopedPropertyAccess.php" }, "containerName": "MyNamespace" }, @@ -49,7 +49,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/scopedPropertyAccess.php" + "uri": "./scopedPropertyAccess.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json index 11b6267..9b00951 100644 --- a/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json +++ b/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MyNamespace\\A": [ - "./_cases/scopedPropertyAccess2.php" + "./scopedPropertyAccess2.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/scopedPropertyAccess2.php" + "uri": "./scopedPropertyAccess2.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json index fe417b3..990f381 100644 --- a/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json +++ b/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json @@ -1,10 +1,10 @@ { "references": { "A": [ - "./_cases/scopedPropertyAccess3.php" + "./scopedPropertyAccess3.php" ], "A::$a": [ - "./_cases/scopedPropertyAccess3.php" + "./scopedPropertyAccess3.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/scopedPropertyAccess3.php" + "uri": "./scopedPropertyAccess3.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "a", "kind": 7, "location": { - "uri": "./_cases/scopedPropertyAccess3.php" + "uri": "./scopedPropertyAccess3.php" }, "containerName": "A" }, diff --git a/validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json index bcf1489..d349d05 100644 --- a/validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json +++ b/validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json @@ -1,7 +1,7 @@ { "references": { "A": [ - "./_cases/scopedPropertyAccess4.php" + "./scopedPropertyAccess4.php" ] }, "definitions": [] diff --git a/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json index b88e83e..1f3f3df 100644 --- a/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json +++ b/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json @@ -1,16 +1,16 @@ { "references": { "TestInterface": [ - "./_cases/scopedPropertyAccess5.php" + "./scopedPropertyAccess5.php" ], "TestClass": [ - "./_cases/scopedPropertyAccess5.php" + "./scopedPropertyAccess5.php" ], "TestClass::$testProperty": [ - "./_cases/scopedPropertyAccess5.php" + "./scopedPropertyAccess5.php" ], "TestClass::$staticTestProperty": [ - "./_cases/scopedPropertyAccess5.php" + "./scopedPropertyAccess5.php" ] }, "definitions": { @@ -23,7 +23,7 @@ "name": "TestClass", "kind": 5, "location": { - "uri": "./_cases/scopedPropertyAccess5.php" + "uri": "./scopedPropertyAccess5.php" }, "containerName": "" }, @@ -39,7 +39,7 @@ "name": "testProperty", "kind": 7, "location": { - "uri": "./_cases/scopedPropertyAccess5.php" + "uri": "./scopedPropertyAccess5.php" }, "containerName": "TestClass" }, diff --git a/validation/frameworks/_cases/self1.php.expected.json b/validation/frameworks/_cases/self1.php.expected.json index d6c1ccd..6d569d3 100644 --- a/validation/frameworks/_cases/self1.php.expected.json +++ b/validation/frameworks/_cases/self1.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/self1.php" + "./self1.php" ], "MyNamespace\\A::b()": [ - "./_cases/self1.php" + "./self1.php" ], "self": [ - "./_cases/self1.php" + "./self1.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/self1.php" + "uri": "./self1.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/self1.php" + "uri": "./self1.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/self1.php" + "uri": "./self1.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/self1.php" + "uri": "./self1.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/self1.php" + "uri": "./self1.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/self2.php.expected.json b/validation/frameworks/_cases/self2.php.expected.json index 4416af5..425e911 100644 --- a/validation/frameworks/_cases/self2.php.expected.json +++ b/validation/frameworks/_cases/self2.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/self2.php" + "./self2.php" ], "MyNamespace\\A::b()": [ - "./_cases/self2.php" + "./self2.php" ], "self": [ - "./_cases/self2.php" + "./self2.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/self2.php" + "uri": "./self2.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/self2.php" + "uri": "./self2.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/self2.php" + "uri": "./self2.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/self2.php" + "uri": "./self2.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/self2.php" + "uri": "./self2.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/self3.php.expected.json b/validation/frameworks/_cases/self3.php.expected.json index a75d4cd..764a424 100644 --- a/validation/frameworks/_cases/self3.php.expected.json +++ b/validation/frameworks/_cases/self3.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/self3.php" + "./self3.php" ], "MyNamespace\\A->b()": [ - "./_cases/self3.php" + "./self3.php" ], "self": [ - "./_cases/self3.php" + "./self3.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/self3.php" + "uri": "./self3.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/self3.php" + "uri": "./self3.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/self3.php" + "uri": "./self3.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/self3.php" + "uri": "./self3.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/self3.php" + "uri": "./self3.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/self4.php.expected.json b/validation/frameworks/_cases/self4.php.expected.json index fe688f3..c055887 100644 --- a/validation/frameworks/_cases/self4.php.expected.json +++ b/validation/frameworks/_cases/self4.php.expected.json @@ -1,16 +1,16 @@ { "references": { "self": [ - "./_cases/self4.php" + "./self4.php" ], "MyNamespace\\A->addTestFile()": [ - "./_cases/self4.php" + "./self4.php" ], "MyNamespace\\DS": [ - "./_cases/self4.php" + "./self4.php" ], "DS": [ - "./_cases/self4.php" + "./self4.php" ] }, "definitions": { @@ -23,7 +23,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/self4.php" + "uri": "./self4.php" }, "containerName": "" }, @@ -39,7 +39,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/self4.php" + "uri": "./self4.php" }, "containerName": "MyNamespace" }, @@ -55,7 +55,7 @@ "name": "suite", "kind": 6, "location": { - "uri": "./_cases/self4.php" + "uri": "./self4.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/self5.php.expected.json b/validation/frameworks/_cases/self5.php.expected.json index 914cf1b..5cf42dd 100644 --- a/validation/frameworks/_cases/self5.php.expected.json +++ b/validation/frameworks/_cases/self5.php.expected.json @@ -1,7 +1,7 @@ { "references": { "MyNamespace\\A->assertTrue()": [ - "./_cases/self5.php" + "./self5.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/self5.php" + "uri": "./self5.php" }, "containerName": "" }, @@ -30,7 +30,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/self5.php" + "uri": "./self5.php" }, "containerName": "MyNamespace" }, @@ -46,7 +46,7 @@ "name": "typesProvider", "kind": 6, "location": { - "uri": "./_cases/self5.php" + "uri": "./self5.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/static1.php.expected.json b/validation/frameworks/_cases/static1.php.expected.json index 3a7ddcc..14a117a 100644 --- a/validation/frameworks/_cases/static1.php.expected.json +++ b/validation/frameworks/_cases/static1.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/static1.php" + "./static1.php" ], "MyNamespace\\A::b()": [ - "./_cases/static1.php" + "./static1.php" ], "static": [ - "./_cases/static1.php" + "./static1.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/static1.php" + "uri": "./static1.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/static1.php" + "uri": "./static1.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/static1.php" + "uri": "./static1.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/static1.php" + "uri": "./static1.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/static1.php" + "uri": "./static1.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/static2.php.expected.json b/validation/frameworks/_cases/static2.php.expected.json index 73dbf9b..cc8d400 100644 --- a/validation/frameworks/_cases/static2.php.expected.json +++ b/validation/frameworks/_cases/static2.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/static2.php" + "./static2.php" ], "MyNamespace\\A::b()": [ - "./_cases/static2.php" + "./static2.php" ], "static": [ - "./_cases/static2.php" + "./static2.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/static2.php" + "uri": "./static2.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/static2.php" + "uri": "./static2.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/static2.php" + "uri": "./static2.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/static2.php" + "uri": "./static2.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/static2.php" + "uri": "./static2.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/static3.php.expected.json b/validation/frameworks/_cases/static3.php.expected.json index 265a93b..c70f6a2 100644 --- a/validation/frameworks/_cases/static3.php.expected.json +++ b/validation/frameworks/_cases/static3.php.expected.json @@ -1,13 +1,13 @@ { "references": { "MyNamespace\\B": [ - "./_cases/static3.php" + "./static3.php" ], "MyNamespace\\b()": [ - "./_cases/static3.php" + "./static3.php" ], "b()": [ - "./_cases/static3.php" + "./static3.php" ] }, "definitions": { @@ -20,7 +20,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/static3.php" + "uri": "./static3.php" }, "containerName": "" }, @@ -36,7 +36,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/static3.php" + "uri": "./static3.php" }, "containerName": "MyNamespace" }, @@ -52,7 +52,7 @@ "name": "b", "kind": 6, "location": { - "uri": "./_cases/static3.php" + "uri": "./static3.php" }, "containerName": "MyNamespace\\B" }, @@ -71,7 +71,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/static3.php" + "uri": "./static3.php" }, "containerName": "MyNamespace" }, @@ -87,7 +87,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/static3.php" + "uri": "./static3.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/static4.php.expected.json b/validation/frameworks/_cases/static4.php.expected.json index d0b6aa9..6ca8f97 100644 --- a/validation/frameworks/_cases/static4.php.expected.json +++ b/validation/frameworks/_cases/static4.php.expected.json @@ -1,10 +1,10 @@ { "references": { "MyNamespace\\B": [ - "./_cases/static4.php" + "./static4.php" ], "static": [ - "./_cases/static4.php" + "./static4.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "MyNamespace", "kind": 3, "location": { - "uri": "./_cases/static4.php" + "uri": "./static4.php" }, "containerName": "" }, @@ -35,7 +35,7 @@ "name": "A", "kind": 5, "location": { - "uri": "./_cases/static4.php" + "uri": "./static4.php" }, "containerName": "MyNamespace" }, @@ -51,7 +51,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/static4.php" + "uri": "./static4.php" }, "containerName": "MyNamespace\\A" }, diff --git a/validation/frameworks/_cases/stringVariable.php.expected.json b/validation/frameworks/_cases/stringVariable.php.expected.json index 6afd5c2..569bdc9 100644 --- a/validation/frameworks/_cases/stringVariable.php.expected.json +++ b/validation/frameworks/_cases/stringVariable.php.expected.json @@ -10,7 +10,7 @@ "name": "B", "kind": 5, "location": { - "uri": "./_cases/stringVariable.php" + "uri": "./stringVariable.php" }, "containerName": "" }, @@ -26,7 +26,7 @@ "name": "hi", "kind": 7, "location": { - "uri": "./_cases/stringVariable.php" + "uri": "./stringVariable.php" }, "containerName": "B" }, @@ -43,7 +43,7 @@ "name": "a", "kind": 6, "location": { - "uri": "./_cases/stringVariable.php" + "uri": "./stringVariable.php" }, "containerName": "B" }, diff --git a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json b/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json index 96cc2b8..0c7a37c 100644 --- a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json +++ b/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json @@ -1,7 +1,7 @@ { "references": { "NameOutsideOfNamespace": [ - "./_cases/testQualifiedNameOutsideOfNamespace.php" + "./testQualifiedNameOutsideOfNamespace.php" ] }, "definitions": { @@ -14,7 +14,7 @@ "name": "SomeNamespace", "kind": 3, "location": { - "uri": "./_cases/testQualifiedNameOutsideOfNamespace.php" + "uri": "./testQualifiedNameOutsideOfNamespace.php" }, "containerName": "" }, diff --git a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json b/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json index 42ef6d7..1fefbf7 100644 --- a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json +++ b/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json @@ -1,10 +1,10 @@ { "references": { "CURLAUTH_BASIC": [ - "./_cases/verifyFqsenOnClassProperty.php" + "./verifyFqsenOnClassProperty.php" ], "Foo->bar": [ - "./_cases/verifyFqsenOnClassProperty.php" + "./verifyFqsenOnClassProperty.php" ] }, "definitions": { @@ -17,7 +17,7 @@ "name": "Foo", "kind": 5, "location": { - "uri": "./_cases/verifyFqsenOnClassProperty.php" + "uri": "./verifyFqsenOnClassProperty.php" }, "containerName": "" }, @@ -33,7 +33,7 @@ "name": "bar", "kind": 7, "location": { - "uri": "./_cases/verifyFqsenOnClassProperty.php" + "uri": "./verifyFqsenOnClassProperty.php" }, "containerName": "Foo" }, @@ -50,7 +50,7 @@ "name": "foo", "kind": 6, "location": { - "uri": "./_cases/verifyFqsenOnClassProperty.php" + "uri": "./verifyFqsenOnClassProperty.php" }, "containerName": "Foo" },