diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8bad3494da8..3b3fda5f000 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.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" diff --git a/README.md b/README.md index 9c7f8b25501..ce8b7e991eb 100644 --- a/README.md +++ b/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 diff --git a/ci/github/phpunit.oci8.xml b/ci/github/phpunit.oci8.xml new file mode 100644 index 00000000000..e6b927f9927 --- /dev/null +++ b/ci/github/phpunit.oci8.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + ../../tests + + + + + + ../../lib + + + + + + performance + + + diff --git a/ci/github/phpunit.pdo-oci.xml b/ci/github/phpunit.pdo-oci.xml new file mode 100644 index 00000000000..94fe38c2825 --- /dev/null +++ b/ci/github/phpunit.pdo-oci.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + ../../tests + + + + + + ../../lib + + + + + + performance + + + diff --git a/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php b/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php index ed8d0d88b6b..ce1ce87a5a0 100644 --- a/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php +++ b/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php @@ -97,7 +97,7 @@ public static function executeDataProvider(): iterable public function testConvertNonTerminatedLiteral(string $sql, string $message): void { $this->expectException(OCI8Exception::class); - $this->expectExceptionMessageRegExp($message); + $this->expectExceptionMessageMatches($message); OCI8Statement::convertPositionalToNamedPlaceholders($sql); } diff --git a/tests/continuousphp/bootstrap.php b/tests/continuousphp/bootstrap.php deleted file mode 100644 index 899fd6d5e16..00000000000 --- a/tests/continuousphp/bootstrap.php +++ /dev/null @@ -1,16 +0,0 @@ - 'oci8', - 'host' => 'oracle-xe-11', - 'user' => 'ORACLE', - 'password' => 'ORACLE', - 'dbname' => 'XE', - ])->query('ALTER USER ORACLE IDENTIFIED BY ORACLE'); -})(); diff --git a/tests/continuousphp/install-pdo-oci.sh b/tests/continuousphp/install-pdo-oci.sh deleted file mode 100755 index 7db42f31f83..00000000000 --- a/tests/continuousphp/install-pdo-oci.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 diff --git a/tests/continuousphp/oci8.phpunit.continuousphp.xml b/tests/continuousphp/oci8.phpunit.continuousphp.xml deleted file mode 100644 index e4b945d0689..00000000000 --- a/tests/continuousphp/oci8.phpunit.continuousphp.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ../Doctrine/Tests/DBAL - - - - - - ../../lib/Doctrine - - - - - - performance - locking_functional - - - diff --git a/tests/continuousphp/pdo-oci.phpunit.xml b/tests/continuousphp/pdo-oci.phpunit.xml deleted file mode 100644 index 9f73a8bd453..00000000000 --- a/tests/continuousphp/pdo-oci.phpunit.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - ../Doctrine/Tests/DBAL - - - - - - ../../lib/Doctrine - - - -