Skip to content

Commit 0aa0d94

Browse files
nanasessclaude
andcommitted
fix(entity): nullable型の戻り値型エラーを修正
PHPUnitテストで発生していた型エラーを修正: - PaymentResult::getResponse(): Response|null に変更し、nullチェックを追加 - Tag::getName(): string|null に変更し、__toString()でnull対応 - Order::getUsePoint(): string|null に変更(PointTrait/ItemHolderInterface) - HelpControllerTest: デバッグ用のエラーメッセージを追加 これにより以下のテストエラーが解消: - ShoppingControllerTest::testCompleteWithLogin 他7件(PaymentResult) - TagControllerTest::testEditInvalid(Tag::getName) - ShoppingControllerTest::testPaymentWithError(Order::getUsePoint) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent a9cf9de commit 0aa0d94

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

src/Eccube/Controller/ShoppingController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ protected function executeCheckout(PaymentMethodInterface $paymentMethod): \Symf
938938
$PaymentResult = $paymentMethod->checkout();
939939
$response = $PaymentResult->getResponse();
940940
// PaymentResultがresponseを保持している場合はresponseを返す
941-
if ($response->isRedirection() || $response->isSuccessful()) {
941+
if ($response && ($response->isRedirection() || $response->isSuccessful())) {
942942
$this->entityManager->flush();
943943
log_info('[注文処理] PaymentMethod::checkoutが指定したレスポンスを表示します.');
944944

src/Eccube/Entity/ItemHolderInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ public function setUsePoint($usePoint): static;
119119
/**
120120
* 利用ポイントを返します.
121121
*
122-
* @return string
122+
* @return string|null
123123
*/
124-
public function getUsePoint(): string;
124+
public function getUsePoint(): ?string;
125125

126126
/**
127127
* @param ItemInterface $item

src/Eccube/Entity/PointTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public function setUsePoint($usePoint): static
7272
/**
7373
* Get usePoint
7474
*
75-
* @return string
75+
* @return string|null
7676
*/
77-
public function getUsePoint(): string
77+
public function getUsePoint(): ?string
7878
{
7979
return $this->use_point;
8080
}

src/Eccube/Entity/Tag.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Tag extends AbstractEntity implements \Stringable
3939
#[\Override]
4040
public function __toString(): string
4141
{
42-
return $this->getName();
42+
return $this->getName() ?? '';
4343
}
4444

4545
/**
@@ -123,9 +123,9 @@ public function setName($name): static
123123
/**
124124
* Get name.
125125
*
126-
* @return string
126+
* @return string|null
127127
*/
128-
public function getName(): string
128+
public function getName(): ?string
129129
{
130130
return $this->name;
131131
}

src/Eccube/Service/Payment/PaymentResult.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ public function setResponse(Response $response): PaymentResult
106106
/**
107107
* Response を返します.
108108
*
109-
* @return Response
109+
* @return Response|null
110110
*/
111-
public function getResponse(): Response
111+
public function getResponse(): ?Response
112112
{
113113
return $this->response;
114114
}

tests/Eccube/Tests/Web/HelpControllerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public function testRoutingHelpTradelaw()
2222
{
2323
$client = $this->client;
2424
$client->request('GET', $this->generateUrl('help_tradelaw'));
25-
$this->assertTrue($client->getResponse()->isSuccessful());
25+
$response = $client->getResponse();
26+
$this->assertTrue($response->isSuccessful(), 'Response status: '.$response->getStatusCode().' - Content: '.$response->getContent());
2627
}
2728

2829
/**

0 commit comments

Comments
 (0)