Skip to content

Commit 367f4d5

Browse files
jeromegamezjeromegamez
committed
Remove Kreait\Firebase\RemoteConfig\DefaultValue class
1 parent 8d06001 commit 367f4d5

6 files changed

Lines changed: 24 additions & 148 deletions

File tree

‎UPGRADE-8.0.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ The following list has been generated with [roave/backward-compatibility-check](
6969
[BC] CHANGED: The parameter $config of Kreait\Firebase\Messaging\CloudMessage#withAndroidConfig() changed from no type to a non-contravariant Kreait\Firebase\Messaging\AndroidConfig|array
7070
[BC] CHANGED: The parameter $config of Kreait\Firebase\Messaging\CloudMessage#withApnsConfig() changed from no type to a non-contravariant Kreait\Firebase\Messaging\ApnsConfig|array
7171
[BC] CHANGED: The parameter $config of Kreait\Firebase\Messaging\CloudMessage#withWebPushConfig() changed from no type to a non-contravariant Kreait\Firebase\Messaging\WebPushConfig|array
72-
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter#withDefaultValue() changed from no type to Kreait\Firebase\RemoteConfig\DefaultValue|array|string|bool|null
73-
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter#withDefaultValue() changed from no type to a non-contravariant Kreait\Firebase\RemoteConfig\DefaultValue|array|string|bool|null
74-
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter::named() changed from no type to Kreait\Firebase\RemoteConfig\DefaultValue|array|string|bool|null
75-
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter::named() changed from no type to a non-contravariant Kreait\Firebase\RemoteConfig\DefaultValue|array|string|bool|null
72+
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter#withDefaultValue() changed from no type to a non-contravariant array|string|bool|null
73+
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter#withDefaultValue() changed from no type to array|string|bool|null
74+
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter::named() changed from no type to a non-contravariant array|string|bool|null
75+
[BC] CHANGED: The parameter $defaultValue of Kreait\Firebase\RemoteConfig\Parameter::named() changed from no type to array|string|bool|null
7676
[BC] CHANGED: The parameter $email of Kreait\Firebase\Contract\Auth#createUserWithEmailAndPassword() changed from Stringable|string to a non-contravariant string
7777
[BC] CHANGED: The parameter $email of Kreait\Firebase\Contract\Auth#createUserWithEmailAndPassword() changed from Stringable|string to string
7878
[BC] CHANGED: The parameter $email of Kreait\Firebase\Contract\Auth#getEmailActionLink() changed from Stringable|string to a non-contravariant string
@@ -200,6 +200,8 @@ The following list has been generated with [roave/backward-compatibility-check](
200200
[BC] CHANGED: The parameter $value of Kreait\Firebase\RemoteConfig\ConditionalValue#withValue() changed from no type to a non-contravariant Kreait\Firebase\RemoteConfig\ParameterValue|array|string
201201
[BC] CHANGED: The parameter $values of Kreait\Firebase\Messaging\RegistrationTokens::fromValue() changed from no type to a non-contravariant Kreait\Firebase\Messaging\RegistrationToken|Kreait\Firebase\Messaging\RegistrationTokens|array|string
202202
[BC] CHANGED: The return type of Kreait\Firebase\RemoteConfig\ConditionalValue#value() changed from no type to string|array
203+
[BC] CHANGED: The return type of Kreait\Firebase\RemoteConfig\Parameter#defaultValue() changed from Kreait\Firebase\RemoteConfig\DefaultValue|null to Kreait\Firebase\RemoteConfig\ParameterValue|null
204+
[BC] CHANGED: The return type of Kreait\Firebase\RemoteConfig\Parameter#defaultValue() changed from Kreait\Firebase\RemoteConfig\DefaultValue|null to the non-covariant Kreait\Firebase\RemoteConfig\ParameterValue|null
203205
[BC] CHANGED: The return type of Kreait\Firebase\RemoteConfig\TagColor#__toString() changed from no type to string
204206
[BC] REMOVED: Class Kreait\Firebase\Contract\DynamicLinks has been deleted
205207
[BC] REMOVED: Class Kreait\Firebase\Contract\Transitional\FederatedUserFetcher has been deleted
@@ -219,6 +221,7 @@ The following list has been generated with [roave/backward-compatibility-check](
219221
[BC] REMOVED: Class Kreait\Firebase\DynamicLink\ShortenLongDynamicLink has been deleted
220222
[BC] REMOVED: Class Kreait\Firebase\DynamicLink\ShortenLongDynamicLink\FailedToShortenLongDynamicLink has been deleted
221223
[BC] REMOVED: Class Kreait\Firebase\DynamicLink\SocialMetaTagInfo has been deleted
224+
[BC] REMOVED: Class Kreait\Firebase\RemoteConfig\DefaultValue has been deleted
222225
[BC] REMOVED: Class Kreait\Firebase\RemoteConfig\ExplicitValue has been deleted
223226
[BC] REMOVED: Constant Kreait\Firebase\Contract\Messaging::BATCH_MESSAGE_LIMIT was removed
224227
[BC] REMOVED: Method Kreait\Firebase\Factory#createDynamicLinksService() was removed

‎src/Firebase/RemoteConfig/DefaultValue.php‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/Firebase/RemoteConfig/Parameter.php‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ private function __construct(
3636

3737
/**
3838
* @param non-empty-string $name
39-
* @param DefaultValue|RemoteConfigParameterValueShape|string|bool|null $defaultValue
39+
* @param RemoteConfigParameterValueShape|string|bool|null $defaultValue
4040
*/
41-
public static function named(string $name, DefaultValue|array|string|bool|null $defaultValue = null, ?ParameterValueType $valueType = null): self
41+
public static function named(string $name, array|string|bool|null $defaultValue = null, ?ParameterValueType $valueType = null): self
4242
{
4343
$defaultValue = self::mapDefaultValue($defaultValue);
4444

@@ -52,18 +52,14 @@ public static function named(string $name, DefaultValue|array|string|bool|null $
5252
}
5353

5454
/**
55-
* @param DefaultValue|RemoteConfigParameterValueShape|string|bool|null $defaultValue
55+
* @param RemoteConfigParameterValueShape|string|bool|null $defaultValue
5656
*/
57-
private static function mapDefaultValue(DefaultValue|array|string|bool|null $defaultValue): ?ParameterValue
57+
private static function mapDefaultValue(array|string|bool|null $defaultValue): ?ParameterValue
5858
{
5959
if ($defaultValue === null) {
6060
return null;
6161
}
6262

63-
if ($defaultValue instanceof DefaultValue) {
64-
return ParameterValue::fromArray($defaultValue->toArray());
65-
}
66-
6763
if (is_string($defaultValue)) {
6864
return ParameterValue::withValue($defaultValue);
6965
}
@@ -100,9 +96,9 @@ public function withDescription(string $description): self
10096
}
10197

10298
/**
103-
* @param DefaultValue|RemoteConfigParameterValueShape|string|bool|null $defaultValue
99+
* @param RemoteConfigParameterValueShape|string|bool|null $defaultValue
104100
*/
105-
public function withDefaultValue(DefaultValue|array|string|bool|null $defaultValue): self
101+
public function withDefaultValue(array|string|bool|null $defaultValue): self
106102
{
107103
$defaultValue = self::mapDefaultValue($defaultValue);
108104

@@ -115,16 +111,9 @@ public function withDefaultValue(DefaultValue|array|string|bool|null $defaultVal
115111
);
116112
}
117113

118-
/**
119-
* @todo 8.0 Replace with `ParameterValue`
120-
*/
121-
public function defaultValue(): ?DefaultValue
114+
public function defaultValue(): ?ParameterValue
122115
{
123-
if ($this->defaultValue === null) {
124-
return null;
125-
}
126-
127-
return DefaultValue::fromArray($this->defaultValue->toArray());
116+
return $this->defaultValue;
128117
}
129118

130119
public function withConditionalValue(ConditionalValue $conditionalValue): self

‎tests/Unit/RemoteConfig/DefaultValueTest.php‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎tests/Unit/RemoteConfig/ParameterTest.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace Kreait\Firebase\Tests\Unit\RemoteConfig;
66

7-
use Kreait\Firebase\RemoteConfig\DefaultValue;
87
use Kreait\Firebase\RemoteConfig\Parameter;
8+
use Kreait\Firebase\RemoteConfig\ParameterValue;
99
use Kreait\Firebase\Tests\UnitTestCase;
1010

1111
/**
@@ -17,14 +17,17 @@ public function testCreateWithImplicitDefaultValue(): void
1717
{
1818
$parameter = Parameter::named('empty');
1919

20-
$this->assertNotInstanceOf(DefaultValue::class, $parameter->defaultValue());
20+
$this->assertNotInstanceOf(ParameterValue::class, $parameter->defaultValue());
2121
}
2222

2323
public function testCreateWithDefaultValue(): void
2424
{
2525
$parameter = Parameter::named('with_default_foo', 'foo');
2626

27-
$this->assertEqualsCanonicalizing(DefaultValue::with('foo')->toArray(), $parameter->defaultValue()?->toArray());
27+
$defaultValue = $parameter->defaultValue();
28+
29+
$this->assertInstanceOf(ParameterValue::class, $defaultValue);
30+
$this->assertSame(['value' => 'foo'], $defaultValue->toArray());
2831
}
2932

3033
public function testCreateWithDescription(): void

‎tests/Unit/RemoteConfig/TemplateTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use Kreait\Firebase\Exception\InvalidArgumentException;
88
use Kreait\Firebase\RemoteConfig\Condition;
99
use Kreait\Firebase\RemoteConfig\ConditionalValue;
10-
use Kreait\Firebase\RemoteConfig\DefaultValue;
1110
use Kreait\Firebase\RemoteConfig\Parameter;
1211
use Kreait\Firebase\RemoteConfig\ParameterGroup;
12+
use Kreait\Firebase\RemoteConfig\ParameterValue;
1313
use Kreait\Firebase\RemoteConfig\TagColor;
1414
use Kreait\Firebase\RemoteConfig\Template;
1515
use Kreait\Firebase\RemoteConfig\Version;
@@ -141,8 +141,9 @@ public function testPersonalizationValuesAreImportedInDefaultValues(): void
141141

142142
$template = Template::fromArray($data);
143143
$this->assertArrayHasKey('foo', $parameters = $template->parameters());
144-
$this->assertInstanceOf(DefaultValue::class, $defaultValue = $parameters['foo']->defaultValue());
144+
$defaultValue = $parameters['foo']->defaultValue();
145145

146+
$this->assertInstanceOf(ParameterValue::class, $defaultValue);
146147
$this->assertArrayHasKey('personalizationValue', $array = $defaultValue->toArray());
147148
$this->assertSame('id', $array['personalizationValue']['personalizationId']);
148149
}

0 commit comments

Comments
 (0)