Skip to content

Commit a6d5c32

Browse files
committed
Merge remote-tracking branch 'origin/master' into interpreter
2 parents 945baa3 + 398ff7f commit a6d5c32

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/RefactoringGuru/Bridge/RealWorld/Output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ JSON view of a simple content page, with the same client code:
2323
"title": "Star Wars, episode1",
2424
"text": "A long time ago in a galaxy far, far away...",
2525
"img": "/images/star-wars.jpeg",
26-
"link": {"href": "Add to cart", "title": "Add to cart""}
26+
"link": {"href": "/cart/add/123", "title": "Add to cart"}
2727
}

src/RefactoringGuru/Bridge/RealWorld/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public function renderImage(string $url): string
264264

265265
public function renderLink(string $url, string $title): string
266266
{
267-
return '"link": {"href": "' . $title . '", "title": "' . $title . '""}';
267+
return '"link": {"href": "' . $url . '", "title": "' . $title . '"}';
268268
}
269269

270270
public function renderHeader(): string

src/RefactoringGuru/Mediator/RealWorld/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function createUser(array $data, bool $silent = false): User
224224
return $user;
225225
}
226226

227-
public function updateUser(User $user, array $data, bool $silent = false): User
227+
public function updateUser(User $user, array $data, bool $silent = false): ?User
228228
{
229229
echo "UserRepository: Updating a user.\n";
230230

0 commit comments

Comments
 (0)