Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8fd16a6

Browse files
jderussejderusse
committed
Fix deprecation on 4.3
1 parent b406466 commit 8fd16a6

File tree

23 files changed

+278
-176
lines changed

23 files changed

+278
-176
lines changed

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ matrix:
3030
env: deps=high
3131
- php: 7.3
3232
env: deps=low
33+
- php: 7.4snapshot
34+
allow_failures:
35+
- php: 7.4snapshot
3336
fast_finish: true
3437

3538
cache:

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?php
22

3-
class SunnyInterface_1eff735 implements \ProxyManager\Proxy\VirtualProxyInterface, \Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\DummyInterface, \Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\SunnyInterface
3+
class SunnyInterface_%s implements \ProxyManager\Proxy\VirtualProxyInterface, \Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\DummyInterface, \Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\SunnyInterface
44
{
55

6-
private $valueHolder1eff735 = null;
6+
private $valueHolder%s = null;
77

8-
private $initializer1eff735 = null;
8+
private $initializer%s = null;
99

10-
private static $publicProperties1eff735 = [
11-
10+
private static $publicProperties%s = [
11+
%S
1212
];
1313

1414
public function dummy()
1515
{
16-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, 'dummy', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
16+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, 'dummy', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
1717

18-
if ($this->valueHolder1eff735 === $returnValue = $this->valueHolder1eff735->dummy()) {
18+
if ($this->valueHolder%s === $returnValue = $this->valueHolder%s->dummy()) {
1919
$returnValue = $this;
2020
}
2121

@@ -24,9 +24,9 @@ public function dummy()
2424

2525
public function & dummyRef()
2626
{
27-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, 'dummyRef', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
27+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, 'dummyRef', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
2828

29-
if ($this->valueHolder1eff735 === $returnValue = &$this->valueHolder1eff735->dummyRef()) {
29+
if ($this->valueHolder%s === $returnValue = &$this->valueHolder%s->dummyRef()) {
3030
$returnValue = $this;
3131
}
3232

@@ -35,9 +35,9 @@ public function & dummyRef()
3535

3636
public function sunny()
3737
{
38-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, 'sunny', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
38+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, 'sunny', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
3939

40-
if ($this->valueHolder1eff735 === $returnValue = $this->valueHolder1eff735->sunny()) {
40+
if ($this->valueHolder%s === $returnValue = $this->valueHolder%s->sunny()) {
4141
$returnValue = $this;
4242
}
4343

@@ -49,9 +49,9 @@ public static function staticProxyConstructor($initializer)
4949
static $reflection;
5050

5151
$reflection = $reflection ?? new \ReflectionClass(__CLASS__);
52-
$instance = $reflection->newInstanceWithoutConstructor();
52+
$instance%w= $reflection->newInstanceWithoutConstructor();
5353

54-
$instance->initializer1eff735 = $initializer;
54+
$instance->initializer%s = $initializer;
5555

5656
return $instance;
5757
}
@@ -60,21 +60,21 @@ public function __construct()
6060
{
6161
static $reflection;
6262

63-
if (! $this->valueHolder1eff735) {
63+
if (! $this->valueHolder%s) {
6464
$reflection = $reflection ?? new \ReflectionClass(__CLASS__);
65-
$this->valueHolder1eff735 = $reflection->newInstanceWithoutConstructor();
65+
$this->valueHolder%s = $reflection->newInstanceWithoutConstructor();
6666
}
6767
}
6868

6969
public function & __get($name)
7070
{
71-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__get', ['name' => $name], $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
71+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__get', ['name' => $name], $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
7272

73-
if (isset(self::$publicProperties1eff735[$name])) {
74-
return $this->valueHolder1eff735->$name;
73+
if (isset(self::$publicProperties%s[$name])) {
74+
return $this->valueHolder%s->$name;
7575
}
7676

77-
$targetObject = $this->valueHolder1eff735;
77+
$targetObject = $this->valueHolder%s;
7878

7979
$backtrace = debug_backtrace(false);
8080
trigger_error(
@@ -92,73 +92,73 @@ public function & __get($name)
9292

9393
public function __set($name, $value)
9494
{
95-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__set', array('name' => $name, 'value' => $value), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
95+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__set', array('name' => $name, 'value' => $value), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
9696

97-
$targetObject = $this->valueHolder1eff735;
97+
$targetObject = $this->valueHolder%s;
9898

9999
return $targetObject->$name = $value;
100100
}
101101

102102
public function __isset($name)
103103
{
104-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__isset', array('name' => $name), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
104+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__isset', array('name' => $name), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
105105

106-
$targetObject = $this->valueHolder1eff735;
106+
$targetObject = $this->valueHolder%s;
107107

108108
return isset($targetObject->$name);
109109
}
110110

111111
public function __unset($name)
112112
{
113-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__unset', array('name' => $name), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
113+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__unset', array('name' => $name), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
114114

115-
$targetObject = $this->valueHolder1eff735;
115+
$targetObject = $this->valueHolder%s;
116116

117117
unset($targetObject->$name);
118118
return;
119119
}
120120

121121
public function __clone()
122122
{
123-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__clone', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
123+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__clone', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
124124

125-
$this->valueHolder1eff735 = clone $this->valueHolder1eff735;
125+
$this->valueHolder%s = clone $this->valueHolder%s;
126126
}
127127

128128
public function __sleep()
129129
{
130-
$this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, '__sleep', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
130+
$this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, '__sleep', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
131131

132-
return array('valueHolder1eff735');
132+
return array('valueHolder%s');
133133
}
134134

135135
public function __wakeup()
136136
{
137137
}
138138

139-
public function setProxyInitializer(\Closure $initializer = null)
139+
public function setProxyInitializer(\Closure $initializer = null)%S
140140
{
141-
$this->initializer1eff735 = $initializer;
141+
$this->initializer%s = $initializer;
142142
}
143143

144-
public function getProxyInitializer()
144+
public function getProxyInitializer()%S
145145
{
146-
return $this->initializer1eff735;
146+
return $this->initializer%s;
147147
}
148148

149149
public function initializeProxy() : bool
150150
{
151-
return $this->initializer1eff735 && ($this->initializer1eff735->__invoke($valueHolder1eff735, $this, 'initializeProxy', array(), $this->initializer1eff735) || 1) && $this->valueHolder1eff735 = $valueHolder1eff735;
151+
return $this->initializer%s && ($this->initializer%s->__invoke($valueHolder%s, $this, 'initializeProxy', array(), $this->initializer%s) || 1) && $this->valueHolder%s = $valueHolder%s;
152152
}
153153

154154
public function isProxyInitialized() : bool
155155
{
156-
return null !== $this->valueHolder1eff735;
156+
return null !== $this->valueHolder%s;
157157
}
158158

159-
public function getWrappedValueHolderValue()
159+
public function getWrappedValueHolderValue()%S
160160
{
161-
return $this->valueHolder1eff735;
161+
return $this->valueHolder%s;
162162
}
163163

164164

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ protected function createProxy(\$class, \Closure \$factory)
168168
EOPHP;
169169

170170
$implem = preg_replace('#\n /\*\*.*?\*/#s', '', $implem);
171-
$implem = str_replace('getWrappedValueHolderValue() : ?object', 'getWrappedValueHolderValue()', $implem);
172171
$implem = str_replace("array(\n \n );", "[\n \n ];", $implem);
173-
$this->assertStringEqualsFile(__DIR__.'/Fixtures/proxy-implem.php', $implem);
172+
173+
$this->assertStringMatchesFormatFile(__DIR__.'/Fixtures/proxy-implem.php', $implem);
174174
$this->assertStringEqualsFile(__DIR__.'/Fixtures/proxy-factory.php', $factory);
175175

176-
require_once __DIR__.'/Fixtures/proxy-implem.php';
176+
eval(preg_replace('/^<\?php/', '', $implem));
177177
$factory = require __DIR__.'/Fixtures/proxy-factory.php';
178178

179179
$foo = $factory->getFooService();

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public function testPrivateAlias()
5757

5858
$tester = new ApplicationTester($application);
5959
$tester->run(['command' => 'debug:container', '--show-hidden' => true]);
60-
$this->assertNotContains('public', $tester->getDisplay());
61-
$this->assertNotContains('private_alias', $tester->getDisplay());
60+
$this->assertStringNotContainsString('public', $tester->getDisplay());
61+
$this->assertStringNotContainsString('private_alias', $tester->getDisplay());
6262

6363
$tester->run(['command' => 'debug:container']);
6464
$this->assertStringContainsString('public', $tester->getDisplay());
@@ -77,7 +77,7 @@ public function testIgnoreBackslashWhenFindingService(string $validServiceId)
7777

7878
$tester = new ApplicationTester($application);
7979
$tester->run(['command' => 'debug:container', 'name' => $validServiceId]);
80-
$this->assertNotContains('No services found', $tester->getDisplay());
80+
$this->assertStringNotContainsString('No services found', $tester->getDisplay());
8181
}
8282

8383
public function testDescribeEnvVars()

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public function testEncodePasswordSodiumOutput()
227227
'user-class' => 'Custom\Class\Sodium\User',
228228
], ['interactive' => false]);
229229

230-
$this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
230+
$this->assertStringNotContainsString(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
231231
}
232232

233233
public function testEncodePasswordNoConfigForGivenUserClass()

‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Cache\IntegrationTests\CachePoolTest;
1515
use PHPUnit\Framework\Assert;
16+
use PHPUnit\Framework\Warning;
1617
use Psr\Cache\CacheItemInterface;
1718
use Psr\Cache\CacheItemPoolInterface;
1819
use Symfony\Component\Cache\CacheItem;
@@ -120,7 +121,7 @@ public function testGetMetadata()
120121
CacheItem::METADATA_EXPIRY => 9.5 + time(),
121122
CacheItem::METADATA_CTIME => 1000,
122123
];
123-
$this->assertEquals($expected, $item->getMetadata(), 'Item metadata should embed expiry and ctime.', .6);
124+
$this->assertEqualsWithDelta($expected, $item->getMetadata(), .6, 'Item metadata should embed expiry and ctime.');
124125
}
125126

126127
public function testDefaultLifeTime()
@@ -252,6 +253,15 @@ public function testPrune()
252253
$this->assertFalse($this->isPruned($cache, 'foo'));
253254
$this->assertTrue($this->isPruned($cache, 'qux'));
254255
}
256+
257+
public function testSavingObject()
258+
{
259+
if (\PHP_VERSION_ID >= 70400) {
260+
throw new Warning('PHP 7.4 breaks this test, see https://bugs.php.net/78351.');
261+
}
262+
263+
parent::testSavingObject();
264+
}
255265
}
256266

257267
class NotUnserializable

‎src/Symfony/Component/Config/Tests/Definition/Builder/NodeDefinitionTest.php

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,25 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1616
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
17-
use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
1817

1918
class NodeDefinitionTest extends TestCase
2019
{
21-
public function testDefaultPathSeparatorIsDot()
22-
{
23-
$node = $this->getMockForAbstractClass(NodeDefinition::class, ['foo']);
24-
25-
$this->assertAttributeSame('.', 'pathSeparator', $node);
26-
}
27-
2820
public function testSetPathSeparatorChangesChildren()
2921
{
30-
$node = new ArrayNodeDefinition('foo');
31-
$scalar = new ScalarNodeDefinition('bar');
32-
$node->append($scalar);
33-
34-
$node->setPathSeparator('/');
35-
36-
$this->assertAttributeSame('/', 'pathSeparator', $node);
37-
$this->assertAttributeSame('/', 'pathSeparator', $scalar);
22+
$parentNode = new ArrayNodeDefinition('name');
23+
$childNode = $this->createMock(NodeDefinition::class);
24+
25+
$childNode
26+
->expects($this->once())
27+
->method('setPathSeparator')
28+
->with('/');
29+
$childNode
30+
->expects($this->once())
31+
->method('setParent')
32+
->with($parentNode)
33+
->willReturn($childNode);
34+
$parentNode->append($childNode);
35+
36+
$parentNode->setPathSeparator('/');
3837
}
3938
}

0 commit comments

Comments
 (0)