added Helpers::getLastError()

Author: dg

src/Utils/FileSystem.php

@@ -26,7 +26,7 @@ final class FileSystem
 	public static function createDir(string $dir, int $mode = 0777): void
 	{
 		if (!is_dir($dir) && !@mkdir($dir, $mode, true) && !is_dir($dir)) { // @ - dir may already exist
-			throw new Nette\IOException("Unable to create directory '$dir'. " . self::getLastError());
+			throw new Nette\IOException("Unable to create directory '$dir'. " . Helpers::getLastError());
 		}
 	}
 
@@ -59,7 +59,7 @@ public static function copy(string $source, string $dest, bool $overwrite = true
 		} else {
 			static::createDir(dirname($dest));
 			if (($s = @fopen($source, 'rb')) && ($d = @fopen($dest, 'wb')) && @stream_copy_to_stream($s, $d) === false) { // @ is escalated to exception
-				throw new Nette\IOException("Unable to copy file '$source' to '$dest'. " . self::getLastError());
+				throw new Nette\IOException("Unable to copy file '$source' to '$dest'. " . Helpers::getLastError());
 			}
 		}
 	}
@@ -74,15 +74,15 @@ public static function delete(string $path): void
 		if (is_file($path) || is_link($path)) {
 			$func = DIRECTORY_SEPARATOR === '\\' && is_dir($path) ? 'rmdir' : 'unlink';
 			if (!@$func($path)) { // @ is escalated to exception
-				throw new Nette\IOException("Unable to delete '$path'. " . self::getLastError());
+				throw new Nette\IOException("Unable to delete '$path'. " . Helpers::getLastError());
 			}
 
 		} elseif (is_dir($path)) {
 			foreach (new \FilesystemIterator($path) as $item) {
 				static::delete($item->getPathname());
 			}
 			if (!@rmdir($path)) { // @ is escalated to exception
-				throw new Nette\IOException("Unable to delete directory '$path'. " . self::getLastError());
+				throw new Nette\IOException("Unable to delete directory '$path'. " . Helpers::getLastError());
 			}
 		}
 	}
@@ -107,7 +107,7 @@ public static function rename(string $name, string $newName, bool $overwrite = t
 				static::delete($newName);
 			}
 			if (!@rename($name, $newName)) { // @ is escalated to exception
-				throw new Nette\IOException("Unable to rename file or directory '$name' to '$newName'. " . self::getLastError());
+				throw new Nette\IOException("Unable to rename file or directory '$name' to '$newName'. " . Helpers::getLastError());
 			}
 		}
 	}
@@ -121,7 +121,7 @@ public static function read(string $file): string
 	{
 		$content = @file_get_contents($file); // @ is escalated to exception
 		if ($content === false) {
-			throw new Nette\IOException("Unable to read file '$file'. " . self::getLastError());
+			throw new Nette\IOException("Unable to read file '$file'. " . Helpers::getLastError());
 		}
 		return $content;
 	}
@@ -135,10 +135,10 @@ public static function write(string $file, string $content, ?int $mode = 0666):
 	{
 		static::createDir(dirname($file));
 		if (@file_put_contents($file, $content) === false) { // @ is escalated to exception
-			throw new Nette\IOException("Unable to write file '$file'. " . self::getLastError());
+			throw new Nette\IOException("Unable to write file '$file'. " . Helpers::getLastError());
 		}
 		if ($mode !== null && !@chmod($file, $mode)) { // @ is escalated to exception
-			throw new Nette\IOException("Unable to chmod file '$file'. " . self::getLastError());
+			throw new Nette\IOException("Unable to chmod file '$file'. " . Helpers::getLastError());
 		}
 	}
 
@@ -179,10 +179,4 @@ public static function joinPaths(string ...$paths): string
 	{
 		return self::normalizePath(implode('/', $paths));
 	}
-
-
-	private static function getLastError(): string
-	{
-		return preg_replace('#^\w+\(.*?\): #', '', error_get_last()['message']);
-	}
 }

src/Utils/Helpers.php

@@ -28,6 +28,17 @@ public static function capture(callable $func): string
 	}
 
 
+	public static function getLastError(): string
+	{
+		$message = error_get_last()['message'] ?? '';
+		if (ini_get('html_errors')) {
+			$message = html_entity_decode(strip_tags($message));
+		}
+		$message = preg_replace('#^\w+\(.*?\): #', '', $message);
+		return $message;
+	}
+
+
 	public static function falseToNull($val)
 	{
 		return $val === false ? null : $val;

src/Utils/Image.php

@@ -578,7 +578,7 @@ private function output(int $type, ?int $quality, string $file = null): void
 				throw new Nette\InvalidArgumentException("Unsupported image type '$type'.");
 		}
 		if (!$success) {
-			throw new ImageException(error_get_last()['message'] ?: 'Unknown error');
+			throw new ImageException(Helpers::getLastError() ?: 'Unknown error');
 		}
 	}
 

tests/Utils/Helpers.getLastError().phpt

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Utils\Helpers;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Assert::same('', Helpers::getLastError());
+
+ini_set('html_errors', '1');
+@constant('"');
+Assert::same('Couldn\'t find constant "', Helpers::getLastError());
+
+ini_set('html_errors', '0');
+@constant('"');
+Assert::same('Couldn\'t find constant "', Helpers::getLastError());
+
+ini_set('html_errors', '1');
+@fopen('nonexist', 'r');
+Assert::same('failed to open stream: No such file or directory', Helpers::getLastError());
+
+ini_set('html_errors', '0');
+@fopen('nonexist', 'r');
+Assert::same('failed to open stream: No such file or directory', Helpers::getLastError());