Skip to content

Commit 25caa5d

Browse files
committed
Code Modernization: HTTP: Use null coalescing operator instead of isset() ternaries.
Developed as a subset of #10654 Initially developed in #4886 Follow-up to [61434], [61403], [61433], [61432], [61431], [61430], [61429], [61424], [61404], [61403]. Props costdev, westonruter. See #58874, #63430. git-svn-id: https://develop.svn.wordpress.org/trunk@61435 602fd350-edb4-49c9-b593-d223f7449a82
1 parent e142030 commit 25caa5d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/wp-includes/class-wp-http-cookie.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function __construct( $data, $requested_url = '' ) {
114114
if ( isset( $parsed_url['host'] ) ) {
115115
$this->domain = $parsed_url['host'];
116116
}
117-
$this->path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '/';
117+
$this->path = $parsed_url['path'] ?? '/';
118118
if ( ! str_ends_with( $this->path, '/' ) ) {
119119
$this->path = dirname( $this->path ) . '/';
120120
}
@@ -190,12 +190,12 @@ public function test( $url ) {
190190

191191
// Get details on the URL we're thinking about sending to.
192192
$url = parse_url( $url );
193-
$url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' === $url['scheme'] ? 443 : 80 );
194-
$url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
193+
$url['port'] = $url['port'] ?? ( 'https' === $url['scheme'] ? 443 : 80 );
194+
$url['path'] = $url['path'] ?? '/';
195195

196196
// Values to use for comparison against the URL.
197-
$path = isset( $this->path ) ? $this->path : '/';
198-
$port = isset( $this->port ) ? $this->port : null;
197+
$path = $this->path ?? '/';
198+
$port = $this->port ?? null;
199199
$domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
200200
if ( false === stripos( $domain, '.' ) ) {
201201
$domain .= '.local';

src/wp-includes/class-wp-http-ixr-client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct( $server, $path = false, $port = false, $timeout = 1
2525
$bits = parse_url( $server );
2626
$this->scheme = $bits['scheme'];
2727
$this->server = $bits['host'];
28-
$this->port = isset( $bits['port'] ) ? $bits['port'] : $port;
28+
$this->port = $bits['port'] ?? $port;
2929
$this->path = ! empty( $bits['path'] ) ? $bits['path'] : '/';
3030

3131
// Make absolutely sure we have a path.

src/wp-includes/class-wp-http.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public static function processResponse( $response ) { // phpcs:ignore WordPress.
692692

693693
return array(
694694
'headers' => $response[0],
695-
'body' => isset( $response[1] ) ? $response[1] : '',
695+
'body' => $response[1] ?? '',
696696
);
697697
}
698698

0 commit comments

Comments
 (0)