silently deprecated methods trigger E_USER_DEPRECATED

nette · Dec 11, 2023 · c2abfd0 · c2abfd0
1 parent 4a56d39
commit c2abfd0
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 4 deletions.
diff --git a/src/Http/FileUpload.php b/src/Http/FileUpload.php
@@ -63,6 +63,7 @@ public function __construct(?array $value)
 	 */
 	public function getName(): string
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getUntrustedName()', E_USER_DEPRECATED);
 		return $this->name;
 	}
 

diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -190,6 +190,7 @@ public function getHeaders(): array
 	 */
 	public function getReferer(): ?UrlImmutable
 	{
+		trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
 		return isset($this->headers['referer'])
 			? new UrlImmutable($this->headers['referer'])
 			: null;

diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
@@ -368,9 +368,10 @@ private function parseHostAndPort(string $s): ?array
 	}
 
 
-	/** @deprecated */
+	/** @deprecated use fromGlobals() */
 	public function createHttpRequest(): Request
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use fromGlobals()', E_USER_DEPRECATED);
 		return $this->fromGlobals();
 	}
 }
diff --git a/src/Http/SessionSection.php b/src/Http/SessionSection.php
@@ -99,6 +99,7 @@ public function remove(string|array|null $name = null): void
 	 */
 	public function __set(string $name, $value): void
 	{
+		trigger_error("Writing to \$session->$name is deprecated, use \$session->set('$name', \$value) instead", E_USER_DEPRECATED);
 		$this->session->autoStart(true);
 		$this->getData()[$name] = $value;
 	}
@@ -110,6 +111,7 @@ public function __set(string $name, $value): void
 	 */
 	public function &__get(string $name): mixed
 	{
+		trigger_error("Reading from \$session->$name is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
 		$this->session->autoStart(true);
 		$data = &$this->getData();
 		if ($this->warnOnUndefined && !array_key_exists($name, $data ?? [])) {
@@ -126,6 +128,7 @@ public function &__get(string $name): mixed
 	 */
 	public function __isset(string $name): bool
 	{
+		trigger_error("Using \$session->$name is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
 		$this->session->autoStart(false);
 		return isset($this->getData()[$name]);
 	}
@@ -137,6 +140,7 @@ public function __isset(string $name): bool
 	 */
 	public function __unset(string $name): void
 	{
+		trigger_error("Unset(\$session->$name) is deprecated, use \$session->remove('$name') instead", E_USER_DEPRECATED);
 		$this->remove($name);
 	}
 
@@ -147,6 +151,7 @@ public function __unset(string $name): void
 	 */
 	public function offsetSet($name, $value): void
 	{
+		trigger_error("Writing to \$session['$name'] is deprecated, use \$session->set('$name', \$value) instead", E_USER_DEPRECATED);
 		$this->__set($name, $value);
 	}
 
@@ -157,6 +162,7 @@ public function offsetSet($name, $value): void
 	 */
 	public function offsetGet($name): mixed
 	{
+		trigger_error("Reading from \$session['$name'] is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
 		return $this->get($name);
 	}
 
@@ -167,6 +173,7 @@ public function offsetGet($name): mixed
 	 */
 	public function offsetExists($name): bool
 	{
+		trigger_error("Using \$session['$name'] is deprecated, use \$session->get('$name') instead", E_USER_DEPRECATED);
 		return $this->__isset($name);
 	}
 
@@ -177,6 +184,7 @@ public function offsetExists($name): bool
 	 */
 	public function offsetUnset($name): void
 	{
+		trigger_error("Unset(\$session['$name']) is deprecated, use \$session->remove('$name') instead", E_USER_DEPRECATED);
 		$this->remove($name);
 	}
 

diff --git a/src/Http/Url.php b/src/Http/Url.php
@@ -283,6 +283,7 @@ public function getHostUrl(): string
 	/** @deprecated use UrlScript::getBasePath() instead */
 	public function getBasePath(): string
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
 		$pos = strrpos($this->path, '/');
 		return $pos === false ? '' : substr($this->path, 0, $pos + 1);
 	}
@@ -291,13 +292,15 @@ public function getBasePath(): string
 	/** @deprecated use UrlScript::getBaseUrl() instead */
 	public function getBaseUrl(): string
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
 		return $this->getHostUrl() . $this->getBasePath();
 	}
 
 
 	/** @deprecated use UrlScript::getRelativeUrl() instead */
 	public function getRelativeUrl(): string
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use UrlScript object', E_USER_DEPRECATED);
 		return substr($this->getAbsoluteUrl(), strlen($this->getBaseUrl()));
 	}
 

diff --git a/tests/Http/FileUpload.basic.phpt b/tests/Http/FileUpload.basic.phpt
@@ -22,7 +22,7 @@ test('', function () {
 		'size' => 209,
 	]);
 
-	Assert::same('readme.txt', $upload->getName());
+	Assert::same('readme.txt', @$upload->getName()); // deprecated
 	Assert::same('readme.txt', $upload->getUntrustedName());
 	Assert::same('readme.txt', $upload->getSanitizedName());
 	Assert::same('path/to/readme.txt', $upload->getUntrustedFullPath());
@@ -47,7 +47,7 @@ test('', function () {
 		'size' => 209,
 	]);
 
-	Assert::same('../.image.png', $upload->getName());
+	Assert::same('../.image.png', $upload->getUntrustedName());
 	Assert::same('image.png', $upload->getSanitizedName());
 	Assert::same('../.image.png', $upload->getUntrustedFullPath());
 	Assert::same('image/png', $upload->getContentType());

diff --git a/tests/Http/Request.invalidEncoding.phpt b/tests/Http/Request.invalidEncoding.phpt
@@ -118,5 +118,5 @@ test('filtered data', function () {
 	Assert::null($request->getFile(INVALID));
 	Assert::null($request->getFile(CONTROL_CHARACTERS));
 	Assert::type(Nette\Http\FileUpload::class, $request->files['file1']);
-	Assert::same('', $request->files['file1']->name);
+	Assert::same('', $request->files['file1']->getUntrustedName());
 });