More performance changes

gulliver/core/Autoloader.php

@@ -77,7 +77,7 @@ class Autoloader
         $classname = strtolower($classname);
 
         if (! file_exists($includeFile)) {
-            throw new Exception("Error, Autoloader can't register a inexisten file: " . $includeFile);
+            throw new Exception("Error, Autoloader can't register a non exists file: " . $includeFile);
         }
 
         if (strpos($classname, '*') !== false) {

gulliver/system/class.bootstrap.php

@@ -21,12 +21,12 @@ class Bootstrap
     {
         $className = strtolower($class);
 
-        if (array_key_exists($className, BootStrap::$includeClassPaths)) {
+        if (isset(BootStrap::$includeClassPaths[$className])) {
             require_once BootStrap::$includeClassPaths[$className];
 
             return true;
         }
-
+        return false;
         $classHasNamespaceSeparator = strpos($class, '\\') !== false ? true : false;
 
         foreach (BootStrap::$includePaths as $path) {

src/ProcessMaker/Core/SplClassLoader.php

@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * SplClassLoader implementation that implements the technical interoperability
+ * standards for PHP 5.3 namespaces and class names.
+ *
+ * http://groups.google.com/group/php-standards/web/psr-0-final-proposal?pli=1
+ *
+ *     // Example which loads classes for the Doctrine Common package in the
+ *     // Doctrine\Common namespace.
+ *     $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
+ *     $classLoader->register();
+ *
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @author Jonathan H. Wage <jonwage@gmail.com>
+ * @author Roman S. Borschel <roman@code-factory.org>
+ * @author Matthew Weier O'Phinney <matthew@zend.com>
+ * @author Kris Wallsmith <kris.wallsmith@gmail.com>
+ * @author Fabien Potencier <fabien.potencier@symfony-project.org>
+ */
+class SplClassLoader
+{
+    private $_fileExtension = '.php';
+    private $_namespace;
+    private $_includePath;
+    private $_namespaceSeparator = '\\';
+
+    /**
+     * Creates a new <tt>SplClassLoader</tt> that loads classes of the
+     * specified namespace.
+     *
+     * @param string $ns The namespace to use.
+     */
+    public function __construct($ns = null, $includePath = null)
+    {
+        $this->_namespace = $ns;
+        $this->_includePath = $includePath;
+    }
+
+    /**
+     * Sets the namespace separator used by classes in the namespace of this class loader.
+     *
+     * @param string $sep The separator to use.
+     */
+    public function setNamespaceSeparator($sep)
+    {
+        $this->_namespaceSeparator = $sep;
+    }
+
+    /**
+     * Gets the namespace seperator used by classes in the namespace of this class loader.
+     *
+     * @return string
+     */
+    public function getNamespaceSeparator()
+    {
+        return $this->_namespaceSeparator;
+    }
+
+    /**
+     * Sets the base include path for all class files in the namespace of this class loader.
+     *
+     * @param string $includePath
+     */
+    public function setIncludePath($includePath)
+    {
+        $this->_includePath = $includePath;
+    }
+
+    /**
+     * Gets the base include path for all class files in the namespace of this class loader.
+     *
+     * @return string $includePath
+     */
+    public function getIncludePath()
+    {
+        return $this->_includePath;
+    }
+
+    /**
+     * Sets the file extension of class files in the namespace of this class loader.
+     *
+     * @param string $fileExtension
+     */
+    public function setFileExtension($fileExtension)
+    {
+        $this->_fileExtension = $fileExtension;
+    }
+
+    /**
+     * Gets the file extension of class files in the namespace of this class loader.
+     *
+     * @return string $fileExtension
+     */
+    public function getFileExtension()
+    {
+        return $this->_fileExtension;
+    }
+
+    /**
+     * Installs this class loader on the SPL autoload stack.
+     */
+    public function register()
+    {
+        spl_autoload_register(array($this, 'loadClass'));
+    }
+
+    /**
+     * Uninstalls this class loader from the SPL autoloader stack.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $className The name of the class to load.
+     * @return void
+     */
+    public function loadClass($className)
+    {
+        if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
+            $fileName = '';
+            $namespace = '';
+
+            if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
+                $namespace = substr($className, 0, $lastNsPos);
+                $className = substr($className, $lastNsPos + 1);
+                $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+            }
+
+            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
+
+            require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
+        }
+    }
+}

src/ProcessMaker/WebApplication.php

@@ -67,6 +67,7 @@ class WebApplication
             case self::SERVICE_API:
                 $request = $this->parseApiRequestUri();
                 $this->loadEnvironment($request["workspace"]);
+
                 Util\Logger::log("API::Dispatching ".$_SERVER["REQUEST_METHOD"]." ".$request["uri"]);
                 $this->dispatchApiRequest($request["uri"], $request["version"]);
                 Util\Logger::log("API::End Dispatching ".$_SERVER["REQUEST_METHOD"]." ".$request["uri"]);
@@ -279,10 +280,10 @@ class WebApplication
         \Bootstrap::registerClass('XmlForm_Field_SimpleText', PATH_GULLIVER . "class.xmlformExtension.php");
         \Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER . "class.xmlform.php");
 
-        \Bootstrap::registerDir('model', PATH_CORE . 'classes' . PATH_SEP . 'model');
+        //\Bootstrap::registerDir('model', PATH_CORE . 'classes' . PATH_SEP . 'model');
-        \Bootstrap::registerDir('rbac/model', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model');
+        //\Bootstrap::registerDir('rbac/model', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model');
 
-        \Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
+        //\Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
 
         \Bootstrap::registerSystemClasses();
 

workflow/public_html/app.php

@@ -32,16 +32,17 @@ try {
 
     /** @var Composer\Autoload\ClassLoader $loader */
     $loader = include $rootDir . "vendor" . DIRECTORY_SEPARATOR . "autoload.php";
-    $loader->add('', $rootDir . 'src/');
+    $loader->add("", $rootDir . 'src/');
-    $loader->add('', $rootDir . 'workflow/engine/src/');
+    $loader->add("", $rootDir . 'workflow/engine/src/');
-
+    $loader->add("", $rootDir . 'workflow/engine/classes/model/');
-    \ProcessMaker\Util\Logger::log("---/Starts at: " . date("H:i:s:u"));
 
     $app = new ProcessMaker\WebApplication();
+
     $app->setRootDir($rootDir);
     $app->setRequestUri($_SERVER['REQUEST_URI']);
+    $stat = $app->route();
 
-    switch ($app->route())
+    switch ($stat)
     {
         case ProcessMaker\WebApplication::RUNNING_WORKFLOW:
             include "sysGeneric.php";
@@ -51,7 +52,6 @@ try {
             break;
     }
 
-    \ProcessMaker\Util\Logger::log("--//End at: " . date("H:i:s:u"));
 } catch (Exception $e) {
     die($e->getMessage());
 }