Skip to content

Commit b5cabb9

Browse files
committed
silently deprecated methods trigger E_USER_DEPRECATED
1 parent fb1bcb1 commit b5cabb9

16 files changed

+48
-25
lines changed

src/Http/FileUpload.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function __construct(array|string|null $value)
6767
*/
6868
public function getName(): string
6969
{
70+
trigger_error(__METHOD__ . '() is deprecated, use getUntrustedName()', E_USER_DEPRECATED);
7071
return $this->name;
7172
}
7273

src/Http/Request.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ public function getHeaders(): array
189189
*/
190190
public function getReferer(): ?UrlImmutable
191191
{
192+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
192193
return isset($this->headers['referer'])
193194
? new UrlImmutable($this->headers['referer'])
194195
: null;

src/Http/RequestFactory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,10 @@ private function parseHostAndPort(string $s): ?array
374374
}
375375

376376

377-
/** @deprecated */
377+
/** @deprecated use fromGlobals() */
378378
public function createHttpRequest(): Request
379379
{
380+
trigger_error(__METHOD__ . '() is deprecated, use fromGlobals()', E_USER_DEPRECATED);
380381
return $this->fromGlobals();
381382
}
382383
}

src/Http/SessionSection.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public function remove(string|array|null $name = null): void
9797
*/
9898
public function __set(string $name, $value): void
9999
{
100+
trigger_error("Writing to \$session->$name is deprecated, use \$session->set('$name', \$value) instead", E_USER_DEPRECATED);
100101
$this->session->autoStart(true);
101102
$this->getData()[$name] = $value;
102103
}
@@ -108,6 +109,7 @@ public function __set(string $name, $value): void
108109
*/
109110
public function &__get(string $name): mixed
110111
{
112+
trigger_error("Reading from \$session->$name is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
111113
$this->session->autoStart(true);
112114
$data = &$this->getData();
113115
if ($this->warnOnUndefined && !array_key_exists($name, $data ?? [])) {
@@ -124,6 +126,7 @@ public function &__get(string $name): mixed
124126
*/
125127
public function __isset(string $name): bool
126128
{
129+
trigger_error("Using \$session->$name is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
127130
$this->session->autoStart(false);
128131
return isset($this->getData()[$name]);
129132
}
@@ -135,6 +138,7 @@ public function __isset(string $name): bool
135138
*/
136139
public function __unset(string $name): void
137140
{
141+
trigger_error("Unset(\$session->$name) is deprecated, use \$session->remove('$name') instead", E_USER_DEPRECATED);
138142
$this->remove($name);
139143
}
140144

@@ -145,6 +149,7 @@ public function __unset(string $name): void
145149
*/
146150
public function offsetSet($name, $value): void
147151
{
152+
trigger_error("Writing to \$session['$name'] is deprecated, use \$session->set('$name', \$value) instead", E_USER_DEPRECATED);
148153
$this->__set($name, $value);
149154
}
150155

@@ -155,6 +160,7 @@ public function offsetSet($name, $value): void
155160
*/
156161
public function offsetGet($name): mixed
157162
{
163+
trigger_error("Reading from \$session['$name'] is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
158164
return $this->get($name);
159165
}
160166

@@ -165,6 +171,7 @@ public function offsetGet($name): mixed
165171
*/
166172
public function offsetExists($name): bool
167173
{
174+
trigger_error("Using \$session['$name'] is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
168175
return $this->__isset($name);
169176
}
170177

@@ -175,6 +182,7 @@ public function offsetExists($name): bool
175182
*/
176183
public function offsetUnset($name): void
177184
{
185+
trigger_error("Unset(\$session['$name']) is deprecated, use \$session->remove('$name') instead", E_USER_DEPRECATED);
178186
$this->remove($name);
179187
}
180188

src/Http/Url.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public function getScheme(): string
103103
/** @deprecated */
104104
public function setUser(string $user): static
105105
{
106+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
106107
$this->user = $user;
107108
return $this;
108109
}
@@ -111,13 +112,15 @@ public function setUser(string $user): static
111112
/** @deprecated */
112113
public function getUser(): string
113114
{
115+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
114116
return $this->user;
115117
}
116118

117119

118120
/** @deprecated */
119121
public function setPassword(string $password): static
120122
{
123+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
121124
$this->password = $password;
122125
return $this;
123126
}
@@ -126,6 +129,7 @@ public function setPassword(string $password): static
126129
/** @deprecated */
127130
public function getPassword(): string
128131
{
132+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
129133
return $this->password;
130134
}
131135

@@ -287,6 +291,7 @@ public function getHostUrl(): string
287291
/** @deprecated use UrlScript::getBasePath() instead */
288292
public function getBasePath(): string
289293
{
294+
trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
290295
$pos = strrpos($this->path, '/');
291296
return $pos === false ? '' : substr($this->path, 0, $pos + 1);
292297
}
@@ -295,13 +300,15 @@ public function getBasePath(): string
295300
/** @deprecated use UrlScript::getBaseUrl() instead */
296301
public function getBaseUrl(): string
297302
{
303+
trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
298304
return $this->getHostUrl() . $this->getBasePath();
299305
}
300306

301307

302308
/** @deprecated use UrlScript::getRelativeUrl() instead */
303309
public function getRelativeUrl(): string
304310
{
311+
trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
305312
return substr($this->getAbsoluteUrl(), strlen($this->getBaseUrl()));
306313
}
307314

src/Http/UrlImmutable.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function getScheme(): string
8181
/** @deprecated */
8282
public function withUser(string $user): static
8383
{
84+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
8485
$dolly = clone $this;
8586
$dolly->user = $user;
8687
$dolly->authority = null;
@@ -91,13 +92,15 @@ public function withUser(string $user): static
9192
/** @deprecated */
9293
public function getUser(): string
9394
{
95+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
9496
return $this->user;
9597
}
9698

9799

98100
/** @deprecated */
99101
public function withPassword(string $password): static
100102
{
103+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
101104
$dolly = clone $this;
102105
$dolly->password = $password;
103106
$dolly->authority = null;
@@ -108,13 +111,15 @@ public function withPassword(string $password): static
108111
/** @deprecated */
109112
public function getPassword(): string
110113
{
114+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
111115
return $this->password;
112116
}
113117

114118

115119
/** @deprecated */
116120
public function withoutUserInfo(): static
117121
{
122+
trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
118123
$dolly = clone $this;
119124
$dolly->user = $dolly->password = '';
120125
$dolly->authority = null;

tests/Http/FileUpload.basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test('', function () {
2222
'size' => 209,
2323
]);
2424

25-
Assert::same('readme.txt', $upload->getName());
25+
Assert::same('readme.txt', @$upload->getName()); // deprecated
2626
Assert::same('readme.txt', $upload->getUntrustedName());
2727
Assert::same('readme.txt', $upload->getSanitizedName());
2828
Assert::same('path/to/readme.txt', $upload->getUntrustedFullPath());
@@ -47,7 +47,7 @@ test('', function () {
4747
'size' => 209,
4848
]);
4949

50-
Assert::same('../.image.png', $upload->getName());
50+
Assert::same('../.image.png', $upload->getUntrustedName());
5151
Assert::same('image.png', $upload->getSanitizedName());
5252
Assert::same('../.image.png', $upload->getUntrustedFullPath());
5353
Assert::same('image/png', $upload->getContentType());

tests/Http/Request.invalidEncoding.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,5 @@ test('filtered data', function () {
118118
Assert::null($request->getFile(INVALID));
119119
Assert::null($request->getFile(CONTROL_CHARACTERS));
120120
Assert::type(Nette\Http\FileUpload::class, $request->files['file1']);
121-
Assert::same('', $request->files['file1']->name);
121+
Assert::same('', $request->files['file1']->getUntrustedName());
122122
});

tests/Http/Request.request.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ test('', function () {
3535

3636
Assert::same('/file.php', $request->getUrl()->scriptPath);
3737
Assert::same('https', $request->getUrl()->scheme);
38-
Assert::same('', $request->getUrl()->user);
39-
Assert::same('', $request->getUrl()->password);
38+
Assert::same('', @$request->getUrl()->user); // deprecated
39+
Assert::same('', @$request->getUrl()->password); // deprecated
4040
Assert::same('nette.org', $request->getUrl()->host);
4141
Assert::same(8080, $request->getUrl()->port);
4242
Assert::same('/file.php', $request->getUrl()->path);
@@ -61,8 +61,8 @@ test('', function () {
6161
$request = $factory->fromGlobals();
6262

6363
Assert::same('https', $request->getUrl()->scheme);
64-
Assert::same('', $request->getUrl()->user);
65-
Assert::same('', $request->getUrl()->password);
64+
Assert::same('', @$request->getUrl()->user); // deprecated
65+
Assert::same('', @$request->getUrl()->password); // deprecated
6666
Assert::same('nette.org', $request->getUrl()->host);
6767
Assert::same(8080, $request->getUrl()->port);
6868
Assert::same('/file.php', $request->getUrl()->path);

tests/Http/RequestFactory.authorization.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ test('Basic', function () {
2626
);
2727
Assert::same(['user', 'password'], $request->getBasicCredentials());
2828

29-
Assert::same('', $request->getUrl()->getUser());
30-
Assert::same('', $request->getUrl()->getPassword());
29+
Assert::same('', @$request->getUrl()->getUser()); // deprecated
30+
Assert::same('', @$request->getUrl()->getPassword()); // deprecated
3131
});
3232

3333

0 commit comments

Comments
 (0)