Merge branch 'master' into fixMethodReturnType

tests/Validation/ValidationTest.php

@@ -64,12 +64,7 @@ class ValidationTest extends TestCase
 
         try {
             $this->assertEquals($expectedValues['definitions'], $actualValues['definitions']);
-
-            try {
-                $this->assertArraySubset((array)$expectedValues['references'], (array)$actualValues['references'], false, 'references don\'t match.');
-            } catch (\Throwable $e) {
             $this->assertEquals((array)$expectedValues['references'], (array)$actualValues['references'], 'references don\'t match.');
-            }
         } catch (\Throwable $e) {
             $outputFile = getExpectedValuesFile($testCaseFile);
             file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));

tests/Validation/cases/WithReturnTypehints.php.expected.json

@@ -6,6 +6,12 @@
         "self": [
             "./WithReturnTypehints.php"
         ],
+        "Fixtures\\Prophecy\\__CLASS__": [
+            "./WithReturnTypehints.php"
+        ],
+        "__CLASS__": [
+            "./WithReturnTypehints.php"
+        ],
         "parent": [
             "./WithReturnTypehints.php"
         ]

tests/Validation/cases/exceptions1.php.expected.json

@@ -1,5 +1,9 @@
 {
-    "references": [],
+    "references": {
+        "MyNamespace\\Exception": [
+            "./exceptions1.php"
+        ]
+    },
     "definitions": {
         "MyNamespace": {
             "fqn": "MyNamespace",

tests/Validation/cases/functionUse2.php.expected.json

@@ -3,6 +3,9 @@
         "LanguageServer": [
             "./functionUse2.php"
         ],
+        "LanguageServer\\pathToUri()": [
+            "./functionUse2.php"
+        ],
         "LanguageServer\\timeout()": [
             "./functionUse2.php"
         ]

tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json

@@ -1,5 +1,12 @@
 {
-    "references": [],
+    "references": {
+        "B\\__FILE__": [
+            "./magicConstantsShouldBeGlobal.php"
+        ],
+        "__FILE__": [
+            "./magicConstantsShouldBeGlobal.php"
+        ]
+    },
     "definitions": {
         "B": {
             "fqn": "B",

tests/Validation/cases/magicConsts.php.expected.json

@@ -1,5 +1,9 @@
 {
-    "references": [],
+    "references": {
+        "__CLASS__": [
+            "./magicConsts.php"
+        ]
+    },
     "definitions": {
         "A": {
             "fqn": "A",

tests/Validation/cases/memberAccess5.php.expected.json

@@ -1,5 +1,9 @@
 {
-    "references": [],
+    "references": {
+        "MyNamespace\\ParseErrorsTest->args": [
+            "./memberAccess5.php"
+        ]
+    },
     "definitions": {
         "MyNamespace": {
             "fqn": "MyNamespace",

tests/Validation/cases/namespaces8.php.expected.json

@@ -2,6 +2,12 @@
     "references": {
         "LanguageServer": [
             "./namespaces8.php"
+        ],
+        "LanguageServer\\pathToUri()": [
+            "./namespaces8.php"
+        ],
+        "LanguageServer\\uriToPath()": [
+            "./namespaces8.php"
         ]
     },
     "definitions": {

tests/Validation/cases/self4.php.expected.json

@@ -6,6 +6,12 @@
         "MyNamespace\\A->addTestFile()": [
             "./self4.php"
         ],
+        "MyNamespace\\__DIR__": [
+            "./self4.php"
+        ],
+        "__DIR__": [
+            "./self4.php"
+        ],
         "MyNamespace\\DS": [
             "./self4.php"
         ],