Merge branch 'feature/include-zend-7464'

resolves #7464
Icinga · Nov 14, 2014 · 0e050fa · 0e050fa
2 parents 49d66a7 + 0296303
commit 0e050fa
Show file tree

Hide file tree

Showing 2,354 changed files with 929,208 additions and 11 deletions.
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
@@ -13,7 +13,6 @@
 use Icinga\Application\Logger;
 use Icinga\Util\DateTimeFactory;
 use Icinga\Util\Translator;
-use Icinga\Util\TimezoneDetect;
 use Icinga\Exception\IcingaException;
 
 /**
@@ -139,7 +138,6 @@ protected function __construct($baseDir = null, $configDir = null)
         $this->configDir = $canonical ? $canonical : $configDir;
 
         $this->setupAutoloader();
-        $this->setupZendAutoloader();
 
         set_include_path(
             implode(
@@ -323,25 +321,20 @@ public function setupAutoloader()
     /**
      * Register the Zend Autoloader
      *
-     * @return self
+     * @return $this
      */
     protected function setupZendAutoloader()
     {
         require_once 'Zend/Loader/Autoloader.php';
 
         \Zend_Loader_Autoloader::getInstance();
 
-        // Unfortunately this is needed to get the Zend Plugin loader working:
-        set_include_path(
-            implode(
-                PATH_SEPARATOR,
-                array($this->libDir, get_include_path())
-            )
+        \Zend_Paginator::addScrollingStylePrefixPath(
+            'Icinga_Web_Paginator_ScrollingStyle_', $this->libDir . '/Icinga/Web/Paginator/ScrollingStyle'
         );
 
         return $this;
     }
-
     /**
      * Setup module manager
      *

diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
@@ -27,7 +27,9 @@ class EmbeddedWeb extends ApplicationBootstrap
      */
     protected function bootstrap()
     {
-        return $this->loadConfig()
+        return $this
+            ->setupZendAutoloader()
+            ->loadConfig()
             ->setupErrorHandling()
             ->setupTimezone()
             ->setupModuleManager()

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
@@ -90,6 +90,7 @@ class Web extends ApplicationBootstrap
     protected function bootstrap()
     {
         return $this
+            ->setupZendAutoloader()
             ->setupLogging()
             ->setupErrorHandling()
             ->loadConfig()