From d430570ff7f4ea9410b797ec1c26f2e32a698cb4 Mon Sep 17 00:00:00 2001 From: Robert Brodie Date: Fri, 12 Jul 2024 15:07:59 -0400 Subject: [PATCH 1/2] SP-995 Update dependencies, fix mocks --- composer.json | 2 +- composer.lock | 78 +++++++++---------- .../EncryptedFilesystemStorageTest.php | 2 +- .../Storage/FilesystemStorageTest.php | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index db99e38..87a3b2e 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "ext-iconv": "*" }, "require-dev": { - "phpunit/phpunit": "10.5.20" + "phpunit/phpunit": "10.5.27" }, "suggest": { "ext-gmp": "Required to use this package with GMP instead of BCMath" diff --git a/composer.lock b/composer.lock index 60b8495..1c588ca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "116f702aad79000727a2bf2b126cd6c9", + "content-hash": "8759deebcf14c4e9661afb6d183b309a", "packages": [], "packages-dev": [ { @@ -69,16 +69,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -89,7 +89,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -121,9 +121,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "phar-io/manifest", @@ -245,16 +245,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.14", + "version": "10.1.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae", + "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae", "shasum": "" }, "require": { @@ -311,7 +311,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15" }, "funding": [ { @@ -319,7 +319,7 @@ "type": "github" } ], - "time": "2024-03-12T15:33:41+00:00" + "time": "2024-06-29T08:25:15+00:00" }, { "name": "phpunit/php-file-iterator", @@ -566,16 +566,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.20", + "version": "10.5.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" + "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", - "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5", + "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5", "shasum": "" }, "require": { @@ -585,26 +585,26 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^10.1.15", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.1", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -647,7 +647,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27" }, "funding": [ { @@ -663,7 +663,7 @@ "type": "tidelift" } ], - "time": "2024-04-24T06:32:35+00:00" + "time": "2024-07-10T11:48:06+00:00" }, { "name": "sebastian/cli-parser", diff --git a/test/unit/BitPayKeyUtils/Storage/EncryptedFilesystemStorageTest.php b/test/unit/BitPayKeyUtils/Storage/EncryptedFilesystemStorageTest.php index c03f316..989e3ba 100644 --- a/test/unit/BitPayKeyUtils/Storage/EncryptedFilesystemStorageTest.php +++ b/test/unit/BitPayKeyUtils/Storage/EncryptedFilesystemStorageTest.php @@ -19,7 +19,7 @@ public function testInstanceOf(): void public function testPersist(): void { $encryptedFilesystemStorage = $this->createClassObject(); - $keyInterface = $this->getMockBuilder(Key::class)->setMockClassName('KeyMock')->getMock(); + $keyInterface = $this->getMockBuilder(Key::class)->setMockClassName('KeyMock2')->getMock(); $keyInterface->method('getId')->willReturn(__DIR__ . '/test11.txt'); self::assertFileExists(__DIR__ . '/test11.txt'); self::assertSame(null, $encryptedFilesystemStorage->persist($keyInterface)); diff --git a/test/unit/BitPayKeyUtils/Storage/FilesystemStorageTest.php b/test/unit/BitPayKeyUtils/Storage/FilesystemStorageTest.php index 489ce42..145b1a0 100644 --- a/test/unit/BitPayKeyUtils/Storage/FilesystemStorageTest.php +++ b/test/unit/BitPayKeyUtils/Storage/FilesystemStorageTest.php @@ -20,7 +20,7 @@ public function testInstanceOf(): void public function testPersist(): void { $filesystemStorage = $this->createClassObject(); - $keyInterface = $this->getMockBuilder(Key::class)->setMockClassName('KeyMock')->getMock(); + $keyInterface = $this->getMockBuilder(Key::class)->setMockClassName('KeyMock1')->getMock(); $keyInterface->method('getId')->willReturn(__DIR__ . '/test1.txt'); self::assertFileExists(__DIR__ . '/test1.txt'); @chmod(__DIR__ . 'test1.txt', 0777); From 0e4cfb6b4180df466c081434b9a96707eb2781ea Mon Sep 17 00:00:00 2001 From: Robert Brodie Date: Fri, 12 Jul 2024 15:10:23 -0400 Subject: [PATCH 2/2] SP-995 Update GitHub Actions --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34a962a..51622f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,24 +11,24 @@ jobs: php-version: ['8.1', '8.2', '8.3'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: php-actions/composer@v5 with: php_version: ${{ matrix.php-version }} args: --ignore-platform-reqs - - uses: php-actions/phpunit@v3 + - uses: php-actions/phpunit@v4 with: configuration: phpunit.xml php_version: ${{ matrix.php-version }} php_extensions: bcmath gmp xdebug - version: 10.5.20 + version: 10.5.27 env: XDEBUG_MODE: coverage phpcs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: php-actions/composer@v5 with: php_version: 8.1