Skip to content

Commit a69524f

Browse files
authored
Merge pull request github#11318 from erik-krogh/deleteMoreDeps
delete old deprecations
2 parents a964325 + 468a879 commit a69524f

File tree

82 files changed

+209
-910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+209
-910
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `getName` and `getShortName` predicates from the `Folder` class.

cpp/ql/lib/semmle/code/cpp/File.qll

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,6 @@ class Folder extends Container, @folder {
189189
* Gets the URL of this folder.
190190
*/
191191
deprecated override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
192-
193-
/**
194-
* DEPRECATED: use `getAbsolutePath` instead.
195-
* Gets the name of this folder.
196-
*/
197-
deprecated string getName() { folders(underlyingElement(this), result) }
198-
199-
/**
200-
* DEPRECATED: use `getBaseName` instead.
201-
* Gets the last part of the folder name.
202-
*/
203-
deprecated string getShortName() { result = this.getBaseName() }
204192
}
205193

206194
/**
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `getNameWithoutBrackets` predicate from the `ValueOrRefType` class in `Type.qll`.

csharp/ql/lib/semmle/code/csharp/Type.qll

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ private predicate isObjectClass(Class c) { c instanceof ObjectType }
5656
* Either a value type (`ValueType`) or a reference type (`RefType`).
5757
*/
5858
class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_or_ref_type {
59-
/**
60-
* DEPRECATED: use `getUndecoratedName()` instead.
61-
*
62-
* Gets the name of this type without `<...>` brackets, in case it is a generic type.
63-
*/
64-
deprecated string getNameWithoutBrackets() { types(this, _, result) }
65-
6659
/**
6760
* Holds if this type has the qualified name `qualifier`.`name`.
6861
*
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `LocalClassDeclStmtNode` and `LocalClassDeclStmt` classes from `PrintAst.qll` and `Statement.qll` respectively.
5+
* Deleted the deprecated `getLocalClass` predicate from `LocalTypeDeclStmt`, and the deprecated `getLocalClassDeclStmt` predicate from `LocalClassOrInterface`.

java/ql/lib/semmle/code/java/PrintAst.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,6 @@ final class LocalTypeDeclStmtNode extends ExprStmtNode {
393393
}
394394
}
395395

396-
/**
397-
* DEPRECATED: Renamed `LocalTypeDeclStmtNode` to reflect the fact that
398-
* as of Java 16 interfaces can also be declared locally, not just classes.
399-
*/
400-
deprecated class LocalClassDeclStmtNode = LocalTypeDeclStmtNode;
401-
402396
/**
403397
* A node representing a `ForStmt`.
404398
*/

java/ql/lib/semmle/code/java/Statement.qll

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -781,12 +781,6 @@ class LocalTypeDeclStmt extends Stmt, @localtypedeclstmt {
781781
/** Gets the local type declared by this statement. */
782782
LocalClassOrInterface getLocalType() { isLocalClassOrInterface(result, this) }
783783

784-
/**
785-
* DEPRECATED: Renamed `getLocalType` to reflect the fact that
786-
* as of Java 16 interfaces can also be declared locally, not just classes.
787-
*/
788-
deprecated LocalClassOrInterface getLocalClass() { result = this.getLocalType() }
789-
790784
private string getDeclKeyword() {
791785
result = "class" and this.getLocalType() instanceof Class
792786
or
@@ -802,12 +796,6 @@ class LocalTypeDeclStmt extends Stmt, @localtypedeclstmt {
802796
override string getAPrimaryQlClass() { result = "LocalTypeDeclStmt" }
803797
}
804798

805-
/**
806-
* DEPRECATED: Renamed `LocalTypeDeclStmt` to reflect the fact that
807-
* as of Java 16 interfaces can also be declared locally, not just classes.
808-
*/
809-
deprecated class LocalClassDeclStmt = LocalTypeDeclStmt;
810-
811799
/** An explicit `this(...)` constructor invocation. */
812800
class ThisConstructorInvocationStmt extends Stmt, ConstructorCall, @constructorinvocationstmt {
813801
/** Gets an argument of this constructor invocation. */

java/ql/lib/semmle/code/java/Type.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -828,12 +828,6 @@ class LocalClassOrInterface extends NestedType, ClassOrInterface {
828828
/** Gets the statement that declares this local class. */
829829
LocalTypeDeclStmt getLocalTypeDeclStmt() { isLocalClassOrInterface(this, result) }
830830

831-
/**
832-
* DEPRECATED: renamed `getLocalTypeDeclStmt` to reflect the fact that
833-
* as of Java 16 interfaces can also be declared locally.
834-
*/
835-
deprecated LocalTypeDeclStmt getLocalClassDeclStmt() { result = this.getLocalTypeDeclStmt() }
836-
837831
override string getAPrimaryQlClass() { result = "LocalClassOrInterface" }
838832
}
839833

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `Instance` class from the `Vue` module.
5+
* Deleted the deprecated `VHtmlSourceWrite` class from `DomBasedXssQuery.qll`.
6+
* Deleted all the deprecated `[QueryName].qll` files from the `javascript/ql/lib/semmle/javascript/security/dataflow` folder, use the corresponding `[QueryName]Query.qll` files instead.

javascript/ql/lib/semmle/javascript/frameworks/Vue.qll

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ module Vue {
115115
kind = DataFlow::MemberKind::setter() and result = "set"
116116
}
117117

118-
/**
119-
* DEPRECATED. This class has been renamed to `Vue::Component`.
120-
*/
121-
deprecated class Instance = Component;
122-
123118
/**
124119
* A Vue component, such as a `new Vue({ ... })` call or a `.vue` file.
125120
*
@@ -383,23 +378,6 @@ module Vue {
383378
}
384379
}
385380

386-
/**
387-
* DEPRECATED. Use `Vue::Component` instead.
388-
*
389-
* A Vue component from `new Vue({...})`.
390-
*/
391-
deprecated class VueInstance extends Component {
392-
VueInstance() {
393-
// restrict charpred to match original behavior
394-
this = MkComponentInstantiation(vueLibrary().getAnInstantiation())
395-
}
396-
}
397-
398-
/**
399-
* DEPRECATED. Use `Vue::ComponentExtension` or `Vue::Component` instead.
400-
*/
401-
deprecated class ExtendedVue = ComponentExtension;
402-
403381
/**
404382
* A component created via an explicit call to `Vue.extend({...})` or `CustomComponent.extend({...})`.
405383
*/
@@ -429,19 +407,6 @@ module Vue {
429407
}
430408
}
431409

432-
/**
433-
* DEPRECATED. Use `Vue::Component` instead.
434-
*
435-
* An instance of an extended Vue, for example `instance` of `var Ext = Vue.extend({...}); var instance = new Ext({...})`.
436-
*/
437-
deprecated class ExtendedInstance extends Component {
438-
ExtendedInstance() {
439-
// restrict charpred to match original behavior
440-
this =
441-
MkComponentInstantiation(vueLibrary().getMember("extend").getReturn().getAnInstantiation())
442-
}
443-
}
444-
445410
/**
446411
* A Vue component from `Vue.component("my-component", { ... })`.
447412
*/
@@ -568,9 +533,6 @@ module Vue {
568533
}
569534
}
570535

571-
/** DEPRECATED. Do not use. */
572-
deprecated class InstanceHeapStep = PropStep;
573-
574536
/**
575537
* A Vue `v-html` attribute.
576538
*/
@@ -609,11 +571,6 @@ module Vue {
609571
}
610572
}
611573

612-
/**
613-
* DEPRECATED. Do not use.
614-
*/
615-
deprecated class VHtmlSourceWrite = VHtmlAttributeStep;
616-
617574
/*
618575
* Provides classes for working with Vue templates.
619576
*/

0 commit comments

Comments
 (0)