Merge branch 'master' into php8

Author: czosel

.circleci/config.yml

@@ -0,0 +1,26 @@
+name: Node CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [12.x, 14.x, 16.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install, test
+      run: |
+        npm install
+        npm test
+      env:
+        CI: true

.github/workflows/test.yml

@@ -5,19 +5,27 @@ const ENABLE_COVERAGE = !!process.env.CI || !!process.env.COVERAGE;
 module.exports = {
   collectCoverage: ENABLE_COVERAGE,
   coverageDirectory: "coverage/",
+  coverageThreshold: {
+    global: {
+      statements: 95.6,
+      branches: 89.6,
+      functions: 99,
+      lines: 96.1,
+    },
+  },
   projects: [
     {
       displayName: "test",
       testEnvironment: "node",
     },
-    //{
-    //  runner: "jest-runner-eslint",
-    //  displayName: "lint",
-    //  testMatch: ["<rootDir>/**/*.js"],
-    //  testPathIgnorePatterns: [
-    //    "<rootDir>/node_modules/",
-    //    "<rootDir>/coverage/",
-    //  ],
-    //},
+    {
+      runner: "jest-runner-eslint",
+      displayName: "lint",
+      testMatch: ["<rootDir>/**/*.js"],
+      testPathIgnorePatterns: [
+        "<rootDir>/node_modules/",
+        "<rootDir>/coverage/",
+      ],
+    },
   ],
 };

.travis.yml

@@ -458,7 +458,7 @@ AST.prototype.prepare = function (kind, docs, parser) {
 AST.prototype.checkNodes = function () {
   const errors = [];
   for (const k in AST.stack) {
-    if (AST.stack.hasOwnProperty(k)) {
+    if (Object.prototype.hasOwnProperty.call(AST.stack, k)) {
       errors.push(AST.stack[k]);
     }
   }

jest.config.js

@@ -199,8 +199,8 @@ Engine.tokenGetAll = function (buffer, options) {
 /**
  * Extract tokens from the specified buffer.
  * > Note that the output tokens are *STRICLY* similar to PHP function `token_get_all`
- * @param {String} buffer
- * @return {String[]} - Each item can be a string or an array with following informations [token_name, text, line_number]
+ * @param {string} buffer
+ * @return {Array<string|string[]>} - Each item can be a string or an array with following informations [token_name, text, line_number]
  */
 Engine.prototype.tokenGetAll = function (buffer) {
   this.lexer.mode_eval = false;
@@ -213,7 +213,7 @@ Engine.prototype.tokenGetAll = function (buffer) {
   const result = [];
   while (token != EOF) {
     let entry = this.lexer.yytext;
-    if (names.hasOwnProperty(token)) {
+    if (Object.prototype.hasOwnProperty.call(names, token)) {
       entry = [names[token], entry, this.lexer.yylloc.first_line];
     }
     result.push(entry);

src/ast.js

@@ -632,7 +632,12 @@ Parser.prototype.lex = function () {
       this.token = this.lexer.lex() || this.EOF;
       if (this.token === this.EOF) return this;
       let entry = this.lexer.yytext;
-      if (this.lexer.engine.tokens.values.hasOwnProperty(this.token)) {
+      if (
+        Object.prototype.hasOwnProperty.call(
+          this.lexer.engine.tokens.values,
+          this.token
+        )
+      ) {
         entry = [
           this.lexer.engine.tokens.values[this.token],
           entry,
@@ -703,7 +708,7 @@ Parser.prototype.is = function (type) {
   require("./parser/variable.js"),
 ].forEach(function (ext) {
   for (const k in ext) {
-    if (Parser.prototype.hasOwnProperty(k)) {
+    if (Object.prototype.hasOwnProperty.call(Parser.prototype, k)) {
       // @see https://github.com/glayzzle/php-parser/issues/234
       throw new Error("Function " + k + " is already defined - collision");
     }

src/index.js

@@ -129,7 +129,7 @@ declare module "php-parser" {
      */
     class Class extends Declaration {
         extends: Identifier | null;
-        implements: Identifier[];
+        implements: Identifier[] | null;
         body: Declaration[];
         isAnonymous: boolean;
         isAbstract: boolean;
@@ -700,6 +700,8 @@ declare module "php-parser" {
          */
         parseFlags(flags: (number | null)[]): void;
         properties: Property[];
+        visibility: string|null;
+        isStatic: bool;
     }
     /**
      * Defines a reference node
@@ -990,7 +992,7 @@ declare module "php-parser" {
          * > Note that the output tokens are *STRICLY* similar to PHP function `token_get_all`
          * @returns - Each item can be a string or an array with following informations [token_name, text, line_number]
          */
-        tokenGetAll(buffer: string): String[];
+        tokenGetAll(buffer: string): (string | string[])[];
         lexer: Lexer;
         parser: Parser;
         ast: AST;