Merge branch 'feature/php-74' into develop

Author: crodas

.github/workflows/main.yml

@@ -0,0 +1,36 @@
+name: Testing
+on: [push, pull_request]
+jobs:
+  laravel:
+    name: (PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }})
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        php-versions: ['7.2', '7.3', '7.4']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, dom, fileinfo, pdo_sqlite
+          coverage: xdebug #optional
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Test with phpunit
+        run: vendor/bin/phpunit --coverage-text

.travis.yml

@@ -14,9 +14,9 @@
         "files": ["src/autoload.php"]
     },
     "minimum-stability": "stable",
-    "require": {},
     "require-dev": {
         "crodas/autoloader": "^0.1.16",
-        "crodas/phpunit-compat": "^1.7"
+        "crodas/phpunit-compat": "^1.7",
+        "fpoirotte/php_parsergenerator": "^0.2.4"
     }
 }

composer.json

@@ -52,7 +52,7 @@ class Lexer
 %matchlongest 1
 
 
-whitespace = /[ \t\n]+/
+whitespace = /[ \t\r\n]+/
 
 comment = /\-\-[^\n]+/
 number  = /[0-9]+(\.[0-9]+)?|0x[0-9a-fA-F]+/

src/SQLParser/Lexer.lex

@@ -75,7 +75,7 @@ function yylex1()
         }
         do {
             $rules = array(
-                '/\G[ \t\n]+/i ',
+                '/\G[ \t\r\n]+/i ',
                 '/\G\"/i ',
                 '/\G\'/i ',
                 '/\G`/i ',

src/SQLParser/Lexer.php

@@ -2,13 +2,19 @@
 /* Driver template for the PHP_SQLParser_rGenerator parser generator. (PHP port of LEMON)
 */
 
+// code external to the class is included here
+#line 2 "src/SQLParser/Parser.y"
+
+use SQLParser\Stmt;
+#line 11 "src/SQLParser/Parser.php"
+
 /**
  * This can be used to store both the string representation of
  * a token, and any useful meta-data associated with the token.
  *
  * meta-data should be stored as an array
  */
-class SQLParser_yyToken implements ArrayAccess
+class SQLParser_yyToken implements \ArrayAccess
 {
     public $string = '';
     public $metadata = array();
@@ -93,12 +99,6 @@ class SQLParser_yyStackEntry
                      ** is the value of the token  */
 };
 
-// code external to the class is included here
-#line 2 "src/SQLParser/Parser.y"
-
-use SQLParser\Stmt;
-#line 102 "src/SQLParser/Parser.php"
-
 // declare_class is output here
 #line 6 "src/SQLParser/Parser.y"
  class SQLParser_Parser #line 107 "src/SQLParser/Parser.php"
@@ -2519,7 +2519,7 @@ function yy_r66(){ $this->_retvalue = [];     }
 #line 138 "src/SQLParser/Parser.y"
     function yy_r67(){
     $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor->setTable($this->yystack[$this->yyidx + -1]->minor[0], $this->yystack[$this->yyidx + -1]->minor[1]);
-    if ($this->yystack[$this->yyidx + 0]->minor[0]) {
+    if (is_array($this->yystack[$this->yyidx + 0]->minor) && $this->yystack[$this->yyidx + 0]->minor[0]) {
         $this->_retvalue->{$this->yystack[$this->yyidx + 0]->minor[0]}($this->yystack[$this->yyidx + 0]->minor[1]);
     }
     }

src/SQLParser/Parser.php

@@ -137,7 +137,7 @@ joins(A) ::= . { A = []; }
 
 join(A) ::= join_type(B) JOIN table_with_alias(C) join_condition(D). {
     A = B->setTable(C[0], C[1]);
-    if (D[0]) {
+    if (is_array(D) && D[0]) {
         A->{D[0]}(D[1]);
     }
 }

src/SQLParser/Parser.y

@@ -178,10 +178,11 @@ public function testFeaturesGeneration($parser, $sql, $file, $engine)
 
     /**
      *  @dataProvider featuresException
-     *  @expectedException RuntimeException
      */
     public function testFeaturesParsingErrors($sql, $parser)
     {
+        $this->expectException(RuntimeException::class);
+
         $parser->parse($sql);
     }
 

tests/AllTest.php

@@ -36,11 +36,9 @@ public function testTableDiff($tableDiff, $prev, $current, Array $expected)
         }
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testTableDiffException()
     {
+        $this->expectException(InvalidArgumentException::class);
         $diff = new SQL\TableDiff;
         $diff->diff("SELECT 1", "SELECT 2");
     }

tests/TableDiffTest.php

@@ -77,35 +77,30 @@ public function testExprReturnsNull()
         $x = new SQLParser\Stmt\Expr('xxx');
         $this->assertNull($x->getMember(10));
     }
-    /**
-     * @expectedException InvalidArgumentException
-     */
+
     public function testInvalidWriterObject()
     {
+        $this->expectException(InvalidArgumentException::class);
         Writer::create($this);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidWriterInstance()
     {
+        $this->expectException(InvalidArgumentException::class);
         Writer::setInstance($this);
     }
 
     public function testWriterFromPDO()
     {
-        $driver = new PDO("sqlite:memory");
+        $driver = new PDO("sqlite::memory:");
         Writer::setInstance($driver);
 
         $this->assertTrue(Writer::getInstance() instanceof SQL\Writer\SQLite);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidVariableValue()
     {
+        $this->expectException(InvalidArgumentException::class);
         $parser = new SQLParser();
         $queries = $parser->parse("SELECT * FROM t WHERE y = :name");
         Writer::create($queries[0], ['name' => ['invalid value']]);