diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-05-04 09:49:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 09:49:50 +0200 |
| commit | afc59665582dbd83c4c25cab21a5b30b79cac676 (patch) | |
| tree | 44af7fe033a76da0cfb70da7cef9b874058d32d4 | |
| parent | 43fefee847739d5ec8351eaed894227efbdcf83a (diff) | |
| parent | 1ef77ef948a7bf73df1c743445f85b914b04dab0 (diff) | |
| download | nextcloud-server-afc59665582dbd83c4c25cab21a5b30b79cac676.tar.gz nextcloud-server-afc59665582dbd83c4c25cab21a5b30b79cac676.zip | |
Merge pull request #20749 from nextcloud/bug/noid/is-not-setup-via-query-false-positive
PHP 7.4 excludes the arguments from stack traces by default.
| -rw-r--r-- | lib/public/AppFramework/App.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index fa97dab2a3f..016ef5a0318 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -77,7 +77,10 @@ class App { * @since 6.0.0 */ public function __construct(string $appName, array $urlParams = []) { - if (\OC::$server->getConfig()->getSystemValueBool('debug')) { + $runIsSetupDirectly = \OC::$server->getConfig()->getSystemValueBool('debug') + && (PHP_VERSION_ID < 70400 || (PHP_VERSION_ID >= 70400 && !ini_get('zend.exception_ignore_args'))); + + if ($runIsSetupDirectly) { $applicationClassName = get_class($this); $e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly'); $setUpViaQuery = false; |