8000 URI by taylorotwell · Pull Request #53731 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

URI #53731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Dec 9, 2024
Merged

URI #53731

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2ec58b6
work on uris
taylorotwell Dec 2, 2024
99ded5b
work on uris
taylorotwell Dec 2, 2024
ca28586
add uri method to request
taylorotwell Dec 2, 2024
1462fcb
work on uris
taylorotwell Dec 2, 2024
7ef5839
working on uris
taylorotwell Dec 2, 2024
9694d30
update composer files
taylorotwell Dec 2, 2024
bb339c1
tweak
taylorotwell Dec 2, 2024
0f3ad87
add tests
taylorotwell Dec 2, 2024
90303e2
Apply fixes from StyleCI
StyleCIBot Dec 2, 2024
69051ff
Update src/Illuminate/Support/UriQueryString.php
taylorotwell Dec 3, 2024
7b92398
Update src/Illuminate/Support/UriQueryString.php
taylorotwell Dec 3, 2024
51233af
[URI] Enhance URI class (#53796)
hafezdivandari Dec 8, 2024
462b359
make dot behavior consistent on replaceQuery and withQuery
taylorotwell Dec 9, 2024
c0e0177
add decode method to uri
taylorotwell Dec 9, 2024
d22864d
Apply fixes from StyleCI
StyleCIBot Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add decode method to uri
  • Loading branch information
@taylorotwell
taylorotwell committed Dec 9, 2024
commit c0e0177f6737387ec9ddf7ea5f062417b4df82b0
13 changes: 13 additions & 0 deletions src/Illuminate/Support/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Contracts\Support\Responsable;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Str;
8000 use Illuminate\Support\Traits\Conditionable;
use Illuminate\Support\Traits\Tappable;
use League\Uri\Contracts\UriInterface;
Expand Down Expand Up @@ -293,6 +294,18 @@ public function toHtml()
return $this->value();
}

/**
* Get the decoded string representation of the URI.
*/
public function decode(): string
{
if (empty($this->query()->toArray())) {
return $this->value();
}

return Str::replace(Str::after($this->value(), '?'), $this->query()->decode(), $this->value());
}

/**
* Get the string representation of the URI.
*/
Expand Down
7 changes: 7 additions & 0 deletions tests/Support/SupportUriTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,11 @@ public function test_query_strings_with_dots_can_be_replaced_or_merged_consisten
$this->assertEquals('foo.bar=baz&foo[bar]=zab', $uri->withQuery(['foo.bar' => 'zab'])->query()->decode());
$this->assertEquals('foo[bar]=zab', $uri->replaceQuery(['foo.bar' => 'zab'])->query()->decode());
}

public function test_decoding_the_entire_uri()
{
$uri = Uri::of('https://laravel.com/docs/11.x/installation')->withQuery(['tags' => ['first', 'second']]);

$this->assertEquals('https://laravel.com/docs/11.x/installation?tags[0]=first&tags[1]=second', $uri->decode());
}
}
Loading
0