Skip to content

Commit ba445f4

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: fix merge
2 parents 994b254 + 00f7c07 commit ba445f4

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

src/Symfony/Component/Cache/Traits/Relay/BgsaveTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait BgsaveTrait
1919
{
2020
public function bgsave($arg = null): \Relay\Relay|bool
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());
22+
return $this->initializeLazyObject()->bgsave(...\func_get_args());
2323
}
2424
}
2525
} else {
@@ -30,7 +30,7 @@ trait BgsaveTrait
3030
{
3131
public function bgsave($schedule = false): \Relay\Relay|bool
3232
{
33-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());
33+
return $this->initializeLazyObject()->bgsave(...\func_get_args());
3434
}
3535
}
3636
}

src/Symfony/Component/Cache/Traits/Relay/FtTrait.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,107 +19,107 @@ trait FtTrait
1919
{
2020
public function ftAggregate($index, $query, $options = null): \Relay\Relay|array|false
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAggregate(...\func_get_args());
22+
return $this->initializeLazyObject()->ftAggregate(...\func_get_args());
2323
}
2424

2525
public function ftAliasAdd($index, $alias): \Relay\Relay|bool
2626
{
27-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasAdd(...\func_get_args());
27+
return $this->initializeLazyObject()->ftAliasAdd(...\func_get_args());
2828
}
2929

3030
public function ftAliasDel($alias): \Relay\Relay|bool
3131
{
32-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasDel(...\func_get_args());
32+
return $this->initializeLazyObject()->ftAliasDel(...\func_get_args());
3333
}
3434

3535
public function ftAliasUpdate($index, $alias): \Relay\Relay|bool
3636
{
37-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasUpdate(...\func_get_args());
37+
return $this->initializeLazyObject()->ftAliasUpdate(...\func_get_args());
3838
}
3939

4040
public function ftAlter($index, $schema, $skipinitialscan = false): \Relay\Relay|bool
4141
{
42-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAlter(...\func_get_args());
42+
return $this->initializeLazyObject()->ftAlter(...\func_get_args());
4343
}
4444

4545
public function ftConfig($operation, $option, $value = null): \Relay\Relay|array|bool
4646
{
47-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftConfig(...\func_get_args());
47+
return $this->initializeLazyObject()->ftConfig(...\func_get_args());
4848
}
4949

5050
public function ftCreate($index, $schema, $options = null): \Relay\Relay|bool
5151
{
52-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftCreate(...\func_get_args());
52+
return $this->initializeLazyObject()->ftCreate(...\func_get_args());
5353
}
5454

5555
public function ftCursor($operation, $index, $cursor, $options = null): \Relay\Relay|array|bool
5656
{
57-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftCursor(...\func_get_args());
57+
return $this->initializeLazyObject()->ftCursor(...\func_get_args());
5858
}
5959

6060
public function ftDictAdd($dict, $term, ...$other_terms): \Relay\Relay|false|int
6161
{
62-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictAdd(...\func_get_args());
62+
return $this->initializeLazyObject()->ftDictAdd(...\func_get_args());
6363
}
6464

6565
public function ftDictDel($dict, $term, ...$other_terms): \Relay\Relay|false|int
6666
{
67-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictDel(...\func_get_args());
67+
return $this->initializeLazyObject()->ftDictDel(...\func_get_args());
6868
}
6969

7070
public function ftDictDump($dict): \Relay\Relay|array|false
7171
{
72-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictDump(...\func_get_args());
72+
return $this->initializeLazyObject()->ftDictDump(...\func_get_args());
7373
}
7474

7575
public function ftDropIndex($index, $dd = false): \Relay\Relay|bool
7676
{
77-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDropIndex(...\func_get_args());
77+
return $this->initializeLazyObject()->ftDropIndex(...\func_get_args());
7878
}
7979

8080
public function ftExplain($index, $query, $dialect = 0): \Relay\Relay|false|string
8181
{
82-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftExplain(...\func_get_args());
82+
return $this->initializeLazyObject()->ftExplain(...\func_get_args());
8383
}
8484

8585
public function ftExplainCli($index, $query, $dialect = 0): \Relay\Relay|array|false
8686
{
87-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftExplainCli(...\func_get_args());
87+
return $this->initializeLazyObject()->ftExplainCli(...\func_get_args());
8888
}
8989

9090
public function ftInfo($index): \Relay\Relay|array|false
9191
{
92-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftInfo(...\func_get_args());
92+
return $this->initializeLazyObject()->ftInfo(...\func_get_args());
9393
}
9494

9595
public function ftProfile($index, $command, $query, $limited = false): \Relay\Relay|array|false
9696
{
97-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftProfile(...\func_get_args());
97+
return $this->initializeLazyObject()->ftProfile(...\func_get_args());
9898
}
9999

100100
public function ftSearch($index, $query, $options = null): \Relay\Relay|array|false
101101
{
102-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSearch(...\func_get_args());
102+
return $this->initializeLazyObject()->ftSearch(...\func_get_args());
103103
}
104104

105105
public function ftSpellCheck($index, $query, $options = null): \Relay\Relay|array|false
106106
{
107-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSpellCheck(...\func_get_args());
107+
return $this->initializeLazyObject()->ftSpellCheck(...\func_get_args());
108108
}
109109

110110
public function ftSynDump($index): \Relay\Relay|array|false
111111
{
112-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSynDump(...\func_get_args());
112+
return $this->initializeLazyObject()->ftSynDump(...\func_get_args());
113113
}
114114

115115
public function ftSynUpdate($index, $synonym, $term_or_terms, $skipinitialscan = false): \Relay\Relay|bool
116116
{
117-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSynUpdate(...\func_get_args());
117+
return $this->initializeLazyObject()->ftSynUpdate(...\func_get_args());
118118
}
119119

120120
public function ftTagVals($index, $tag): \Relay\Relay|array|false
121121
{
122-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftTagVals(...\func_get_args());
122+
return $this->initializeLazyObject()->ftTagVals(...\func_get_args());
123123
}
124124
}
125125
} else {

src/Symfony/Component/Cache/Traits/Relay/GetWithMetaTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait GetWithMetaTrait
1919
{
2020
public function getWithMeta($key): \Relay\Relay|array|false
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getWithMeta(...\func_get_args());
22+
return $this->initializeLazyObject()->getWithMeta(...\func_get_args());
2323
}
2424
}
2525
} else {

src/Symfony/Component/Cache/Traits/Relay/IsTrackedTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait IsTrackedTrait
1919
{
2020
public function isTracked($key): bool
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->isTracked(...\func_get_args());
22+
return $this->initializeLazyObject()->isTracked(...\func_get_args());
2323
}
2424
}
2525
} else {

src/Symfony/Component/Cache/Traits/Relay/Relay11Trait.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,107 +19,107 @@ trait Relay11Trait
1919
{
2020
public function cmsIncrBy($key, $field, $value, ...$fields_and_falues): \Relay\Relay|array|false
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsIncrBy(...\func_get_args());
22+
return $this->initializeLazyObject()->cmsIncrBy(...\func_get_args());
2323
}
2424

2525
public function cmsInfo($key): \Relay\Relay|array|false
2626
{
27-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInfo(...\func_get_args());
27+
return $this->initializeLazyObject()->cmsInfo(...\func_get_args());
2828
}
2929

3030
public function cmsInitByDim($key, $width, $depth): \Relay\Relay|bool
3131
{
32-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInitByDim(...\func_get_args());
32+
return $this->initializeLazyObject()->cmsInitByDim(...\func_get_args());
3333
}
3434

3535
public function cmsInitByProb($key, $error, $probability): \Relay\Relay|bool
3636
{
37-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInitByProb(...\func_get_args());
37+
return $this->initializeLazyObject()->cmsInitByProb(...\func_get_args());
3838
}
3939

4040
public function cmsMerge($dstkey, $keys, $weights = []): \Relay\Relay|bool
4141
{
42-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsMerge(...\func_get_args());
42+
return $this->initializeLazyObject()->cmsMerge(...\func_get_args());
4343
}
4444

4545
public function cmsQuery($key, ...$fields): \Relay\Relay|array|false
4646
{
47-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsQuery(...\func_get_args());
47+
return $this->initializeLazyObject()->cmsQuery(...\func_get_args());
4848
}
4949

5050
public function commandlog($subcmd, ...$args): \Relay\Relay|array|bool|int
5151
{
52-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->commandlog(...\func_get_args());
52+
return $this->initializeLazyObject()->commandlog(...\func_get_args());
5353
}
5454

5555
public function hexpire($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
5656
{
57-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpire(...\func_get_args());
57+
return $this->initializeLazyObject()->hexpire(...\func_get_args());
5858
}
5959

6060
public function hexpireat($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
6161
{
62-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpireat(...\func_get_args());
62+
return $this->initializeLazyObject()->hexpireat(...\func_get_args());
6363
}
6464

6565
public function hexpiretime($hash, $fields): \Relay\Relay|array|false
6666
{
67-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpiretime(...\func_get_args());
67+
return $this->initializeLazyObject()->hexpiretime(...\func_get_args());
6868
}
6969

7070
public function hgetdel($key, $fields): \Relay\Relay|array|false
7171
{
72-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetdel(...\func_get_args());
72+
return $this->initializeLazyObject()->hgetdel(...\func_get_args());
7373
}
7474

7575
public function hgetex($hash, $fields, $expiry = null): \Relay\Relay|array|false
7676
{
77-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetex(...\func_get_args());
77+
return $this->initializeLazyObject()->hgetex(...\func_get_args());
7878
}
7979

8080
public function hpersist($hash, $fields): \Relay\Relay|array|false
8181
{
82-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpersist(...\func_get_args());
82+
return $this->initializeLazyObject()->hpersist(...\func_get_args());
8383
}
8484

8585
public function hpexpire($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
8686
{
87-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpire(...\func_get_args());
87+
return $this->initializeLazyObject()->hpexpire(...\func_get_args());
8888
}
8989

9090
public function hpexpireat($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
9191
{
92-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpireat(...\func_get_args());
92+
return $this->initializeLazyObject()->hpexpireat(...\func_get_args());
9393
}
9494

9595
public function hpexpiretime($hash, $fields): \Relay\Relay|array|false
9696
{
97-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpiretime(...\func_get_args());
97+
return $this->initializeLazyObject()->hpexpiretime(...\func_get_args());
9898
}
9999

100100
public function hpttl($hash, $fields): \Relay\Relay|array|false
101101
{
102-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpttl(...\func_get_args());
102+
return $this->initializeLazyObject()->hpttl(...\func_get_args());
103103
}
104104

105105
public function hsetex($key, $fields, $expiry = null): \Relay\Relay|false|int
106106
{
107-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetex(...\func_get_args());
107+
return $this->initializeLazyObject()->hsetex(...\func_get_args());
108108
}
109109

110110
public function httl($hash, $fields): \Relay\Relay|array|false
111111
{
112-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->httl(...\func_get_args());
112+
return $this->initializeLazyObject()->httl(...\func_get_args());
113113
}
114114

115115
public function serverName(): false|string
116116
{
117-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverName(...\func_get_args());
117+
return $this->initializeLazyObject()->serverName(...\func_get_args());
118118
}
119119

120120
public function serverVersion(): false|string
121121
{
122-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverVersion(...\func_get_args());
122+
return $this->initializeLazyObject()->serverVersion(...\func_get_args());
123123
}
124124
}
125125
} else {

src/Symfony/Component/Cache/Traits/Relay/SwapdbTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait SwapdbTrait
1919
{
2020
public function swapdb($index1, $index2): \Relay\Relay|bool
2121
{
22-
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->swapdb(...\func_get_args());
22+
return $this->initializeLazyObject()->swapdb(...\func_get_args());
2323
}
2424
}
2525
} else {

0 commit comments

Comments
 (0)