Merge pull request #50 from keboola/zajca-gh-actions

zajca · web-flow · commit 45a6c4af68bd · 2022-04-21T11:16:26.000+02:00
GH actions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,30 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-latest']
+        php-versions: ['7.4','8.0','8.1']
+        phpunit-versions: ['latest']
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+      -
+        name: Tests
+        run: |
+          composer install
+          composer ci
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.0
+FROM php:7.4-cli
 MAINTAINER Ondrej Hlavacek <ondrej.hlavacek@keboola.com>
 
 ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"
diff --git a/composer.json b/composer.json
@@ -9,14 +9,13 @@
         }
     ],
     "require": {
-        "php": ">=5.6"
+        "php": ">=7.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0",
-        "squizlabs/php_codesniffer": "^2.6",
-        "codeclimate/php-test-reporter": "~0.4",
-        "phpstan/phpstan": "~0.9",
-        "php-parallel-lint/php-parallel-lint": "^1.1"
+        "phpunit/phpunit": "^9",
+        "squizlabs/php_codesniffer": "^3",
+        "phpstan/phpstan": "^1",
+        "php-parallel-lint/php-parallel-lint": "^1"
     },
     "autoload": {
         "psr-4": {
diff --git a/generate-composer56.php b/generate-composer56.php
diff --git a/src/Definition/Common.php b/src/Definition/Common.php
@@ -101,7 +101,7 @@ abstract public function getBasetype();
     abstract public function toArray();
 
     /**
-     * @param string|null $length
+     * @param string|int|null $length
      * @return bool
      */
     protected function isEmpty($length)
@@ -177,7 +177,7 @@ protected function validateNumericLength($length, $firstMax, $secondMax, $firstM
     }
 
     /**
-     * @param mixed $length
+     * @param string|int|null $length
      * @param int $max
      * @param int $min
      * @return bool
diff --git a/src/Definition/GenericStorage.php b/src/Definition/GenericStorage.php
@@ -50,7 +50,7 @@ public function __construct($type, array $options = [])
     public function getSQLDefinition()
     {
         $sql = $this->getType();
-        if ($this->getLength() && $this->getLength() != "") {
+        if ($this->getLength() && $this->getLength() !== '') {
             $sql .= "(" . $this->getLength() . ")";
         }
         $sql .= ($this->isNullable()) ? " NULL" : " NOT NULL";
diff --git a/src/Definition/MySQL.php b/src/Definition/MySQL.php
@@ -49,7 +49,7 @@ public function __construct($type, $options = [])
     public function getSQLDefinition()
     {
         $definition =  $this->getType();
-        if ($this->getLength() && $this->getLength() != "") {
+        if ($this->getLength() && $this->getLength() !== '') {
             $definition .= "(" . $this->getLength() . ")";
         }
         if (!$this->isNullable()) {
diff --git a/src/Definition/Redshift.php b/src/Definition/Redshift.php
@@ -61,7 +61,7 @@ public function getCompression()
     public function getSQLDefinition()
     {
         $definition =  $this->getType();
-        if ($this->getLength() && $this->getLength() != "") {
+        if ($this->getLength() && $this->getLength() !== '') {
             $definition .= "(" . $this->getLength() . ")";
         }
         if (!$this->isNullable()) {
diff --git a/tests/CommonDatatypeTest.php b/tests/CommonDatatypeTest.php
@@ -2,8 +2,9 @@
 namespace Keboola\DataypeTest;
 
 use Keboola\Datatype\Definition\Common;
+use PHPUnit\Framework\TestCase;
 
-class CommonDatatypeTest extends \PHPUnit_Framework_TestCase
+class CommonDatatypeTest extends TestCase
 {
     public function testConstructor()
     {
diff --git a/tests/ExasolDatatypeTest.php b/tests/ExasolDatatypeTest.php
@@ -7,8 +7,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidLengthException;
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
+use PHPUnit\Framework\TestCase;
 
-class ExasolDatatypeTest extends \PHPUnit_Framework_TestCase
+class ExasolDatatypeTest extends TestCase
 {
     /**
      * @dataProvider typesProvider
diff --git a/tests/GenericStorageDatatypeTest.php b/tests/GenericStorageDatatypeTest.php
@@ -4,8 +4,9 @@
 
 use Keboola\Datatype\Definition\Common;
 use Keboola\Datatype\Definition\GenericStorage;
+use PHPUnit\Framework\TestCase;
 
-class GenericStorageDatatypeTest extends \PHPUnit_Framework_TestCase
+class GenericStorageDatatypeTest extends TestCase
 {
     public function testGetBasetype()
     {
diff --git a/tests/MySQLDatatypeTest.php b/tests/MySQLDatatypeTest.php
@@ -5,8 +5,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
 use Keboola\Datatype\Definition\MySQL;
+use PHPUnit\Framework\TestCase;
 
-class MySQLDatatypeTest extends \PHPUnit_Framework_TestCase
+class MySQLDatatypeTest extends TestCase
 {
     public function testValid()
     {
@@ -242,7 +243,7 @@ public function invalidNumericLengths()
             ["66,66"]
         ];
     }
-    
+
     public function invalidIntegerLengths()
     {
         return [
diff --git a/tests/RedshiftDatatypeTest.php b/tests/RedshiftDatatypeTest.php
@@ -7,8 +7,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
 use Keboola\Datatype\Definition\Redshift;
+use PHPUnit\Framework\TestCase;
 
-class RedshiftDatatypeTest extends \PHPUnit_Framework_TestCase
+class RedshiftDatatypeTest extends TestCase
 {
     public function testValid()
     {
diff --git a/tests/SnowflakeDatatypeTest.php b/tests/SnowflakeDatatypeTest.php
@@ -5,8 +5,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
 use Keboola\Datatype\Definition\Snowflake;
+use PHPUnit\Framework\TestCase;
 
-class SnowflakeDatatypeTest extends \PHPUnit_Framework_TestCase
+class SnowflakeDatatypeTest extends TestCase
 {
     public function testValid()
     {
diff --git a/tests/SynapseDatatypeTest.php b/tests/SynapseDatatypeTest.php
@@ -7,8 +7,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
 use Keboola\Datatype\Definition\Synapse;
+use PHPUnit\Framework\TestCase;
 
-class SynapseDatatypeTest extends \PHPUnit_Framework_TestCase
+class SynapseDatatypeTest extends TestCase
 {
     public function invalidLengths()
     {
diff --git a/tests/TeradataDatatypeTest.php b/tests/TeradataDatatypeTest.php
@@ -7,8 +7,9 @@
 use Keboola\Datatype\Definition\Exception\InvalidOptionException;
 use Keboola\Datatype\Definition\Exception\InvalidTypeException;
 use Keboola\Datatype\Definition\Teradata;
+use PHPUnit\Framework\TestCase;
 
-class TeradataDatatypeTest extends \PHPUnit_Framework_TestCase
+class TeradataDatatypeTest extends TestCase
 {
     /**
      * @dataProvider typesProvider

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.0`
	`1`	`+FROM php:7.4-cli`
`2`	`2`	`MAINTAINER Ondrej Hlavacek <ondrej.hlavacek@keboola.com>`
`3`	`3`
`4`	`4`	`ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct($type, array $options = [])`
`50`	`50`	`public function getSQLDefinition()`
`51`	`51`	`{`
`52`	`52`	`$sql = $this->getType();`
`53`		`- if ($this->getLength() && $this->getLength() != "") {`
	`53`	`+ if ($this->getLength() && $this->getLength() !== '') {`
`54`	`54`	`$sql .= "(" . $this->getLength() . ")";`
`55`	`55`	`}`
`56`	`56`	`$sql .= ($this->isNullable()) ? " NULL" : " NOT NULL";`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct($type, $options = [])`
`49`	`49`	`public function getSQLDefinition()`
`50`	`50`	`{`
`51`	`51`	`$definition = $this->getType();`
`52`		`- if ($this->getLength() && $this->getLength() != "") {`
	`52`	`+ if ($this->getLength() && $this->getLength() !== '') {`
`53`	`53`	`$definition .= "(" . $this->getLength() . ")";`
`54`	`54`	`}`
`55`	`55`	`if (!$this->isNullable()) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function getCompression()`
`61`	`61`	`public function getSQLDefinition()`
`62`	`62`	`{`
`63`	`63`	`$definition = $this->getType();`
`64`		`- if ($this->getLength() && $this->getLength() != "") {`
	`64`	`+ if ($this->getLength() && $this->getLength() !== '') {`
`65`	`65`	`$definition .= "(" . $this->getLength() . ")";`
`66`	`66`	`}`
`67`	`67`	`if (!$this->isNullable()) {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`	`namespace Keboola\DataypeTest;`
`3`	`3`
`4`	`4`	`use Keboola\Datatype\Definition\Common;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`
`6`		`-class CommonDatatypeTest extends \PHPUnit_Framework_TestCase`
	`7`	`+class CommonDatatypeTest extends TestCase`
`7`	`8`	`{`
`8`	`9`	`public function testConstructor()`
`9`	`10`	`{`