diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-09 12:55:33 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-09 12:55:33 +0100 |
commit | 44192ce80b72c9aaf4aa1af80d14a42ae203d608 (patch) | |
tree | fd5091868b6a3eb015d5178c6c0c3a776a930fda /ext/phar/tests | |
parent | 3549f48edc914db041d81ae207400971d1c6c43c (diff) | |
download | php-git-44192ce80b72c9aaf4aa1af80d14a42ae203d608.tar.gz |
Make Phar $fileNotFoundScript nullable
While "" is already treated the same way as absence, null is the
logically correct default here. Making this one argument non-nullable
is particularly pecular when considering that the preceding $alias
and $index arguments are both nullable.
Diffstat (limited to 'ext/phar/tests')
-rw-r--r-- | ext/phar/tests/cache_list/frontcontroller12.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/cache_list/frontcontroller13.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/cache_list/frontcontroller31.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/frontcontroller12.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/frontcontroller13.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/frontcontroller31.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/tar/frontcontroller12.phar.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/tar/frontcontroller13.phar.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/zip/frontcontroller12.phar.phpt | 2 | ||||
-rw-r--r-- | ext/phar/tests/zip/frontcontroller13.phar.phpt | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt index 8b78e62c9c..857b7dc875 100644 --- a/ext/phar/tests/cache_list/frontcontroller12.phpt +++ b/ext/phar/tests/cache_list/frontcontroller12.phpt @@ -16,6 +16,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2 Stack trace: -#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller12.php on line 2 diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt index 9d2f9105da..ddbab34c07 100644 --- a/ext/phar/tests/cache_list/frontcontroller13.phpt +++ b/ext/phar/tests/cache_list/frontcontroller13.phpt @@ -16,6 +16,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2 Stack trace: -#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller13.php on line 2 diff --git a/ext/phar/tests/cache_list/frontcontroller31.phpt b/ext/phar/tests/cache_list/frontcontroller31.phpt index 41e36bf669..3419bb381d 100644 --- a/ext/phar/tests/cache_list/frontcontroller31.phpt +++ b/ext/phar/tests/cache_list/frontcontroller31.phpt @@ -15,6 +15,6 @@ files/frontcontroller16.phar --EXPECTF-- Fatal error: Uncaught TypeError: Phar::webPhar(): Argument #5 ($rewrite) must be a valid callback or null, class "fail" not found in %s:%d Stack trace: -#0 %s(%d): Phar::webPhar('test.phar', '/index.php', '', Array, Array) +#0 %s(%d): Phar::webPhar('test.phar', '/index.php', NULL, Array, Array) #1 {main} thrown in %s on line %d diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt index a7b1a892d6..40bd8e333f 100644 --- a/ext/phar/tests/frontcontroller12.phpt +++ b/ext/phar/tests/frontcontroller12.phpt @@ -15,6 +15,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2 Stack trace: -#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller12.php on line 2 diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt index 99b769d406..60d5709c6f 100644 --- a/ext/phar/tests/frontcontroller13.phpt +++ b/ext/phar/tests/frontcontroller13.phpt @@ -15,6 +15,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2 Stack trace: -#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller13.php on line 2 diff --git a/ext/phar/tests/frontcontroller31.phpt b/ext/phar/tests/frontcontroller31.phpt index 721df4849c..121a9389ee 100644 --- a/ext/phar/tests/frontcontroller31.phpt +++ b/ext/phar/tests/frontcontroller31.phpt @@ -14,6 +14,6 @@ files/frontcontroller16.phar --EXPECTF-- Fatal error: Uncaught TypeError: Phar::webPhar(): Argument #5 ($rewrite) must be a valid callback or null, class "fail" not found in %s:%d Stack trace: -#0 %s(%d): Phar::webPhar('test.phar', '/index.php', '', Array, Array) +#0 %s(%d): Phar::webPhar('test.phar', '/index.php', NULL, Array, Array) #1 {main} thrown in %s on line %d diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt index cbb928ff77..cec426b05a 100644 --- a/ext/phar/tests/tar/frontcontroller12.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt @@ -15,6 +15,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2 Stack trace: -#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller12.phar.php on line 2 diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt index 107961a70f..7d9992cb9d 100644 --- a/ext/phar/tests/tar/frontcontroller13.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt @@ -15,6 +15,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2 Stack trace: -#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller13.phar.php on line 2 diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt index 9f5b0a13aa..2169264b64 100644 --- a/ext/phar/tests/zip/frontcontroller12.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt @@ -17,6 +17,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2 Stack trace: -#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller12.phar.php on line 2 diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt index 5d2a77e4ac..c9c72a7a60 100644 --- a/ext/phar/tests/zip/frontcontroller13.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt @@ -17,6 +17,6 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2 Stack trace: -#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) +#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', NULL, Array) #1 {main} thrown in %sfrontcontroller13.phar.php on line 2 |