Skip to content

Commit f816cbe

Browse files
committed
Use readonly classes when all props are readonly
readonly classes were added in PHP 8.2.
1 parent 3e67d36 commit f816cbe

5 files changed

Lines changed: 29 additions & 29 deletions

File tree

src/CrawlConfig.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace StaticDeploy;
44

5-
final class CrawlConfig {
5+
final readonly class CrawlConfig {
66

7-
public function __construct( public readonly ?string $path_hash_prefix = null )
7+
public function __construct( public ?string $path_hash_prefix = null )
88
{
99
}
1010

src/DirectDeployConfig.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace StaticDeploy;
44

5-
final class DirectDeployConfig {
5+
final readonly class DirectDeployConfig {
66

77
public function __construct(
8-
public readonly ?CrawlConfig $crawl_config = new CrawlConfig(),
9-
public readonly bool $do_detect = true,
8+
public ?CrawlConfig $crawl_config = new CrawlConfig(),
9+
public bool $do_detect = true,
1010
) {}
1111

1212
public function toArray(): array

src/OptionData.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010

1111
namespace StaticDeploy;
1212

13-
final class OptionData {
13+
final readonly class OptionData {
1414
public const CACHE_GROUP = 'static_deploy_option_data';
1515

1616
// It's very cheap to fetch options, so there is no point
1717
// caching them for long.
1818
public const CACHE_TTL_SEC = 300;
1919

20-
public readonly ?string $blob_value;
20+
public ?string $blob_value;
2121

22-
public readonly OptionSpec $option_spec;
22+
public OptionSpec $option_spec;
2323

24-
public readonly ?string $unfiltered_blob_value;
24+
public ?string $unfiltered_blob_value;
2525

26-
public readonly string $unfiltered_value;
26+
public string $unfiltered_value;
2727

28-
public readonly string $value;
28+
public string $value;
2929

3030
public function __construct(
3131
OptionSpec $option_spec,

src/OptionSpec.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99

1010
namespace StaticDeploy;
1111

12-
final class OptionSpec {
12+
final readonly class OptionSpec {
1313

14-
public readonly string $name;
14+
public string $name;
1515

16-
public readonly string $default_value;
16+
public string $default_value;
1717

18-
public readonly ?array $allowed_values;
18+
public ?array $allowed_values;
1919

20-
public readonly string $filter_name;
20+
public string $filter_name;
2121

22-
public readonly string $input_type;
22+
public string $input_type;
2323

2424
public function __construct(
25-
public readonly string $type,
25+
public string $type,
2626
string $name,
2727
string $default_value,
28-
public readonly string $label,
29-
public readonly string $description,
30-
public readonly ?string $default_blob_value = null,
28+
public string $label,
29+
public string $description,
30+
public ?string $default_blob_value = null,
3131
?string $filter_name = null,
3232
?array $allowed_values = null,
3333
?string $input_type = null,
34-
public readonly ?int $min_value = null,
34+
public ?int $min_value = null,
3535
/**
3636
* Used to import from WP2Static options
3737
*/
38-
public readonly ?string $wp2static_name = null,
38+
public ?string $wp2static_name = null,
3939
/**
4040
* Used to import from WP2Static options
4141
*/
42-
public readonly ?string $wp2static_table = null,
42+
public ?string $wp2static_table = null,
4343
) {
4444
if ( $allowed_values !== null && ! in_array( $default_value, $allowed_values, true ) ) {
4545
$msg = "Default value {$default_value} not in allowed values for option {$name}";

src/PostProcessConfig.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace StaticDeploy;
44

5-
final class PostProcessConfig {
5+
final readonly class PostProcessConfig {
66

7-
public readonly ?string $destination_url;
7+
public ?string $destination_url;
88

9-
public readonly ?array $hosts_to_rewrite;
9+
public ?array $hosts_to_rewrite;
1010

11-
public readonly ?array $replacement_patterns;
11+
public ?array $replacement_patterns;
1212

13-
public readonly ?string $site_url;
13+
public ?string $site_url;
1414

1515
public function __construct() {
1616
if ( Options::getValue( 'skipURLRewrite' ) === '1' ) {

0 commit comments

Comments
 (0)