Merge pull request #69: Call the method only if there are additional …

…options

.github/workflows/ci-mssql.yml

@@ -30,6 +30,12 @@ jobs:
           - php: '8.1'
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
+          - php: '8.2'
+            extensions: pdo, pdo_sqlsrv
+            mssql: 'server:2019-latest'
+          - php: '8.3'
+            extensions: pdo, pdo_sqlsrv
+            mssql: 'server:2019-latest'
 
     services:
       mssql:
@@ -69,11 +75,11 @@ jobs:
         run: composer self-update
 
       - name: Install dependencies with composer
-        if: matrix.php != '8.2'
+        if: matrix.php != '8.3'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.2
-        if: matrix.php == '8.2'
+      - name: Install dependencies with composer php 8.3
+        if: matrix.php == '8.3'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit without coverage

.github/workflows/ci-mysql.yml

@@ -26,6 +26,8 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
 
         mysql-version:
           - "5.7"
@@ -82,11 +84,11 @@ jobs:
             php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
 
       - name: Install dependencies with composer
-        if: matrix.php-version != '8.2'
+        if: matrix.php-version != '8.3'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.2
-        if: matrix.php-version == '8.2'
+      - name: Install dependencies with composer php 8.3
+        if: matrix.php-version == '8.3'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run mysql tests with phpunit

.github/workflows/ci-pgsql.yml

@@ -25,6 +25,8 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
 
         pgsql-version:
           - "10"
@@ -83,11 +85,11 @@ jobs:
             php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
 
       - name: Install dependencies with composer
-        if: matrix.php-version != '8.2'
+        if: matrix.php-version != '8.3'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.2
-        if: matrix.php-version == '8.2'
+      - name: Install dependencies with composer php 8.3
+        if: matrix.php-version == '8.3'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run pgsql tests with phpunit

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -40,10 +40,10 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies with composer
-        if: matrix.php-versions != '8.2'
+        if: matrix.php-versions != '8.3'
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
-      - name: Install dependencies with composer php 8.2
-        if: matrix.php-versions == '8.2'
+      - name: Install dependencies with composer php 8.3
+        if: matrix.php-versions == '8.3'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
       - name: Execute Tests
         run: |

.github/workflows/psalm.yml

@@ -15,4 +15,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']

composer.json

@@ -8,7 +8,7 @@
   "require": {
     "php": ">=8.0",
     "cycle/orm": "^2.0",
-    "cycle/database": "^2.5",
+    "cycle/database": "^2.7.1",
     "yiisoft/friendly-exception": "^1.1"
   },
   "require-dev": {

src/Table/Column.php

@@ -113,7 +113,7 @@ public function render(AbstractColumn $column): void
 
         try {
             // bypassing call to AbstractColumn->type method (or specialized column method)
-            if (\method_exists($column, $this->type)) {
+            if (\method_exists($column, $this->type) && $this->typeOptions !== []) {
                 call_user_func_array([$column, $this->type], $this->typeOptions);
             } else {
                 call_user_func_array([$column, 'type'], \array_merge([$this->type], $this->typeOptions));