tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PHP7: Fix Zend autoload issues 

refs #10251
This commit is contained in:
Eric Lippmann 2016-01-27 16:52:32 +01:00
parent 41c05c3451
commit c1f7b2ed2d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Application/ClassLoader.php
View File

@ -247,7 +247,7 @@ class ClassLoader
/** /**
* Whether given prefix (Forms, Controllers...) makes part of "application" * Whether given prefix (Forms, Controllers...) makes part of "application"
* *
* @param string $prefix * @param string $prefix
* *
* @return boolean * @return boolean
*/ */
@ -291,7 +291,12 @@ class ClassLoader
// Return as fast as possible if we already did so. // Return as fast as possible if we already did so.
if (substr($class, 0, 5) === 'Zend_') { if (substr($class, 0, 5) === 'Zend_') {
if (! $this->gotZend) { if (! $this->gotZend) {
$this->requireZendAutoloader(); $zendLoader = $this->requireZendAutoloader();
if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
// PHP7 seems to remember the autoload function stack before auto-loading. Thus
// autoload functions registered during autoload never get called
return $zendLoader::autoload($class);
}
} }
return false; return false;
} }