From a54c91fac623e144735533e2e3b5f15b16f56d81 Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 17 Nov 2020 12:35:34 +0100 Subject: [PATCH 1/2] CI: Set-env is deprecated See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e048ede39df..820b3af825f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Enable code coverage if: matrix.coverage - run: echo '::set-env name=COVERAGE::1' + run: echo "COVERAGE=1" >> $GITHUB_ENV - name: Remove Doctrine MongoDB ODM if: (startsWith(matrix.php, '7.1') || startsWith(matrix.php, 'rc')) run: | @@ -222,7 +222,7 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Enable code coverage if: matrix.coverage - run: echo '::set-env name=COVERAGE::1' + run: echo "COVERAGE=1" >> $GITHUB_ENV - name: Remove Doctrine MongoDB ODM if: startsWith(matrix.php, '7.1') run: | From 3fe4bcc94fb429f2b44e3056aa2cce787019ce88 Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 17 Nov 2020 12:54:20 +0100 Subject: [PATCH 2/2] fix phpstan --- tests/JsonLd/Serializer/ObjectNormalizerTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/JsonLd/Serializer/ObjectNormalizerTest.php b/tests/JsonLd/Serializer/ObjectNormalizerTest.php index 8803496a8fe..a5f8d20273c 100644 --- a/tests/JsonLd/Serializer/ObjectNormalizerTest.php +++ b/tests/JsonLd/Serializer/ObjectNormalizerTest.php @@ -48,8 +48,8 @@ public function testNormalize() '@id' => '_:1234', ]); - $normalizer = new ObjectNormalizer( // @phpstan-ignore-line - $serializerProphecy->reveal(), + $normalizer = new ObjectNormalizer( + $serializerProphecy->reveal(), // @phpstan-ignore-line $iriConverterProphecy->reveal(), $contextBuilderProphecy->reveal() ); @@ -77,8 +77,8 @@ public function testNormalizeEmptyArray() $contextBuilderProphecy = $this->prophesize(AnonymousContextBuilderInterface::class); $contextBuilderProphecy->getAnonymousResourceContext($dummy, Argument::type('array'))->shouldNotBeCalled(); - $normalizer = new ObjectNormalizer( // @phpstan-ignore-line - $serializerProphecy->reveal(), + $normalizer = new ObjectNormalizer( + $serializerProphecy->reveal(), // @phpstan-ignore-line $iriConverterProphecy->reveal(), $contextBuilderProphecy->reveal() ); @@ -101,8 +101,8 @@ public function testNormalizeWithOutput() $contextBuilderProphecy = $this->prophesize(AnonymousContextBuilderInterface::class); $contextBuilderProphecy->getAnonymousResourceContext($dummy, ['iri' => '/dummy/1234', 'api_resource' => $dummy])->shouldBeCalled()->willReturn(['@id' => '/dummy/1234', '@type' => 'Dummy', '@context' => []]); - $normalizer = new ObjectNormalizer( // @phpstan-ignore-line - $serializerProphecy->reveal(), + $normalizer = new ObjectNormalizer( + $serializerProphecy->reveal(), // @phpstan-ignore-line $iriConverterProphecy->reveal(), $contextBuilderProphecy->reveal() ); @@ -131,8 +131,8 @@ public function testNormalizeWithContext() $contextBuilderProphecy = $this->prophesize(AnonymousContextBuilderInterface::class); $contextBuilderProphecy->getAnonymousResourceContext($dummy, ['iri' => '/dummy/1234', 'api_resource' => $dummy, 'has_context' => true])->shouldBeCalled()->willReturn(['@id' => '/dummy/1234', '@type' => 'Dummy']); - $normalizer = new ObjectNormalizer( // @phpstan-ignore-line - $serializerProphecy->reveal(), + $normalizer = new ObjectNormalizer( + $serializerProphecy->reveal(), // @phpstan-ignore-line $iriConverterProphecy->reveal(), $contextBuilderProphecy->reveal() );