From 1d7b6b2eb32c62b0f7fec2c10e979c024ef7e84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 15 Sep 2023 15:07:41 +0200 Subject: [PATCH 1/5] Update tests to run with recent phpunit versions --- tests/LangTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/LangTest.php b/tests/LangTest.php index ef1a46d..3e123ef 100644 --- a/tests/LangTest.php +++ b/tests/LangTest.php @@ -1,5 +1,5 @@ Date: Fri, 15 Sep 2023 15:12:54 +0200 Subject: [PATCH 2/5] Launch phpunit in CI --- .github/workflows/ci.yml | 18 ++++++++++++++++++ tests/phpunit.xml | 9 +++++++++ 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 tests/phpunit.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..a57c4df --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,18 @@ +name: CI + +on: [push] + +jobs: + build-test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: php-actions/composer@v6 + - name: PHPUnit Tests for php7.4 + uses: php-actions/phpunit@v3 + with: + configuration: tests/phpunit.xml + version: 5.7.25 + php_version: 7.4 + args: --coverage-text diff --git a/tests/phpunit.xml b/tests/phpunit.xml new file mode 100644 index 0000000..d6a1379 --- /dev/null +++ b/tests/phpunit.xml @@ -0,0 +1,9 @@ + + + + + . + + + + From 1bfc1cb39f8afacc016190ccee7ee6dcb586960a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 15 Sep 2023 15:23:14 +0200 Subject: [PATCH 3/5] composer update --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index ce24a32..1b089c6 100644 --- a/composer.lock +++ b/composer.lock @@ -44,16 +44,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.8.0", + "version": "v6.8.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "df16b615e371d81fb79e506277faea67a1be18f1" + "reference": "e88da8d679acc3824ff231fdc553565b802ac016" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/df16b615e371d81fb79e506277faea67a1be18f1", - "reference": "df16b615e371d81fb79e506277faea67a1be18f1", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e88da8d679acc3824ff231fdc553565b802ac016", + "reference": "e88da8d679acc3824ff231fdc553565b802ac016", "shasum": "" }, "require": { @@ -63,13 +63,13 @@ "php": ">=5.5.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "doctrine/annotations": "^1.2.6 || ^1.13.3", "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.7.1", + "squizlabs/php_codesniffer": "^3.7.2", "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { @@ -112,7 +112,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.0" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.1" }, "funding": [ { @@ -120,7 +120,7 @@ "type": "github" } ], - "time": "2023-03-06T14:43:22+00:00" + "time": "2023-08-29T08:26:30+00:00" } ], "packages-dev": [], From 3615ce2ba13407a0de48b85290cf9f72975df989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 15 Sep 2023 15:25:56 +0200 Subject: [PATCH 4/5] Fix PHP version --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a57c4df..f58e067 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: php-actions/composer@v6 + with: + php_version: "7.4" - name: PHPUnit Tests for php7.4 uses: php-actions/phpunit@v3 with: From 3aa765459e67616969d91b9015501c3d5cf7b38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 15 Sep 2023 15:27:57 +0200 Subject: [PATCH 5/5] Force installation of ldap extension --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f58e067..5e2494d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ jobs: - uses: php-actions/composer@v6 with: php_version: "7.4" + php_extensions: ldap - name: PHPUnit Tests for php7.4 uses: php-actions/phpunit@v3 with: