Merge branch '2.10.x' into 2.11.x

.github/workflows/continuous-integration.yml

@@ -102,3 +102,87 @@ jobs:
 
       - name: "Run squizlabs/php_codesniffer"
         run: "vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr"
+
+  phpunit-oci8:
+    name: "PHPUnit on OCI8"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+
+    services:
+      oracle:
+        image: "wnameless/oracle-xe-11g-r2"
+        ports:
+          - "1521:1521"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "oci8"
+          coverage: "pcov"
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/cache@v1"
+        with:
+          path: "~/.composer/cache"
+          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+
+      - name: "Install dependencies with composer"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Run PHPUnit"
+        run: "vendor/bin/phpunit -c ci/github/phpunit.oci8.xml --coverage-clover=coverage.xml"
+
+      - name: "Upload Code Coverage"
+        uses: "codecov/codecov-action@v1"
+
+  phpunit-pdo-oci:
+    name: "PHPUnit on PDO_OCI"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+
+    services:
+      oracle:
+        image: "wnameless/oracle-xe-11g-r2"
+        ports:
+          - "1521:1521"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "pdo_oci"
+          coverage: "pcov"
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/cache@v1"
+        with:
+          path: "~/.composer/cache"
+          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+
+      - name: "Install dependencies with composer"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Run PHPUnit"
+        run: "vendor/bin/phpunit -c ci/github/phpunit.pdo-oci.xml --coverage-clover=coverage.xml"
+
+      - name: "Upload Code Coverage"
+        uses: "codecov/codecov-action@v1"

README.md

@@ -17,16 +17,13 @@ Powerful database abstraction layer with many features for database schema intro
 
   [Master image]: https://img.shields.io/travis/doctrine/dbal/master.svg?style=flat-square
   [Coverage image]: https://codecov.io/gh/doctrine/dbal/branch/master/graph/badge.svg
-  [ContinuousPHP image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/master.svg?style=flat-square
   [Master]: https://travis-ci.org/doctrine/dbal
   [CodeCov Master]: https://codecov.io/gh/doctrine/dbal/branch/master
   [AppVeyor master]: https://ci.appveyor.com/project/doctrine/dbal/branch/master
   [AppVeyor master image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/master?svg=true
-  [ContinuousPHP]: https://continuousphp.com/git-hub/doctrine/dbal
 
   [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
   [Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg
-  [ContinuousPHP 2.10 image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/2.10.x.svg?style=flat-square
   [2.10]: https://github.com/doctrine/dbal/tree/2.10.x
   [CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x
   [AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x

ci/github/phpunit.oci8.xml

+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <var name="db_driver" value="oci8"/>
+        <var name="db_host" value="localhost"/>
+        <var name="db_user" value="doctrine"/>
+        <var name="db_password" value="oracle"/>
+        <var name="db_dbname" value="XE"/>
+        <var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit"/>
+
+        <var name="tmpdb_driver" value="oci8"/>
+        <var name="tmpdb_host" value="localhost"/>
+        <var name="tmpdb_user" value="system"/>
+        <var name="tmpdb_password" value="oracle"/>
+        <var name="tmpdb_dbname" value="XE"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">../../lib</directory>
+        </whitelist>
+    </filter>
+
+    <groups>
+        <exclude>
+            <group>performance</group>
+        </exclude>
+    </groups>
+</phpunit>

ci/github/phpunit.pdo-oci.xml

+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <var name="db_driver" value="pdo_oci"/>
+        <var name="db_host" value="localhost"/>
+        <var name="db_user" value="doctrine"/>
+        <var name="db_password" value="oracle"/>
+        <var name="db_dbname" value="XE"/>
+        <var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit"/>
+
+        <var name="tmpdb_driver" value="pdo_oci"/>
+        <var name="tmpdb_host" value="localhost"/>
+        <var name="tmpdb_user" value="system"/>
+        <var name="tmpdb_password" value="oracle"/>
+        <var name="tmpdb_dbname" value="XE"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">../../lib</directory>
+        </whitelist>
+    </filter>
+
+    <groups>
+        <exclude>
+            <group>performance</group>
+        </exclude>
+    </groups>
+</phpunit>

tests/continuousphp/bootstrap.php

-<?php
-
-declare(strict_types=1);
-
-use Doctrine\DBAL\DriverManager;
-
-(static function (): void {
-    // workaround for https://bugs.php.net/bug.php?id=77120
-    DriverManager::getConnection([
-        'driver' => 'oci8',
-        'host' => 'oracle-xe-11',
-        'user' => 'ORACLE',
-        'password' => 'ORACLE',
-        'dbname' => 'XE',
-    ])->query('ALTER USER ORACLE IDENTIFIED BY ORACLE');
-})();

tests/continuousphp/install-pdo-oci.sh

-#!/bin/bash
-
-set -euo pipefail
-
-docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/local/instantclient
-sudo -E env PHP_INI_DIR=/usr/local/etc/php docker-php-ext-install pdo_oci

tests/continuousphp/oci8.phpunit.continuousphp.xml

-<?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         bootstrap="bootstrap.php"
->
-  <php>
-    <ini name="error_reporting" value="-1" />
-
-    <var name="db_driver" value="oci8"/>
-    <var name="db_host" value="oracle-xe-11" />
-    <var name="db_user" value="C##doctrine" />
-    <var name="db_password" value="ORACLE" />
-    <var name="db_dbname" value="XE" />
-    <var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit"/>
-
-    <var name="tmpdb_driver" value="oci8"/>
-    <var name="tmpdb_host" value="oracle-xe-11" />
-    <var name="tmpdb_user" value="ORACLE" />
-    <var name="tmpdb_password" value="ORACLE" />
-    <var name="tmpdb_dbname" value="XE" />
-  </php>
-
-  <testsuites>
-    <testsuite name="Doctrine DBAL Test Suite">
-      <directory>../Doctrine/Tests/DBAL</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">../../lib/Doctrine</directory>
-    </whitelist>
-  </filter>
-
-  <groups>
-    <exclude>
-      <group>performance</group>
-      <group>locking_functional</group>
-    </exclude>
-  </groups>
-</phpunit>

tests/continuousphp/pdo-oci.phpunit.xml

-<?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         bootstrap="bootstrap.php"
->
-  <php>
-    <var name="db_driver" value="pdo_oci"/>
-    <var name="db_host" value="oracle-xe-11" />
-    <var name="db_user" value="C##doctrine" />
-    <var name="db_password" value="ORACLE" />
-    <var name="db_dbname" value="XE" />
-    <var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit"/>
-
-    <var name="tmpdb_driver" value="pdo_oci"/>
-    <var name="tmpdb_host" value="oracle-xe-11" />
-    <var name="tmpdb_user" value="ORACLE" />
-    <var name="tmpdb_password" value="ORACLE" />
-    <var name="tmpdb_dbname" value="XE" />
-  </php>
-
-  <testsuites>
-    <testsuite name="Doctrine DBAL Test Suite">
-      <directory>../Doctrine/Tests/DBAL</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">../../lib/Doctrine</directory>
-    </whitelist>
-  </filter>
-
-</phpunit>