Allow doctrine/instantiator 2.x (#8)

* Allow doctrine/instantiator 2.x * Update pdo_sqlsrv extension
cycle · Nov 21, 2023 · 2a6633c · 2a6633c
1 parent 4307314
commit 2a6633c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
@@ -24,7 +24,7 @@ jobs:
             extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
           - php: '8.1'
-            extensions: pdo, pdo_sqlsrv-5.10.0beta2
+            extensions: pdo, pdo_sqlsrv
             mssql: 'server:2019-latest'
 
     services:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
           tools: pecl
-          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv-5.10.0beta2, pdo_mysql
+          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
       - name: Get Composer Cache Directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": ">=8.0",
         "cycle/orm": "^2.0",
-        "doctrine/instantiator": "^1.3.1",
+        "doctrine/instantiator": "^1.3.1 || ^2.0",
         "laminas/laminas-hydrator": "^4.0"
     },
     "require-dev": {