icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Fix 'type_class' set to wrong value

pull/357/head
Rob Lourens 2017-05-15 16:47:42 -07:00
parent 403e0c5743
commit e46d0ded11
57 changed files with 3 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Validation/ValidationTest.php
View File

@ -69,7 +69,7 @@ class ValidationTest extends TestCase
$outputFile = getExpectedValuesFile($testCaseFile);
if (!file_exists($outputFile)) {
file_put_contents(json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
}
$expectedValues = (array)json_decode(file_get_contents($outputFile));
@ -153,9 +153,9 @@ class ValidationTest extends TestCase
unset($definition->$propertyName->location->range);
} elseif ($propertyName === 'extends') {
$definition->$propertyName = $definition->$propertyName ?? [];
} elseif ($propertyName === 'type') {
} elseif ($propertyName === 'type' && $definition->type !== null) {
// Class info is not captured by json_encode. It's important for 'type'.
$defsForAssert[$fqn][$propertyName . '__class'] = get_class($definition->$propertyName);
$defsForAssert[$fqn]['type__class'] = get_class($definition->type);
}
$defsForAssert[$fqn][$propertyName] = $definition->$propertyName;

2
validation/frameworks/_cases/WithReturnTypehints.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": "Fixtures"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -43,7 +42,6 @@
},
"containerName": "Fixtures\\Prophecy"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/caseStatement1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

2
validation/frameworks/_cases/classDefinition1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "TestNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/classProperty1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "TestNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/constants.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/constants2.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/constants3.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/constants4.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/constants5.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -35,7 +34,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/exceptions1.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/ifStatement1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/interfaceProperty.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/magicConsts.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberAccess1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberAccess2.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberAccess3.php.expected.json
View File

@ -36,7 +36,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -53,7 +52,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberAccess4.php.expected.json
View File

@ -27,7 +27,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -44,7 +43,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberAccess5.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -31,7 +30,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/memberCall1.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

4
validation/frameworks/_cases/multipleNamespaces.php.expected.json
View File

@ -27,7 +27,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -44,7 +43,6 @@
},
"containerName": "MyNamespace1"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -78,7 +76,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -97,7 +94,6 @@
},
"containerName": "MyNamespace2"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/multiplePreceedingComments.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/nameToken.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/namespaces2.php.expected.json
View File

@ -27,7 +27,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/namespaces5.php.expected.json
View File

@ -36,7 +36,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/namespaces6.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": "A"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/namespaces8.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": "LanguageServer\\Tests"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

2
validation/frameworks/_cases/objectCreation.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -35,7 +34,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/objectCreation2.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -55,7 +53,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/objectCreation3.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/param1.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/parent1.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -74,7 +72,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/parent3.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/propertyName1.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/propertyName2.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/returnType.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/scopedPropertyAccess.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -38,7 +37,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json
View File

@ -27,7 +27,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/self1.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/self2.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/self3.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/self4.php.expected.json
View File

@ -27,7 +27,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -44,7 +43,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/self5.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -35,7 +34,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/static1.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/static2.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

3
validation/frameworks/_cases/static3.php.expected.json
View File

@ -24,7 +24,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -41,7 +40,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -77,7 +75,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

2
validation/frameworks/_cases/static4.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},
@ -40,7 +39,6 @@
},
"containerName": "MyNamespace"
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/stringVariable.php.expected.json
View File

@ -14,7 +14,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},

1
validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json
View File

@ -18,7 +18,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
}

1
validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json
View File

@ -21,7 +21,6 @@
},
"containerName": ""
},
"type__class": "LanguageServer\\Tests\\ValidationTest",
"type": null,
"documentation": null
},