Merge branch 'release/4.1.0'

roy-bongers · Feb 3, 2024 · b8dbdd4 · b8dbdd4
2 parents 5db8c15 + 405102a
commit b8dbdd4
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 51 deletions.
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -10,7 +10,7 @@ jobs:
     name: Code Syle
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -10,32 +10,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v5
         with:
           images: rbongers/certbot-dns-transip
-          tag-semver: |
-            {{version}}
-            {{major}}.{{minor}}
-            {{major}}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Build
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -12,10 +12,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Setup PHP ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
@@ -30,7 +30,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ letsencrypt
 
 # PHPUnit
 .phpunit.result.cache
+.phpunit.cache
 .php_cs
 .php-cs-fixer.dist.php
 .php_cs.cache

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -15,13 +15,14 @@
 return (new Config())
     ->setRules(
         [
-            '@Symfony'                          => true,
-            'array_syntax'                      => ['syntax' => 'short'],
-            'no_unused_imports'                 => true,
-            'trailing_comma_in_multiline'       => ['elements' => ['arrays']],
-            'increment_style'                   => ['style' => 'post'],
-            'concat_space'                      => ['spacing' => 'one'],
-            'single_line_throw'                 => false,
-            'global_namespace_import'           => ['import_classes' => true],
+            '@Symfony'                    => true,
+            'array_syntax'                => ['syntax' => 'short'],
+            'no_unused_imports'           => true,
+            'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+            'increment_style'             => ['style' => 'post'],
+            'concat_space'                => ['spacing' => 'one'],
+            'single_line_throw'           => false,
+            'global_namespace_import'     => ['import_classes' => true],
+            'operator_linebreak'          => ['position' => 'end', 'only_booleans' => true],
         ]
     )->setFinder($finder);
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.1.0] - 2024-02-03
+- Add PHP 8.3 support, drop PHP 8.0 support
+
 ## [4.0.1] - 2023-01-12
 - Fixes incorrectly merged branch
 
@@ -134,6 +137,7 @@ make it easier to add support for additional providers.
  - Don't query already up-to-date nameservers.
  - In the cleanup hook only remove the TXT record with the challenge string received from Certbot. Used to remove all `_acme-challenge` TXT records.
 
+[4.1.0]: https://github.com/roy-bongers/certbot-transip-dns-01-validator/compare/v4.0.1...v4.1.0
 [4.0.1]: https://github.com/roy-bongers/certbot-transip-dns-01-validator/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/roy-bongers/certbot-transip-dns-01-validator/compare/v3.0.2...v4.0.0
 [3.0.2]: https://github.com/roy-bongers/certbot-transip-dns-01-validator/compare/v3.0.1...v3.0.2

diff --git a/auth-hook b/auth-hook
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+
 declare(strict_types=1);
 
 define('APP_ROOT', __DIR__);

diff --git a/cleanup-hook b/cleanup-hook
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+
 declare(strict_types=1);
 
 define('APP_ROOT', __DIR__);

diff --git a/composer.json b/composer.json
@@ -22,15 +22,15 @@
     },
     "require": {
         "php": "^8.0",
-        "monolog/monolog": "^2.0",
+        "monolog/monolog": "^3.5",
         "purplepixie/phpdns": "dev-master",
-        "php-di/php-di": "^6.0",
+        "php-di/php-di": "^7.0",
         "transip/transip-api-php": "^6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.5",
         "mockery/mockery": "^1.3.0",
-        "symfony/phpunit-bridge": "^6.0",
+        "symfony/phpunit-bridge": "^7.0",
         "friendsofphp/php-cs-fixer": "^3.0"
     },
     "autoload": {
@@ -56,7 +56,10 @@
     },
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
+        },
+        "allow-plugins": {
+            "php-http/discovery": true
         }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
-        bootstrap="vendor/autoload.php">
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
-    <testsuites>
-        <testsuite name="certbot">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="certbot">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/app.php b/src/app.php
@@ -19,7 +19,6 @@
 
 // build dependency injection container
 $builder = new ContainerBuilder();
-$builder->useAnnotations(false);
 $builder->addDefinitions(array_map('DI\get', $providers));
 $builder->addDefinitions(
     [

diff --git a/tests/CertbotDns01/Certbot/AuthHookTest.php b/tests/CertbotDns01/Certbot/AuthHookTest.php
@@ -2,7 +2,6 @@
 
 namespace RoyBongers\Tests\CertbotDns01\Certbot;
 
-use Hamcrest\Matchers;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
@@ -34,7 +33,7 @@ public function testAuthHookWithPrimaryDomain(): void
             'AfricanOrEuropeanSwallow'
         );
         $this->provider->shouldReceive('createChallengeDnsRecord')
-            ->with(Matchers::equalTo($expectedChallengeRecord))
+            ->with(Mockery::on(fn (ChallengeRecord $challengeRecord) => $challengeRecord == $expectedChallengeRecord))
             ->once();
 
         $this->provider->shouldReceive('getNameservers')
@@ -62,7 +61,7 @@ public function testAuthHookWithSubDomain(): void
         );
 
         $this->provider->shouldReceive('createChallengeDnsRecord')
-            ->with(Matchers::equalTo($expectedChallengeRecord))
+            ->with(Mockery::on(fn ($challengeRecord) => $expectedChallengeRecord == $challengeRecord))
             ->once();
 
         $this->provider->shouldReceive('getNameservers')

diff --git a/tests/CertbotDns01/Certbot/CleanupHookTest.php b/tests/CertbotDns01/Certbot/CleanupHookTest.php
@@ -2,7 +2,6 @@
 
 namespace RoyBongers\Tests\CertbotDns01\Certbot;
 
-use Hamcrest\Matchers;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
@@ -29,7 +28,7 @@ public function testCleanupHookWithPrimaryDomain(): void
         );
 
         $this->provider->shouldReceive('cleanChallengeDnsRecord')
-            ->with(Matchers::equalTo($expectedChallengeRecord))
+            ->with(Mockery::on(fn (ChallengeRecord $challengeRecord) => $challengeRecord == $expectedChallengeRecord))
             ->once();
 
         $this->expectNotToPerformAssertions();
@@ -49,7 +48,7 @@ public function testCleanupHookWithSubDomain(): void
         );
 
         $this->provider->shouldReceive('cleanChallengeDnsRecord')
-            ->with(Matchers::equalTo($expectedChallengeRecord))
+            ->with(Mockery::on(fn (ChallengeRecord $challengeRecord) => $challengeRecord == $expectedChallengeRecord))
             ->once();
 
         $this->expectNotToPerformAssertions();

diff --git a/tests/CertbotDns01/Providers/TransIpTest.php b/tests/CertbotDns01/Providers/TransIpTest.php
@@ -2,7 +2,6 @@
 
 namespace RoyBongers\Tests\CertbotDns01\Providers;
 
-use Hamcrest\Matchers;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
@@ -36,7 +35,7 @@ public function testItCreatesChallengeDnsRecord(): void
         );
 
         $this->dnsService->shouldReceive('addDnsEntryToDomain')
-            ->with('domain.com', Matchers::equalTo($expectedDnsEntry))
+            ->with('domain.com', Mockery::on(fn (DnsEntry $dnsEntry) => $dnsEntry == $expectedDnsEntry))
             ->once();
 
         $this->transIp->createChallengeDnsRecord(
@@ -69,7 +68,7 @@ public function testItCleansChallengeDnsRecord(): void
 
         // assert the challenge record is being removed.
         $this->dnsService->shouldReceive('removeDnsEntry')
-            ->with('domain.com', Matchers::identicalTo($challengeDnsEntry))
+            ->with('domain.com', Mockery::on(fn (DnsEntry $dnsEntry) => $dnsEntry === $challengeDnsEntry))
             ->once();
 
         $this->transIp->cleanChallengeDnsRecord(
@@ -96,7 +95,7 @@ function (string $domain) {
         $this->assertEquals($domainNames, $this->transIp->getDomainNames());
     }
 
-    private function generateDnsRecords(DnsEntry $additionalDnsEntry = null): array
+    private function generateDnsRecords(?DnsEntry $additionalDnsEntry = null): array
     {
         $dnsEntries = [
             [