Merge pull request #33 from Icinga/support-php8

Support PHP 8

.github/workflows/php.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
         os: ['ubuntu-latest']
         include:
           - php: '5.6'
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           tools: phpcs
@@ -51,18 +51,20 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      phpunit-version: 7.5.20
+      phpunit-version: 8.5.15
 
     strategy:
       fail-fast: false
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
         os: ['ubuntu-latest']
         include:
           - php: '5.6'
             phpunit-version: 5.7.27
           - php: '7.0'
             phpunit-version: 6.5.14
+          - php: '7.1'
+            phpunit-version: 7.5.20
 
     steps:
       - name: Checkout code base

tests/DeleteTest.php

@@ -21,28 +21,34 @@ class DeleteTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryBuilder;
 
-    public function setUp()
+    public function setupTestTest()
     {
         $this->query = new Delete();
         $this->queryBuilder = new QueryBuilder(new TestAdapter());
     }
 
     public function testFrom()
     {
+        $this->setupTestTest();
+
         $this->query->from('table');
         $this->assertSame(['table'], $this->query->getFrom());
         $this->assertCorrectStatementAndValues('DELETE FROM table', []);
     }
 
     public function testFromWithAlias()
     {
+        $this->setupTestTest();
+
         $this->query->from('table t1');
         $this->assertSame(['table t1'], $this->query->getFrom());
         $this->assertCorrectStatementAndValues('DELETE FROM table t1', []);
     }
 
     public function testFromWithArray()
     {
+        $this->setupTestTest();
+
         $this->query->from(['t1' => 'table']);
         $this->assertSame(['t1' => 'table'], $this->query->getFrom());
         $this->assertCorrectStatementAndValues('DELETE FROM table t1', []);

tests/HavingTest.php

@@ -23,14 +23,16 @@ class HavingTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryBuilder;
 
-    public function setUp()
+    public function setupTest()
     {
         $this->query = new Select();
         $this->queryBuilder = new QueryBuilder(new TestAdapter());
     }
 
     public function testHavingStringFormat()
     {
+        $this->setupTest();
+
         $this->query->having('c1 = x');
         $this->query->having('c2 IS NULL');
         $this->query->having('c3 IS NOT NULL');
@@ -40,6 +42,8 @@ public function testHavingStringFormat()
 
     public function testHavingArrayFormat()
     {
+        $this->setupTest();
+
         $this->query->having(['c1 = x']);
         $this->query->having(['c2 = ?' => 1]);
         $this->query->having(['c3 > ?' => 1]);
@@ -57,6 +61,8 @@ public function testHavingArrayFormat()
 
     public function testWhereWithExpression()
     {
+        $this->setupTest();
+
         $expression = new Expression('c2 = ?', null, 1);
         $this->query->having($expression);
 
@@ -65,6 +71,8 @@ public function testWhereWithExpression()
 
     public function testWhereWithSelect()
     {
+        $this->setupTest();
+
         $select = (new Select())->columns('COUNT(*)')->from('t1')->where(['c2 = ?' => 1]);
         $this->query->having($select);
 
@@ -73,6 +81,8 @@ public function testWhereWithSelect()
 
     public function testResetHaving()
     {
+        $this->setupTest();
+
         $this->query->having('c1 = x');
         $this->assertSame(
             ['AND', [['AND', ['c1 = x']]]],

tests/InsertTest.php

@@ -23,14 +23,16 @@ class InsertTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryBuilder;
 
-    public function setUp()
+    public function setupTest()
     {
         $this->query = new Insert();
         $this->queryBuilder = new QueryBuilder(new TestAdapter());
     }
 
     public function testEmptyInsertInto()
     {
+        $this->setupTest();
+
         $this->assertSame(null, $this->query->getInto());
         $this->assertSame([], $this->query->getColumns());
         $this->assertSame([], $this->query->getValues());
@@ -40,6 +42,8 @@ public function testEmptyInsertInto()
 
     public function testIntoTableSpecification()
     {
+        $this->setupTest();
+
         $this->query->into('table');
 
         $this->assertSame('table', $this->query->getInto());
@@ -48,6 +52,8 @@ public function testIntoTableSpecification()
 
     public function testIntoTableSpecificationWithSchema()
     {
+        $this->setupTest();
+
         $this->query->into('schema.table');
 
         $this->assertSame('schema.table', $this->query->getInto());
@@ -56,6 +62,8 @@ public function testIntoTableSpecificationWithSchema()
 
     public function testColumns()
     {
+        $this->setupTest();
+
         $columns = ['c1', 'c2'];
         $this->query->columns($columns);
 
@@ -65,6 +73,8 @@ public function testColumns()
 
     public function testValues()
     {
+        $this->setupTest();
+
         $this->query->values(['c1' => 'v1']);
 
         $this->assertSame(['c1'], $this->query->getColumns());
@@ -74,6 +84,8 @@ public function testValues()
 
     public function testExpressionValue()
     {
+        $this->setupTest();
+
         $value = new Expression('x = ?', null, 1);
         $this->query->values(['c1' => $value]);
 
@@ -84,6 +96,8 @@ public function testExpressionValue()
 
     public function testSelectValue()
     {
+        $this->setupTest();
+
         $value = (new Select())->columns('COUNT(*)')->from('table2')->where(['active = ?' => 1]);
         $this->query->values(['c1' => $value]);
 
@@ -94,6 +108,8 @@ public function testSelectValue()
 
     public function testColumnsAndValues()
     {
+        $this->setupTest();
+
         $this->query->columns(['c1', 'c2']);
         $this->query->values(['v1', 'v2']);
 
@@ -104,6 +120,8 @@ public function testColumnsAndValues()
 
     public function testInsertIntoSelectStatement()
     {
+        $this->setupTest();
+
         $select = (new Select())
             ->from('table')
             ->columns(['c1', 'c2']);
@@ -119,6 +137,8 @@ public function testInsertIntoSelectStatement()
 
     public function testInsertIntoStatementWithValues()
     {
+        $this->setupTest();
+
         $this->query
             ->into('table')
             ->values(['c1' => 'v1', 'c2' => 'v2']);
@@ -128,6 +148,8 @@ public function testInsertIntoStatementWithValues()
 
     public function testInsertIntoStatementWithColumnsAndValues()
     {
+        $this->setupTest();
+
         $this->query
             ->into('table')
             ->columns(['c1', 'c2'])

tests/Mssql/SelectTest.php

@@ -22,35 +22,43 @@ class SelectTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryBuilder;
 
-    public function setUp()
+    public function setupTest()
     {
         $this->query = new Select();
         $this->queryBuilder = new QueryBuilder(new Mssql());
     }
 
     public function testLimitOffset()
     {
+        $this->setupTest();
+
         $this->query->columns('a')->from('b')->orderBy('a')->limit(10)->offset(20);
 
         $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 20 ROWS FETCH NEXT 10 ROWS ONLY');
     }
 
     public function testLimitWithoutOffset()
     {
+        $this->setupTest();
+
         $this->query->columns('a')->from('b')->orderBy('a')->limit(10);
 
         $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY');
     }
 
     public function testOffsetWithoutLimit()
     {
+        $this->setupTest();
+
         $this->query->columns('a')->from('b')->orderBy('a')->offset(20);
 
         $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY a OFFSET 20 ROWS');
     }
 
     public function testAutomaticallyFixesLimitWithoutOrder()
     {
+        $this->setupTest();
+
         $this->query->columns('a')->from('b')->limit(10)->offset(30);
 
         $this->assertCorrectStatementAndValues('SELECT a FROM b ORDER BY 1 OFFSET 30 ROWS FETCH NEXT 10 ROWS ONLY');