PHP 8.4 Support: #[\Deprecated] Attribute#8139
Merged
junichi11 merged 2 commits intoapache:masterfrom Jan 11, 2025
Merged
Conversation
- apache#8035 - https://wiki.php.net/rfc#php_84 - https://wiki.php.net/rfc/deprecated_attribute - Fix/Improve `SemanticAnalysis` - Get deprecated attributes or phpdoc tags from ASTNodes(Attributes and PHPDoc comments) instead of getting deprecated flags from an index. That way, it should also improve performance. - Add the `IncorrectDeprecatedAttributeHintError` because "Deprecated" attribute cannot target type and field - Add unit tests for the navigator, hints, and semantic analysis
- Use `Set.contains()` instead of a for-each loop
junichi11
commented
Jan 11, 2025
| break; | ||
| } | ||
| } | ||
| isDeprecated = getDeprecatedTypes().contains(fullyQualifiedName); |
Member
Author
There was a problem hiding this comment.
Use contains() instead of a for-each loop. I think it's better.
| } | ||
|
|
||
| private Set<TypeElement> getDeprecatedTypes() { | ||
| private Set<QualifiedName> getDeprecatedTypes() { |
Member
Author
There was a problem hiding this comment.
Changed this to use contains().
Comment on lines
+268
to
+281
| private boolean isDeprecatedDeclaration(ASTNode node) { | ||
| boolean isDeprecated = false; | ||
| if (!isCancelled() && isResolveDeprecatedElements()) { | ||
| long startTime = 0; | ||
| if (LOGGER.isLoggable(Level.FINE)) { | ||
| startTime = System.currentTimeMillis(); | ||
| } | ||
| isDeprecated = VariousUtils.isDeprecated(model.getFileScope(), program, node); | ||
| if (LOGGER.isLoggable(Level.FINE)) { | ||
| long time = System.currentTimeMillis() - startTime; | ||
| LOGGER.fine(String.format("isDeprecatedDeclaration() took %d ms", time)); // NOI18N | ||
| } | ||
| } | ||
| return Collections.unmodifiableSet(deprecatedEnumCases); | ||
| return isDeprecated; |
Member
Author
There was a problem hiding this comment.
Added instead of isDeprecated[Type|Method|...]Declaration().
We can check whether a target node has a "Deprecated" attribute/@deprecated without getting all elements from an index. I hope this change also improves performance.
So, I removed getDeprecated[Methods|Constants|...]().
Member
There was a problem hiding this comment.
Have you tried to "measure" it? Just curious. I don't expect any performance problems.
Member
There was a problem hiding this comment.
I mean, just to check the times from logging you added, not to compare it to the previous implementation.
Member
Author
There was a problem hiding this comment.
Example:
#[Deprecated]
function deprecated(): void {
}
#[Deprecated("2.0.0", "use newFunction() instead")]
function deprecatedWithParam01(): void {
}
#[Deprecated(since: "2.0.0", message: "use newFunction() instead")]
function deprecatedWithParam02(): void {
}
#[\Deprecated]
function deprecatedFQN(): void {
}
#[\Deprecated("2.0.0", "use newFunction() instead")]
function deprecatedFQNWithParam01(): void {
}
#[\Deprecated(since: "2.0.0", message: "use newFunction() instead")]
function deprecatedFQNWithParam02(): void {
}FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
FINE [org.netbeans.modules.php.editor.csl.SemanticAnalysis]: isDeprecatedDeclaration() took 0 ms
tmysik
approved these changes
Jan 11, 2025
Member
tmysik
left a comment
There was a problem hiding this comment.
The simplification looks nice. Many tests so we should be fine :) Thank you for all your work, @junichi11.
Member
Author
|
@tmysik Thank you for your time! Merging... |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PHP 8.4 Support: #[\Deprecated] Attribute (Part 1)
SemanticAnalysisPHPDoc comments) instead of getting deprecated flags from an index.
That way, it should also improve performance.
IncorrectDeprecatedAttributeHintErrorbecause "Deprecated"attribute cannot target type and field
Minor imporovement for SemanticAnalysis
Set.contains()instead of a for-each loop