From bd9ed8daf4ee0c93fcb6e541cdba0ac32b605fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Gon=C3=A7alves?= Date: Tue, 9 Apr 2024 11:15:41 +0100 Subject: [PATCH] Make even more properties read-only (#42) Update ramsey/composer-install to v3 on github actions --- .github/workflows/continuous-integration.yml | 2 +- src/Executor/CachePoolExecutor.php | 6 ++++-- src/Executor/ElasticsearchExecutor.php | 6 +++--- src/Executor/HttpClientExecutor.php | 6 ++++-- src/Executor/NonTransactionalConnectionExecutor.php | 2 +- src/Purger/CachePoolPurger.php | 2 +- src/Purger/ElasticsearchPurger.php | 2 +- src/Purger/HttpClientPurger.php | 2 +- src/Purger/NonTransactionalConnectionPurger.php | 2 +- src/Tools/HttpClient.php | 1 - 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e51371d..11ee2dd 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -33,7 +33,7 @@ jobs: coverage: xdebug - name: Install Composer Dependencies - uses: ramsey/composer-install@v2 + uses: ramsey/composer-install@v3 with: dependency-versions: ${{ matrix.dependencies }} composer-options: "--prefer-stable" diff --git a/src/Executor/CachePoolExecutor.php b/src/Executor/CachePoolExecutor.php index bf32535..ff288f1 100644 --- a/src/Executor/CachePoolExecutor.php +++ b/src/Executor/CachePoolExecutor.php @@ -9,8 +9,10 @@ final class CachePoolExecutor implements ExecutorInterface { - public function __construct(private CacheItemPoolInterface $cache, private PurgerInterface $purger) - { + public function __construct( + private readonly CacheItemPoolInterface $cache, + private readonly PurgerInterface $purger + ) { } public function execute(array $fixtures, bool $append = false): void diff --git a/src/Executor/ElasticsearchExecutor.php b/src/Executor/ElasticsearchExecutor.php index 28c59a5..e37fec7 100644 --- a/src/Executor/ElasticsearchExecutor.php +++ b/src/Executor/ElasticsearchExecutor.php @@ -10,9 +10,9 @@ final class ElasticsearchExecutor implements ExecutorInterface { public function __construct( - private Client $elasticSearch, - private string $indexName, - private PurgerInterface $purger + private readonly Client $elasticSearch, + private readonly string $indexName, + private readonly PurgerInterface $purger ) { } diff --git a/src/Executor/HttpClientExecutor.php b/src/Executor/HttpClientExecutor.php index bfbf2ca..34cc1e4 100644 --- a/src/Executor/HttpClientExecutor.php +++ b/src/Executor/HttpClientExecutor.php @@ -9,8 +9,10 @@ final class HttpClientExecutor implements ExecutorInterface { - public function __construct(private HttpClientInterface $httpClient, private PurgerInterface $purger) - { + public function __construct( + private readonly HttpClientInterface $httpClient, + private readonly PurgerInterface $purger + ) { } public function execute(array $fixtures, bool $append = false): void diff --git a/src/Executor/NonTransactionalConnectionExecutor.php b/src/Executor/NonTransactionalConnectionExecutor.php index f0d87ca..4604c27 100644 --- a/src/Executor/NonTransactionalConnectionExecutor.php +++ b/src/Executor/NonTransactionalConnectionExecutor.php @@ -8,7 +8,7 @@ final class NonTransactionalConnectionExecutor implements ExecutorInterface { - private ExecutorInterface $executor; + private readonly ExecutorInterface $executor; public function __construct(Connection $connection, PurgerInterface $purger) { diff --git a/src/Purger/CachePoolPurger.php b/src/Purger/CachePoolPurger.php index a1b0881..8edc190 100644 --- a/src/Purger/CachePoolPurger.php +++ b/src/Purger/CachePoolPurger.php @@ -8,7 +8,7 @@ final class CachePoolPurger implements PurgerInterface { - public function __construct(private CacheItemPoolInterface $cachePool) + public function __construct(private readonly CacheItemPoolInterface $cachePool) { } diff --git a/src/Purger/ElasticsearchPurger.php b/src/Purger/ElasticsearchPurger.php index 37f4c82..37ec96e 100644 --- a/src/Purger/ElasticsearchPurger.php +++ b/src/Purger/ElasticsearchPurger.php @@ -8,7 +8,7 @@ final class ElasticsearchPurger implements PurgerInterface { - public function __construct(private Client $elasticSearch, private string $indexName) + public function __construct(private readonly Client $elasticSearch, private readonly string $indexName) { } diff --git a/src/Purger/HttpClientPurger.php b/src/Purger/HttpClientPurger.php index 6bee386..52917b8 100644 --- a/src/Purger/HttpClientPurger.php +++ b/src/Purger/HttpClientPurger.php @@ -8,7 +8,7 @@ final class HttpClientPurger implements PurgerInterface { - public function __construct(private HttpClientInterface $httpClient) + public function __construct(private readonly HttpClientInterface $httpClient) { } diff --git a/src/Purger/NonTransactionalConnectionPurger.php b/src/Purger/NonTransactionalConnectionPurger.php index 8c283c0..1bcf1c9 100644 --- a/src/Purger/NonTransactionalConnectionPurger.php +++ b/src/Purger/NonTransactionalConnectionPurger.php @@ -7,7 +7,7 @@ final class NonTransactionalConnectionPurger implements PurgerInterface { - private PurgerInterface $purger; + private readonly PurgerInterface $purger; public function __construct(Connection $connection, array $excludedTables = []) { diff --git a/src/Tools/HttpClient.php b/src/Tools/HttpClient.php index e3c12c5..621fd7d 100644 --- a/src/Tools/HttpClient.php +++ b/src/Tools/HttpClient.php @@ -82,7 +82,6 @@ private function recreateResponseFactory(array $responses): void $reflectionClass = new ReflectionClass(MockHttpClient::class); $reflectionProperty = $reflectionClass->getProperty('responseFactory'); - $reflectionProperty->setAccessible(true); $reflectionProperty->setValue($this, $responseFactory); } }