diff --git a/ext/standard/string.c b/ext/standard/string.c
index b15a24a098faa..dabbb2bafe118 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1587,6 +1587,16 @@ PHP_FUNCTION(pathinfo)
 		Z_PARAM_LONG(opt)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (opt < PHP_PATHINFO_DIRNAME || opt > PHP_PATHINFO_ALL) {
+		zend_argument_value_error(2, "must be one of the PATHINFO_* constants");
+		RETURN_THROWS();
+	}
+
+	if (opt < PHP_PATHINFO_ALL && (opt & (opt - 1))) {
+		zend_argument_value_error(2, "must be only one of the PATHINFO_* constants");
+		RETURN_THROWS();
+	}
+
 	have_basename = (opt & PHP_PATHINFO_BASENAME);
 
 	array_init(&tmp);
diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt
index aa1494b57997f..86f88677d813c 100644
--- a/ext/standard/tests/file/pathinfo_variation3.phpt
+++ b/ext/standard/tests/file/pathinfo_variation3.phpt
@@ -15,15 +15,37 @@ var_dump(pathinfo($testfile, PATHINFO_BASENAME));
 var_dump(pathinfo($testfile, PATHINFO_FILENAME));
 var_dump(pathinfo($testfile, PATHINFO_EXTENSION));
 var_dump(pathinfo($testfile, PATHINFO_DIRNAME));
-var_dump(pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_DIRNAME));
-var_dump(pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_BASENAME));
-var_dump(pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_FILENAME));
-var_dump(pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_BASENAME));
-var_dump(pathinfo($testfile, PATHINFO_FILENAME|PATHINFO_DIRNAME));
-var_dump(pathinfo($testfile, PATHINFO_FILENAME|PATHINFO_BASENAME));
-var_dump(pathinfo($testfile, PATHINFO_DIRNAME|PATHINFO_EXTENSION));
-var_dump(pathinfo($testfile, PATHINFO_DIRNAME|PATHINFO_BASENAME));
 
+try {
+	pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_DIRNAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_FILENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo($testfile, PATHINFO_EXTENSION|PATHINFO_DIRNAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo($testfile, PATHINFO_FILENAME|PATHINFO_BASENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo($testfile, PATHINFO_DIRNAME|PATHINFO_EXTENSION);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo($testfile, PATHINFO_DIRNAME|PATHINFO_BASENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
 
 ?>
 --EXPECTF--
@@ -62,11 +84,9 @@ string(6) "inet.h"
 string(4) "inet"
 string(1) "h"
 string(17) "/usr/include/arpa"
-string(17) "/usr/include/arpa"
-string(6) "inet.h"
-string(1) "h"
-string(6) "inet.h"
-string(17) "/usr/include/arpa"
-string(6) "inet.h"
-string(17) "/usr/include/arpa"
-string(17) "/usr/include/arpa"
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
diff --git a/ext/standard/tests/strings/pathinfo.phpt b/ext/standard/tests/strings/pathinfo.phpt
index 2bbea73588cb2..1ff42a66121cc 100644
--- a/ext/standard/tests/strings/pathinfo.phpt
+++ b/ext/standard/tests/strings/pathinfo.phpt
@@ -14,14 +14,48 @@ var_dump(pathinfo(__FILE__, PATHINFO_BASENAME));
 var_dump(pathinfo(__FILE__, PATHINFO_FILENAME));
 var_dump(pathinfo(__FILE__, PATHINFO_EXTENSION));
 var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME));
-var_dump(pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_DIRNAME));
-var_dump(pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_BASENAME));
-var_dump(pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_FILENAME));
-var_dump(pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_BASENAME));
-var_dump(pathinfo(__FILE__, PATHINFO_FILENAME|PATHINFO_DIRNAME));
-var_dump(pathinfo(__FILE__, PATHINFO_FILENAME|PATHINFO_BASENAME));
-var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_EXTENSION));
-var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME));
+
+try {
+	pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_FILENAME|PATHINFO_DIRNAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_FILENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_EXTENSION|PATHINFO_DIRNAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_FILENAME|PATHINFO_BASENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_EXTENSION);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	pathinfo(__FILE__, PATHINFO_DIRNAME-1);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	pathinfo(__FILE__, PATHINFO_ALL+1);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
 
 echo "Done\n";
 ?>
@@ -94,12 +128,12 @@ string(12) "pathinfo.php"
 string(8) "pathinfo"
 string(3) "php"
 string(%d) "%s%estrings"
-string(%d) "%s%estrings"
-string(12) "pathinfo.php"
-string(3) "php"
-string(12) "pathinfo.php"
-string(%d) "%s%estrings"
-string(12) "pathinfo.php"
-string(%d) "%s%estrings"
-string(%d) "%s%estrings"
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be only one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be one of the PATHINFO_* constants
+pathinfo(): Argument #2 ($flags) must be one of the PATHINFO_* constants
 Done