Elgg / Elgg

engine/classes/Elgg/BootService.php

Indentation +205 added lines, -205 removed lines

@@ -17,209 +17,209 @@
  * @since 2.1
  */
 class BootService {
-	use Profilable;
-
-	/**
-	 * Under load, a short TTL gives nearly all of the benefits of a longer TTL, but it also ensures
-	 * that, should cache invalidation fail for some reason, it'll be rebuilt quickly anyway.
-	 *
-	 * In 2.x we do not cache by default. This will likely change to 10 in 3.0.
-	 */
-	const DEFAULT_BOOT_CACHE_TTL = 0;
-
-	/**
-	 * Has the cache already been invalidated this request? Avoids thrashing
-	 *
-	 * @var bool
-	 */
-	private $was_cleared = false;
-
-	/**
-	 * Boots the engine
-	 *
-	 * @param ServiceProvider $services Services
-	 * @return void
-	 */
-	public function boot(ServiceProvider $services) {
-		$db = $services->db;
-		$config = $services->config;
-
-		// set cookie values for session and remember me
-		$config->getCookieConfig();
-
-		// defaults in case these aren't in config table
-		if ($config->boot_cache_ttl === null) {
-			$config->boot_cache_ttl = self::DEFAULT_BOOT_CACHE_TTL;
-		}
-		if ($config->simplecache_enabled === null) {
-			$config->simplecache_enabled = 0;
-		}
-		if ($config->system_cache_enabled === null) {
-			$config->system_cache_enabled = false;
-		}
-		if ($config->simplecache_lastupdate === null) {
-			$config->simplecache_lastupdate = 0;
-		}
-
-		// we were using NOTICE temporarily so we can't just check for null
-		if (!$config->hasInitialValue('debug')) {
-			$config->debug = '';
-		}
-
-		// copy all table values into config
-		$config->mergeValues($services->configTable->getAll());
-
-		// needs to be set before [init, system] for links in html head
-		$config->lastcache = (int) $config->simplecache_lastupdate;
-
-		if (!$config->elgg_config_set_secret) {
-			$site_secret = SiteSecret::fromConfig($config);
-			if (!$site_secret) {
-				// The 2.3 installer doesn't create a site key (it's created on-demand on the first request)
-				// so for our Travis upgrade testing we need to check for this and create one on the spot.
-				if (defined('UPGRADING')) {
-					$site_secret = SiteSecret::regenerate($services->crypto, $services->configTable);
-				}
-			}
-			if ($site_secret) {
-				$services->setValue('siteSecret', $site_secret);
-			} else {
-				throw new \RuntimeException('The site secret is not set.');
-			}
-		}
-
-		$installed = isset($config->installed);
-
-		if ($this->timer) {
-			$this->timer->begin([__CLASS__ . '::getBootData']);
-		}
-
-		// early config is done, now get the core boot data
-		$data = $this->getBootData($config, $db, $installed);
-
-		$site = $data->getSite();
-		if (!$site) {
-			// must be set in config
-			$site = $config->site;
-			if (!$site instanceof \ElggSite) {
-				throw new \RuntimeException('Before installation, config->site must have an unsaved ElggSite.');
-			}
-		}
-		$config->site = $site;
-		$config->sitename = $site->name;
-		$config->sitedescription = $site->description;
-
-		$services->subtypeTable->setCachedValues($data->getSubtypeData());
-
-		$services->plugins->setBootPlugins($data->getActivePlugins());
-
-		$services->pluginSettingsCache->setCachedValues($data->getPluginSettings());
-
-		$services->logger->setLevel($config->debug);
-		if ($config->debug) {
-			$services->logger->setDisplay(true);
-		}
-
-		// finish boot sequence
-		_elgg_session_boot($services);
-
-		if ($config->system_cache_enabled) {
-			$config->system_cache_loaded = false;
-
-			if ($services->views->configureFromCache($services->systemCache)) {
-				$config->system_cache_loaded = true;
-			}
-		}
-
-		// we don't store langs in boot data because it varies by user
-		$services->translator->loadTranslations();
-
-		// we always need site->email and user->icontime, so load them together
-		$user_guid = $services->session->getLoggedInUserGuid();
-		if ($user_guid) {
-			$services->metadataCache->populateFromEntities([$user_guid]);
-		}
-
-		// invalidate on some actions just in case other invalidation triggers miss something
-		$services->hooks->registerHandler('action', 'all', function ($action) {
-			if (0 === strpos($action, 'admin/' || $action === 'plugins/settings/save')) {
-				$this->invalidateCache();
-			}
-		}, 1);
-	}
-
-	/**
-	 * Invalidate the cache item
-	 *
-	 * @return void
-	 */
-	public function invalidateCache() {
-		if (!$this->was_cleared) {
-			$this->getStashItem(_elgg_config())->clear();
-			$this->was_cleared = true;
-		}
-	}
-
-	/**
-	 * Get the boot data
-	 *
-	 * @param Config   $config    Elgg config object
-	 * @param Database $db        Elgg database
-	 * @param bool     $installed Is the site installed?
-	 *
-	 * @return BootData
-	 *
-	 * @throws \InstallationException
-	 */
-	private function getBootData(Config $config, Database $db, $installed) {
-		$config->_boot_cache_hit = false;
-
-		if (!$config->boot_cache_ttl) {
-			$data = new BootData();
-			$data->populate($db, _elgg_services()->entityTable, _elgg_services()->plugins, $installed);
-			return $data;
-		}
-
-		$item = $this->getStashItem($config);
-		$item->setInvalidationMethod(Invalidation::NONE);
-		$data = $item->get();
-		if ($item->isMiss()) {
-			$data = new BootData();
-			$data->populate($db, _elgg_services()->entityTable, _elgg_services()->plugins, $installed);
-			$item->set($data);
-			$item->expiresAfter($config->boot_cache_ttl);
-			$item->save();
-		} else {
-			$config->_boot_cache_hit = true;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get a Stash cache item
-	 *
-	 * @param Config $config Elgg config
-	 *
-	 * @return \Stash\Interfaces\ItemInterface
-	 */
-	private function getStashItem(Config $config) {
-		if ($config->memcache && class_exists('Memcache')) {
-			$options = [];
-			if ($config->memcache_servers) {
-				$options['servers'] = $config->memcache_servers;
-			}
-			$driver = new Memcache($options);
-		} else {
-			if (!$config->dataroot) {
-				// we're in the installer
-				$driver = new BlackHole();
-			} else {
-				$driver = new FileSystem([
-					'path' => $config->dataroot,
-				]);
-			}
-		}
-		return (new Pool($driver))->getItem("boot_data");
-	}
+    use Profilable;
+
+    /**
+     * Under load, a short TTL gives nearly all of the benefits of a longer TTL, but it also ensures
+     * that, should cache invalidation fail for some reason, it'll be rebuilt quickly anyway.
+     *
+     * In 2.x we do not cache by default. This will likely change to 10 in 3.0.
+     */
+    const DEFAULT_BOOT_CACHE_TTL = 0;
+
+    /**
+     * Has the cache already been invalidated this request? Avoids thrashing
+     *
+     * @var bool
+     */
+    private $was_cleared = false;
+
+    /**
+     * Boots the engine
+     *
+     * @param ServiceProvider $services Services
+     * @return void
+     */
+    public function boot(ServiceProvider $services) {
+        $db = $services->db;
+        $config = $services->config;
+
+        // set cookie values for session and remember me
+        $config->getCookieConfig();
+
+        // defaults in case these aren't in config table
+        if ($config->boot_cache_ttl === null) {
+            $config->boot_cache_ttl = self::DEFAULT_BOOT_CACHE_TTL;
+        }
+        if ($config->simplecache_enabled === null) {
+            $config->simplecache_enabled = 0;
+        }
+        if ($config->system_cache_enabled === null) {
+            $config->system_cache_enabled = false;
+        }
+        if ($config->simplecache_lastupdate === null) {
+            $config->simplecache_lastupdate = 0;
+        }
+
+        // we were using NOTICE temporarily so we can't just check for null
+        if (!$config->hasInitialValue('debug')) {
+            $config->debug = '';
+        }
+
+        // copy all table values into config
+        $config->mergeValues($services->configTable->getAll());
+
+        // needs to be set before [init, system] for links in html head
+        $config->lastcache = (int) $config->simplecache_lastupdate;
+
+        if (!$config->elgg_config_set_secret) {
+            $site_secret = SiteSecret::fromConfig($config);
+            if (!$site_secret) {
+                // The 2.3 installer doesn't create a site key (it's created on-demand on the first request)
+                // so for our Travis upgrade testing we need to check for this and create one on the spot.
+                if (defined('UPGRADING')) {
+                    $site_secret = SiteSecret::regenerate($services->crypto, $services->configTable);
+                }
+            }
+            if ($site_secret) {
+                $services->setValue('siteSecret', $site_secret);
+            } else {
+                throw new \RuntimeException('The site secret is not set.');
+            }
+        }
+
+        $installed = isset($config->installed);
+
+        if ($this->timer) {
+            $this->timer->begin([__CLASS__ . '::getBootData']);
+        }
+
+        // early config is done, now get the core boot data
+        $data = $this->getBootData($config, $db, $installed);
+
+        $site = $data->getSite();
+        if (!$site) {
+            // must be set in config
+            $site = $config->site;
+            if (!$site instanceof \ElggSite) {
+                throw new \RuntimeException('Before installation, config->site must have an unsaved ElggSite.');
+            }
+        }
+        $config->site = $site;
+        $config->sitename = $site->name;
+        $config->sitedescription = $site->description;
+
+        $services->subtypeTable->setCachedValues($data->getSubtypeData());
+
+        $services->plugins->setBootPlugins($data->getActivePlugins());
+
+        $services->pluginSettingsCache->setCachedValues($data->getPluginSettings());
+
+        $services->logger->setLevel($config->debug);
+        if ($config->debug) {
+            $services->logger->setDisplay(true);
+        }
+
+        // finish boot sequence
+        _elgg_session_boot($services);
+
+        if ($config->system_cache_enabled) {
+            $config->system_cache_loaded = false;
+
+            if ($services->views->configureFromCache($services->systemCache)) {
+                $config->system_cache_loaded = true;
+            }
+        }
+
+        // we don't store langs in boot data because it varies by user
+        $services->translator->loadTranslations();
+
+        // we always need site->email and user->icontime, so load them together
+        $user_guid = $services->session->getLoggedInUserGuid();
+        if ($user_guid) {
+            $services->metadataCache->populateFromEntities([$user_guid]);
+        }
+
+        // invalidate on some actions just in case other invalidation triggers miss something
+        $services->hooks->registerHandler('action', 'all', function ($action) {
+            if (0 === strpos($action, 'admin/' || $action === 'plugins/settings/save')) {
+                $this->invalidateCache();
+            }
+        }, 1);
+    }
+
+    /**
+     * Invalidate the cache item
+     *
+     * @return void
+     */
+    public function invalidateCache() {
+        if (!$this->was_cleared) {
+            $this->getStashItem(_elgg_config())->clear();
+            $this->was_cleared = true;
+        }
+    }
+
+    /**
+     * Get the boot data
+     *
+     * @param Config   $config    Elgg config object
+     * @param Database $db        Elgg database
+     * @param bool     $installed Is the site installed?
+     *
+     * @return BootData
+     *
+     * @throws \InstallationException
+     */
+    private function getBootData(Config $config, Database $db, $installed) {
+        $config->_boot_cache_hit = false;
+
+        if (!$config->boot_cache_ttl) {
+            $data = new BootData();
+            $data->populate($db, _elgg_services()->entityTable, _elgg_services()->plugins, $installed);
+            return $data;
+        }
+
+        $item = $this->getStashItem($config);
+        $item->setInvalidationMethod(Invalidation::NONE);
+        $data = $item->get();
+        if ($item->isMiss()) {
+            $data = new BootData();
+            $data->populate($db, _elgg_services()->entityTable, _elgg_services()->plugins, $installed);
+            $item->set($data);
+            $item->expiresAfter($config->boot_cache_ttl);
+            $item->save();
+        } else {
+            $config->_boot_cache_hit = true;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get a Stash cache item
+     *
+     * @param Config $config Elgg config
+     *
+     * @return \Stash\Interfaces\ItemInterface
+     */
+    private function getStashItem(Config $config) {
+        if ($config->memcache && class_exists('Memcache')) {
+            $options = [];
+            if ($config->memcache_servers) {
+                $options['servers'] = $config->memcache_servers;
+            }
+            $driver = new Memcache($options);
+        } else {
+            if (!$config->dataroot) {
+                // we're in the installer
+                $driver = new BlackHole();
+            } else {
+                $driver = new FileSystem([
+                    'path' => $config->dataroot,
+                ]);
+            }
+        }
+        return (new Pool($driver))->getItem("boot_data");
+    }
 }

engine/classes/ElggInstaller.php

Indentation +1404 added lines, -1404 removed lines

@@ -34,1412 +34,1412 @@
  */
 class ElggInstaller {
 	
-	private $steps = [
-		'welcome',
-		'requirements',
-		'database',
-		'settings',
-		'admin',
-		'complete',
-		];
-
-	private $has_completed = [
-		'config' => false,
-		'database' => false,
-		'settings' => false,
-		'admin' => false,
-	];
-
-	private $is_action = false;
-
-	private $autoLogin = true;
-
-	/**
-	 * @var ServiceProvider
-	 */
-	private $services;
-
-	/**
-	 * @var Config
-	 */
-	private $config;
-
-	/**
-	 * @var Application
-	 */
-	private $app;
-
-	/**
-	 * Dispatches a request to one of the step controllers
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	public function run() {
-		$this->getApp();
-
-		$this->is_action = $this->services->request->getMethod() === 'POST';
-
-		$step = get_input('step', 'welcome');
-
-		if (!in_array($step, $this->getSteps())) {
-			$msg = elgg_echo('InstallationException:UnknownStep', [$step]);
-			throw new InstallationException($msg);
-		}
-
-		$this->determineInstallStatus();
+    private $steps = [
+        'welcome',
+        'requirements',
+        'database',
+        'settings',
+        'admin',
+        'complete',
+        ];
+
+    private $has_completed = [
+        'config' => false,
+        'database' => false,
+        'settings' => false,
+        'admin' => false,
+    ];
+
+    private $is_action = false;
+
+    private $autoLogin = true;
+
+    /**
+     * @var ServiceProvider
+     */
+    private $services;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Application
+     */
+    private $app;
+
+    /**
+     * Dispatches a request to one of the step controllers
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    public function run() {
+        $this->getApp();
+
+        $this->is_action = $this->services->request->getMethod() === 'POST';
+
+        $step = get_input('step', 'welcome');
+
+        if (!in_array($step, $this->getSteps())) {
+            $msg = elgg_echo('InstallationException:UnknownStep', [$step]);
+            throw new InstallationException($msg);
+        }
+
+        $this->determineInstallStatus();
 	
-		$this->checkInstallCompletion($step);
-
-		// check if this is an install being resumed
-		$this->resumeInstall($step);
-
-		$this->finishBootstrapping($step);
-
-		$params = $this->services->request->request->all();
-
-		$method = "run" . ucwords($step);
-		$this->$method($params);
-	}
-
-	/**
-	 * Build the application needed by the installer
-	 *
-	 * @return Application
-	 * @throws InstallationException
-	 */
-	protected function getApp() {
-		if ($this->app) {
-			return $this->app;
-		}
-
-		$config = new Config();
-		$config->elgg_config_locks = false;
-		$config->installer_running = true;
-		$config->dbencoding = 'utf8mb4';
-
-		$this->config = $config;
-		$this->services = new ServiceProvider($config);
-
-		$app = Application::factory([
-			'service_provider' => $this->services,
-			'handle_exceptions' => false,
-			'handle_shutdown' => false,
-
-			// allows settings.php to be loaded, which might try to write to global $CONFIG
-			// which is only a problem due to the config values that deep-write to arrays,
-			// like cookies.
-			'set_global_config' => false,
-		]);
-		$app->loadCore();
-		$this->app = $app;
-
-		$this->services->setValue('session', \ElggSession::getMock());
-		$this->services->views->setViewtype('installation');
-		$this->services->views->registerPluginViews(Paths::elgg());
-		$this->services->translator->registerTranslations(Paths::elgg() . "install/languages/", true);
-
-		return $this->app;
-	}
-
-	/**
-	 * Set the auto login flag
-	 *
-	 * @param bool $flag Auto login
-	 *
-	 * @return void
-	 */
-	public function setAutoLogin($flag) {
-		$this->autoLogin = (bool) $flag;
-	}
-
-	/**
-	 * A batch install of Elgg
-	 *
-	 * All required parameters must be passed in as an associative array. See
-	 * $requiredParams for a list of them. This creates the necessary files,
-	 * loads the database, configures the site settings, and creates the admin
-	 * account. If it fails, an exception is thrown. It does not check any of
-	 * the requirements as the multiple step web installer does.
-	 *
-	 * @param array $params          Array of key value pairs
-	 * @param bool  $create_htaccess Should .htaccess be created
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	public function batchInstall(array $params, $create_htaccess = false) {
-		$this->getApp();
-
-		$defaults = [
-			'dbhost' => 'localhost',
-			'dbprefix' => 'elgg_',
-			'language' => 'en',
-			'siteaccess' => ACCESS_PUBLIC,
-		];
-		$params = array_merge($defaults, $params);
-
-		$required_params = [
-			'dbuser',
-			'dbpassword',
-			'dbname',
-			'sitename',
-			'wwwroot',
-			'dataroot',
-			'displayname',
-			'email',
-			'username',
-			'password',
-		];
-		foreach ($required_params as $key) {
-			if (empty($params[$key])) {
-				$msg = elgg_echo('install:error:requiredfield', [$key]);
-				throw new InstallationException($msg);
-			}
-		}
-
-		// password is passed in once
-		$params['password1'] = $params['password2'] = $params['password'];
-
-		if ($create_htaccess) {
-			$rewrite_tester = new ElggRewriteTester();
-			if (!$rewrite_tester->createHtaccess($params['wwwroot'])) {
-				throw new InstallationException(elgg_echo('install:error:htaccess'));
-			}
-		}
-
-		$this->determineInstallStatus();
-
-		if (!$this->has_completed['config']) {
-			if (!$this->createSettingsFile($params)) {
-				throw new InstallationException(elgg_echo('install:error:settings'));
-			}
-		}
-
-		$this->loadSettingsFile();
-
-		// Make sure settings file matches parameters
-		$config = $this->config;
-		$config_keys = [
-			// param key => config key
-			'dbhost' => 'dbhost',
-			'dbuser' => 'dbuser',
-			'dbpassword' => 'dbpass',
-			'dbname' => 'dbname',
-			'dataroot' => 'dataroot',
-			'dbprefix' => 'dbprefix',
-		];
-		foreach ($config_keys as $params_key => $config_key) {
-			if ($params[$params_key] !== $config->$config_key) {
-				throw new InstallationException(elgg_echo('install:error:settings_mismatch', [$config_key]));
-			}
-		}
-
-		if (!$this->connectToDatabase()) {
-			throw new InstallationException(elgg_echo('install:error:databasesettings'));
-		}
-
-		if (!$this->has_completed['database']) {
-			if (!$this->installDatabase()) {
-				throw new InstallationException(elgg_echo('install:error:cannotloadtables'));
-			}
-		}
-
-		// load remaining core libraries
-		$this->finishBootstrapping('settings');
-
-		if (!$this->saveSiteSettings($params)) {
-			throw new InstallationException(elgg_echo('install:error:savesitesettings'));
-		}
-
-		if (!$this->createAdminAccount($params)) {
-			throw new InstallationException(elgg_echo('install:admin:cannot_create'));
-		}
-	}
-
-	/**
-	 * Renders the data passed by a controller
-	 *
-	 * @param string $step The current step
-	 * @param array  $vars Array of vars to pass to the view
-	 *
-	 * @return void
-	 */
-	protected function render($step, $vars = []) {
-		$vars['next_step'] = $this->getNextStep($step);
-
-		$title = elgg_echo("install:$step");
-		$body = elgg_view("install/pages/$step", $vars);
+        $this->checkInstallCompletion($step);
+
+        // check if this is an install being resumed
+        $this->resumeInstall($step);
+
+        $this->finishBootstrapping($step);
+
+        $params = $this->services->request->request->all();
+
+        $method = "run" . ucwords($step);
+        $this->$method($params);
+    }
+
+    /**
+     * Build the application needed by the installer
+     *
+     * @return Application
+     * @throws InstallationException
+     */
+    protected function getApp() {
+        if ($this->app) {
+            return $this->app;
+        }
+
+        $config = new Config();
+        $config->elgg_config_locks = false;
+        $config->installer_running = true;
+        $config->dbencoding = 'utf8mb4';
+
+        $this->config = $config;
+        $this->services = new ServiceProvider($config);
+
+        $app = Application::factory([
+            'service_provider' => $this->services,
+            'handle_exceptions' => false,
+            'handle_shutdown' => false,
+
+            // allows settings.php to be loaded, which might try to write to global $CONFIG
+            // which is only a problem due to the config values that deep-write to arrays,
+            // like cookies.
+            'set_global_config' => false,
+        ]);
+        $app->loadCore();
+        $this->app = $app;
+
+        $this->services->setValue('session', \ElggSession::getMock());
+        $this->services->views->setViewtype('installation');
+        $this->services->views->registerPluginViews(Paths::elgg());
+        $this->services->translator->registerTranslations(Paths::elgg() . "install/languages/", true);
+
+        return $this->app;
+    }
+
+    /**
+     * Set the auto login flag
+     *
+     * @param bool $flag Auto login
+     *
+     * @return void
+     */
+    public function setAutoLogin($flag) {
+        $this->autoLogin = (bool) $flag;
+    }
+
+    /**
+     * A batch install of Elgg
+     *
+     * All required parameters must be passed in as an associative array. See
+     * $requiredParams for a list of them. This creates the necessary files,
+     * loads the database, configures the site settings, and creates the admin
+     * account. If it fails, an exception is thrown. It does not check any of
+     * the requirements as the multiple step web installer does.
+     *
+     * @param array $params          Array of key value pairs
+     * @param bool  $create_htaccess Should .htaccess be created
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    public function batchInstall(array $params, $create_htaccess = false) {
+        $this->getApp();
+
+        $defaults = [
+            'dbhost' => 'localhost',
+            'dbprefix' => 'elgg_',
+            'language' => 'en',
+            'siteaccess' => ACCESS_PUBLIC,
+        ];
+        $params = array_merge($defaults, $params);
+
+        $required_params = [
+            'dbuser',
+            'dbpassword',
+            'dbname',
+            'sitename',
+            'wwwroot',
+            'dataroot',
+            'displayname',
+            'email',
+            'username',
+            'password',
+        ];
+        foreach ($required_params as $key) {
+            if (empty($params[$key])) {
+                $msg = elgg_echo('install:error:requiredfield', [$key]);
+                throw new InstallationException($msg);
+            }
+        }
+
+        // password is passed in once
+        $params['password1'] = $params['password2'] = $params['password'];
+
+        if ($create_htaccess) {
+            $rewrite_tester = new ElggRewriteTester();
+            if (!$rewrite_tester->createHtaccess($params['wwwroot'])) {
+                throw new InstallationException(elgg_echo('install:error:htaccess'));
+            }
+        }
+
+        $this->determineInstallStatus();
+
+        if (!$this->has_completed['config']) {
+            if (!$this->createSettingsFile($params)) {
+                throw new InstallationException(elgg_echo('install:error:settings'));
+            }
+        }
+
+        $this->loadSettingsFile();
+
+        // Make sure settings file matches parameters
+        $config = $this->config;
+        $config_keys = [
+            // param key => config key
+            'dbhost' => 'dbhost',
+            'dbuser' => 'dbuser',
+            'dbpassword' => 'dbpass',
+            'dbname' => 'dbname',
+            'dataroot' => 'dataroot',
+            'dbprefix' => 'dbprefix',
+        ];
+        foreach ($config_keys as $params_key => $config_key) {
+            if ($params[$params_key] !== $config->$config_key) {
+                throw new InstallationException(elgg_echo('install:error:settings_mismatch', [$config_key]));
+            }
+        }
+
+        if (!$this->connectToDatabase()) {
+            throw new InstallationException(elgg_echo('install:error:databasesettings'));
+        }
+
+        if (!$this->has_completed['database']) {
+            if (!$this->installDatabase()) {
+                throw new InstallationException(elgg_echo('install:error:cannotloadtables'));
+            }
+        }
+
+        // load remaining core libraries
+        $this->finishBootstrapping('settings');
+
+        if (!$this->saveSiteSettings($params)) {
+            throw new InstallationException(elgg_echo('install:error:savesitesettings'));
+        }
+
+        if (!$this->createAdminAccount($params)) {
+            throw new InstallationException(elgg_echo('install:admin:cannot_create'));
+        }
+    }
+
+    /**
+     * Renders the data passed by a controller
+     *
+     * @param string $step The current step
+     * @param array  $vars Array of vars to pass to the view
+     *
+     * @return void
+     */
+    protected function render($step, $vars = []) {
+        $vars['next_step'] = $this->getNextStep($step);
+
+        $title = elgg_echo("install:$step");
+        $body = elgg_view("install/pages/$step", $vars);
 				
-		echo elgg_view_page(
-				$title,
-				$body,
-				'default',
-				[
-					'step' => $step,
-					'steps' => $this->getSteps(),
-					]
-				);
-		exit;
-	}
-
-	/**
-	 * Step controllers
-	 */
-
-	/**
-	 * Welcome controller
-	 *
-	 * @param array $vars Not used
-	 *
-	 * @return void
-	 */
-	protected function runWelcome($vars) {
-		$this->render('welcome');
-	}
-
-	/**
-	 * Requirements controller
-	 *
-	 * Checks version of php, libraries, permissions, and rewrite rules
-	 *
-	 * @param array $vars Vars
-	 *
-	 * @return void
-	 */
-	protected function runRequirements($vars) {
-
-		$report = [];
-
-		// check PHP parameters and libraries
-		$this->checkPHP($report);
-
-		// check URL rewriting
-		$this->checkRewriteRules($report);
-
-		// check for existence of settings file
-		if ($this->checkSettingsFile($report) != true) {
-			// no file, so check permissions on engine directory
-			$this->isInstallDirWritable($report);
-		}
-
-		// check the database later
-		$report['database'] = [[
-			'severity' => 'info',
-			'message' => elgg_echo('install:check:database')
-		]];
-
-		// any failures?
-		$numFailures = $this->countNumConditions($report, 'failure');
-
-		// any warnings
-		$numWarnings = $this->countNumConditions($report, 'warning');
-
-
-		$params = [
-			'report' => $report,
-			'num_failures' => $numFailures,
-			'num_warnings' => $numWarnings,
-		];
-
-		$this->render('requirements', $params);
-	}
-
-	/**
-	 * Database set up controller
-	 *
-	 * Creates the settings.php file and creates the database tables
-	 *
-	 * @param array $submissionVars Submitted form variables
-	 *
-	 * @return void
-	 */
-	protected function runDatabase($submissionVars) {
-
-		$formVars = [
-			'dbuser' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'dbpassword' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => false,
-				],
-			'dbname' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'dbhost' => [
-				'type' => 'text',
-				'value' => 'localhost',
-				'required' => true,
-				],
-			'dbprefix' => [
-				'type' => 'text',
-				'value' => 'elgg_',
-				'required' => true,
-				],
-			'dataroot' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-			],
-			'wwwroot' => [
-				'type' => 'url',
-				'value' => _elgg_services()->config->wwwroot,
-				'required' => true,
-			],
-			'timezone' => [
-				'type' => 'dropdown',
-				'value' => 'UTC',
-				'options' => \DateTimeZone::listIdentifiers(),
-				'required' => true
-			]
-		];
-
-		if ($this->checkSettingsFile()) {
-			// user manually created settings file so we fake out action test
-			$this->is_action = true;
-		}
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				// only create settings file if it doesn't exist
-				if (!$this->checkSettingsFile()) {
-					if (!$this->validateDatabaseVars($submissionVars, $formVars)) {
-						// error so we break out of action and serve same page
-						return;
-					}
-
-					if (!$this->createSettingsFile($submissionVars)) {
-						return;
-					}
-				}
-
-				// check db version and connect
-				if (!$this->connectToDatabase()) {
-					return;
-				}
-
-				if (!$this->installDatabase()) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:database'));
-
-				$this->continueToNextStep('database');
-			});
-		}
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$params = ['variables' => $formVars,];
-
-		if ($this->checkSettingsFile()) {
-			// settings file exists and we're here so failed to create database
-			$params['failure'] = true;
-		}
-
-		$this->render('database', $params);
-	}
-
-	/**
-	 * Site settings controller
-	 *
-	 * Sets the site name, URL, data directory, etc.
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return void
-	 */
-	protected function runSettings($submissionVars) {
-		$formVars = [
-			'sitename' => [
-				'type' => 'text',
-				'value' => 'My New Community',
-				'required' => true,
-				],
-			'siteemail' => [
-				'type' => 'email',
-				'value' => '',
-				'required' => false,
-				],
-			'siteaccess' => [
-				'type' => 'access',
-				'value' => ACCESS_PUBLIC,
-				'required' => true,
-				],
-		];
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				if (!$this->validateSettingsVars($submissionVars, $formVars)) {
-					return;
-				}
-
-				if (!$this->saveSiteSettings($submissionVars)) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:settings'));
-
-				$this->continueToNextStep('settings');
-			});
-		}
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$this->render('settings', ['variables' => $formVars]);
-	}
-
-	/**
-	 * Admin account controller
-	 *
-	 * Creates an admin user account
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return void
-	 */
-	protected function runAdmin($submissionVars) {
-		$formVars = [
-			'displayname' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'email' => [
-				'type' => 'email',
-				'value' => '',
-				'required' => true,
-				],
-			'username' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'password1' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => true,
-				'pattern' => '.{6,}',
-				],
-			'password2' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => true,
-				],
-		];
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				if (!$this->validateAdminVars($submissionVars, $formVars)) {
-					return;
-				}
-
-				if (!$this->createAdminAccount($submissionVars, $this->autoLogin)) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:admin'));
-
-				$this->continueToNextStep('admin');
-			});
-		}
-
-		// Bit of a hack to get the password help to show right number of characters
-		// We burn the value into the stored translation.
-		$lang = $this->services->translator->getCurrentLanguage();
-		$translations = $this->services->translator->getLoadedTranslations();
-		$this->services->translator->addTranslation($lang, [
-			'install:admin:help:password1' => sprintf(
-				$translations[$lang]['install:admin:help:password1'],
-				$this->config->min_password_length
-			),
-		]);
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$this->render('admin', ['variables' => $formVars]);
-	}
-
-	/**
-	 * Controller for last step
-	 *
-	 * @return void
-	 */
-	protected function runComplete() {
-
-		// nudge to check out settings
-		$link = elgg_format_element([
-			'#tag_name' => 'a',
-			'#text' => elgg_echo('install:complete:admin_notice:link_text'),
-			'href' => elgg_normalize_url('admin/settings/basic'),
-		]);
-		$notice = elgg_echo('install:complete:admin_notice', [$link]);
-		elgg_add_admin_notice('fresh_install', $notice);
-
-		$this->render('complete');
-	}
-
-	/**
-	 * Step management
-	 */
-
-	/**
-	 * Get an array of steps
-	 *
-	 * @return array
-	 */
-	protected function getSteps() {
-		return $this->steps;
-	}
-
-	/**
-	 * Forwards the browser to the next step
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return void
-	 */
-	protected function continueToNextStep($currentStep) {
-		$this->is_action = false;
-		forward($this->getNextStepUrl($currentStep));
-	}
-
-	/**
-	 * Get the next step as a string
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return string
-	 */
-	protected function getNextStep($currentStep) {
-		$index = 1 + array_search($currentStep, $this->steps);
-		if (isset($this->steps[$index])) {
-			return $this->steps[$index];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the URL of the next step
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return string
-	 */
-	protected function getNextStepUrl($currentStep) {
-		$nextStep = $this->getNextStep($currentStep);
-		return $this->config->wwwroot . "install.php?step=$nextStep";
-	}
-
-	/**
-	 * Updates $this->has_completed according to the current installation
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function determineInstallStatus() {
-		$path = Paths::settingsFile();
-		if (!is_file($path) || !is_readable($path)) {
-			return;
-		}
-
-		$this->loadSettingsFile();
-
-		$this->has_completed['config'] = true;
-
-		// must be able to connect to database to jump install steps
-		$dbSettingsPass = $this->checkDatabaseSettings(
-			$this->config->dbuser,
-			$this->config->dbpass,
-			$this->config->dbname,
-			$this->config->dbhost
-		);
-
-		if (!$dbSettingsPass) {
-			return;
-		}
-
-		$db = $this->services->db;
-
-		// check that the config table has been created
-		$result = $db->getData("SHOW TABLES");
-		if ($result) {
-			foreach ($result as $table) {
-				$table = (array) $table;
-				if (in_array("{$db->prefix}config", $table)) {
-					$this->has_completed['database'] = true;
-				}
-			}
-			if ($this->has_completed['database'] == false) {
-				return;
-			}
-		} else {
-			// no tables
-			return;
-		}
-
-		// check that the config table has entries
-		$query = "SELECT COUNT(*) AS total FROM {$db->prefix}config";
-		$result = $db->getData($query);
-		if ($result && $result[0]->total > 0) {
-			$this->has_completed['settings'] = true;
-		} else {
-			return;
-		}
-
-		// check that the users entity table has an entry
-		$query = "SELECT COUNT(*) AS total FROM {$db->prefix}users_entity";
-		$result = $db->getData($query);
-		if ($result && $result[0]->total > 0) {
-			$this->has_completed['admin'] = true;
-		} else {
-			return;
-		}
-	}
-
-	/**
-	 * Security check to ensure the installer cannot be run after installation
-	 * has finished. If this is detected, the viewer is sent to the front page.
-	 *
-	 * @param string $step Installation step to check against
-	 *
-	 * @return void
-	 */
-	protected function checkInstallCompletion($step) {
-		if ($step != 'complete') {
-			if (!in_array(false, $this->has_completed)) {
-				// install complete but someone is trying to view an install page
-				forward();
-			}
-		}
-	}
-
-	/**
-	 * Check if this is a case of a install being resumed and figure
-	 * out where to continue from. Returns the best guess on the step.
-	 *
-	 * @param string $step Installation step to resume from
-	 *
-	 * @return string
-	 */
-	protected function resumeInstall($step) {
-		// only do a resume from the first step
-		if ($step !== 'welcome') {
-			return;
-		}
-
-		if ($this->has_completed['database'] == false) {
-			return;
-		}
-
-		if ($this->has_completed['settings'] == false) {
-			forward("install.php?step=settings");
-		}
-
-		if ($this->has_completed['admin'] == false) {
-			forward("install.php?step=admin");
-		}
-
-		// everything appears to be set up
-		forward("install.php?step=complete");
-	}
-
-	/**
-	 * Bootstrapping
-	 */
-
-	/**
-	 * Load remaining engine libraries and complete bootstrapping
-	 *
-	 * @param string $step Which step to boot strap for. Required because
-	 *                     boot strapping is different until the DB is populated.
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function finishBootstrapping($step) {
-
-		$index_db = array_search('database', $this->getSteps());
-		$index_settings = array_search('settings', $this->getSteps());
-		$index_admin = array_search('admin', $this->getSteps());
-		$index_complete = array_search('complete', $this->getSteps());
-		$index_step = array_search($step, $this->getSteps());
-
-		// To log in the user, we need to use the Elgg core session handling.
-		// Otherwise, use default php session handling
-		$use_elgg_session = ($index_step == $index_admin && $this->is_action) || ($index_step == $index_complete);
-		if (!$use_elgg_session) {
-			$session = ElggSession::fromFiles($this->config);
-			$session->setName('Elgg_install');
-			$this->services->setValue('session', $session);
-		}
-
-		if ($index_step > $index_db) {
-			// once the database has been created, load rest of engine
-
-			// dummy site needed to boot
-			$this->config->site = new ElggSite();
-
-			$this->app->bootCore();
-		}
-	}
-
-	/**
-	 * Load settings
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function loadSettingsFile() {
-		try {
-			$config = Config::fromFile(Paths::settingsFile());
-			$this->config->mergeValues($config->getValues());
-
-			// in case the DB instance is already captured in services, we re-inject its settings.
-			$this->services->db->resetConnections(DbConfig::fromElggConfig($this->config));
-		} catch (\Exception $e) {
-			$msg = elgg_echo('InstallationException:CannotLoadSettings');
-			throw new InstallationException($msg, 0, $e);
-		}
-	}
-
-	/**
-	 * Action handling methods
-	 */
-
-	/**
-	 * If form is reshown, remember previously submitted variables
-	 *
-	 * @param array $formVars       Vars int he form
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return array
-	 */
-	protected function makeFormSticky($formVars, $submissionVars) {
-		foreach ($submissionVars as $field => $value) {
-			$formVars[$field]['value'] = $value;
-		}
-		return $formVars;
-	}
-
-	/* Requirement checks support methods */
-
-	/**
-	 * Indicates whether the webserver can add settings.php on its own or not.
-	 *
-	 * @param array $report The requirements report object
-	 *
-	 * @return bool
-	 */
-	protected function isInstallDirWritable(&$report) {
-		if (!is_writable(Paths::projectConfig())) {
-			$msg = elgg_echo('install:check:installdir', [Paths::PATH_TO_CONFIG]);
-			$report['settings'] = [
-				[
-					'severity' => 'failure',
-					'message' => $msg,
-				]
-			];
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check that the settings file exists
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return bool
-	 */
-	protected function checkSettingsFile(&$report = []) {
-		if (!is_file(Paths::settingsFile())) {
-			return false;
-		}
-
-		if (!is_readable(Paths::settingsFile())) {
-			$report['settings'] = [
-				[
-					'severity' => 'failure',
-					'message' => elgg_echo('install:check:readsettings'),
-				]
-			];
-		}
+        echo elgg_view_page(
+                $title,
+                $body,
+                'default',
+                [
+                    'step' => $step,
+                    'steps' => $this->getSteps(),
+                    ]
+                );
+        exit;
+    }
+
+    /**
+     * Step controllers
+     */
+
+    /**
+     * Welcome controller
+     *
+     * @param array $vars Not used
+     *
+     * @return void
+     */
+    protected function runWelcome($vars) {
+        $this->render('welcome');
+    }
+
+    /**
+     * Requirements controller
+     *
+     * Checks version of php, libraries, permissions, and rewrite rules
+     *
+     * @param array $vars Vars
+     *
+     * @return void
+     */
+    protected function runRequirements($vars) {
+
+        $report = [];
+
+        // check PHP parameters and libraries
+        $this->checkPHP($report);
+
+        // check URL rewriting
+        $this->checkRewriteRules($report);
+
+        // check for existence of settings file
+        if ($this->checkSettingsFile($report) != true) {
+            // no file, so check permissions on engine directory
+            $this->isInstallDirWritable($report);
+        }
+
+        // check the database later
+        $report['database'] = [[
+            'severity' => 'info',
+            'message' => elgg_echo('install:check:database')
+        ]];
+
+        // any failures?
+        $numFailures = $this->countNumConditions($report, 'failure');
+
+        // any warnings
+        $numWarnings = $this->countNumConditions($report, 'warning');
+
+
+        $params = [
+            'report' => $report,
+            'num_failures' => $numFailures,
+            'num_warnings' => $numWarnings,
+        ];
+
+        $this->render('requirements', $params);
+    }
+
+    /**
+     * Database set up controller
+     *
+     * Creates the settings.php file and creates the database tables
+     *
+     * @param array $submissionVars Submitted form variables
+     *
+     * @return void
+     */
+    protected function runDatabase($submissionVars) {
+
+        $formVars = [
+            'dbuser' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'dbpassword' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => false,
+                ],
+            'dbname' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'dbhost' => [
+                'type' => 'text',
+                'value' => 'localhost',
+                'required' => true,
+                ],
+            'dbprefix' => [
+                'type' => 'text',
+                'value' => 'elgg_',
+                'required' => true,
+                ],
+            'dataroot' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+            ],
+            'wwwroot' => [
+                'type' => 'url',
+                'value' => _elgg_services()->config->wwwroot,
+                'required' => true,
+            ],
+            'timezone' => [
+                'type' => 'dropdown',
+                'value' => 'UTC',
+                'options' => \DateTimeZone::listIdentifiers(),
+                'required' => true
+            ]
+        ];
+
+        if ($this->checkSettingsFile()) {
+            // user manually created settings file so we fake out action test
+            $this->is_action = true;
+        }
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                // only create settings file if it doesn't exist
+                if (!$this->checkSettingsFile()) {
+                    if (!$this->validateDatabaseVars($submissionVars, $formVars)) {
+                        // error so we break out of action and serve same page
+                        return;
+                    }
+
+                    if (!$this->createSettingsFile($submissionVars)) {
+                        return;
+                    }
+                }
+
+                // check db version and connect
+                if (!$this->connectToDatabase()) {
+                    return;
+                }
+
+                if (!$this->installDatabase()) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:database'));
+
+                $this->continueToNextStep('database');
+            });
+        }
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $params = ['variables' => $formVars,];
+
+        if ($this->checkSettingsFile()) {
+            // settings file exists and we're here so failed to create database
+            $params['failure'] = true;
+        }
+
+        $this->render('database', $params);
+    }
+
+    /**
+     * Site settings controller
+     *
+     * Sets the site name, URL, data directory, etc.
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return void
+     */
+    protected function runSettings($submissionVars) {
+        $formVars = [
+            'sitename' => [
+                'type' => 'text',
+                'value' => 'My New Community',
+                'required' => true,
+                ],
+            'siteemail' => [
+                'type' => 'email',
+                'value' => '',
+                'required' => false,
+                ],
+            'siteaccess' => [
+                'type' => 'access',
+                'value' => ACCESS_PUBLIC,
+                'required' => true,
+                ],
+        ];
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                if (!$this->validateSettingsVars($submissionVars, $formVars)) {
+                    return;
+                }
+
+                if (!$this->saveSiteSettings($submissionVars)) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:settings'));
+
+                $this->continueToNextStep('settings');
+            });
+        }
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $this->render('settings', ['variables' => $formVars]);
+    }
+
+    /**
+     * Admin account controller
+     *
+     * Creates an admin user account
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return void
+     */
+    protected function runAdmin($submissionVars) {
+        $formVars = [
+            'displayname' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'email' => [
+                'type' => 'email',
+                'value' => '',
+                'required' => true,
+                ],
+            'username' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'password1' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => true,
+                'pattern' => '.{6,}',
+                ],
+            'password2' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => true,
+                ],
+        ];
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                if (!$this->validateAdminVars($submissionVars, $formVars)) {
+                    return;
+                }
+
+                if (!$this->createAdminAccount($submissionVars, $this->autoLogin)) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:admin'));
+
+                $this->continueToNextStep('admin');
+            });
+        }
+
+        // Bit of a hack to get the password help to show right number of characters
+        // We burn the value into the stored translation.
+        $lang = $this->services->translator->getCurrentLanguage();
+        $translations = $this->services->translator->getLoadedTranslations();
+        $this->services->translator->addTranslation($lang, [
+            'install:admin:help:password1' => sprintf(
+                $translations[$lang]['install:admin:help:password1'],
+                $this->config->min_password_length
+            ),
+        ]);
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $this->render('admin', ['variables' => $formVars]);
+    }
+
+    /**
+     * Controller for last step
+     *
+     * @return void
+     */
+    protected function runComplete() {
+
+        // nudge to check out settings
+        $link = elgg_format_element([
+            '#tag_name' => 'a',
+            '#text' => elgg_echo('install:complete:admin_notice:link_text'),
+            'href' => elgg_normalize_url('admin/settings/basic'),
+        ]);
+        $notice = elgg_echo('install:complete:admin_notice', [$link]);
+        elgg_add_admin_notice('fresh_install', $notice);
+
+        $this->render('complete');
+    }
+
+    /**
+     * Step management
+     */
+
+    /**
+     * Get an array of steps
+     *
+     * @return array
+     */
+    protected function getSteps() {
+        return $this->steps;
+    }
+
+    /**
+     * Forwards the browser to the next step
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return void
+     */
+    protected function continueToNextStep($currentStep) {
+        $this->is_action = false;
+        forward($this->getNextStepUrl($currentStep));
+    }
+
+    /**
+     * Get the next step as a string
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return string
+     */
+    protected function getNextStep($currentStep) {
+        $index = 1 + array_search($currentStep, $this->steps);
+        if (isset($this->steps[$index])) {
+            return $this->steps[$index];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the URL of the next step
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return string
+     */
+    protected function getNextStepUrl($currentStep) {
+        $nextStep = $this->getNextStep($currentStep);
+        return $this->config->wwwroot . "install.php?step=$nextStep";
+    }
+
+    /**
+     * Updates $this->has_completed according to the current installation
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function determineInstallStatus() {
+        $path = Paths::settingsFile();
+        if (!is_file($path) || !is_readable($path)) {
+            return;
+        }
+
+        $this->loadSettingsFile();
+
+        $this->has_completed['config'] = true;
+
+        // must be able to connect to database to jump install steps
+        $dbSettingsPass = $this->checkDatabaseSettings(
+            $this->config->dbuser,
+            $this->config->dbpass,
+            $this->config->dbname,
+            $this->config->dbhost
+        );
+
+        if (!$dbSettingsPass) {
+            return;
+        }
+
+        $db = $this->services->db;
+
+        // check that the config table has been created
+        $result = $db->getData("SHOW TABLES");
+        if ($result) {
+            foreach ($result as $table) {
+                $table = (array) $table;
+                if (in_array("{$db->prefix}config", $table)) {
+                    $this->has_completed['database'] = true;
+                }
+            }
+            if ($this->has_completed['database'] == false) {
+                return;
+            }
+        } else {
+            // no tables
+            return;
+        }
+
+        // check that the config table has entries
+        $query = "SELECT COUNT(*) AS total FROM {$db->prefix}config";
+        $result = $db->getData($query);
+        if ($result && $result[0]->total > 0) {
+            $this->has_completed['settings'] = true;
+        } else {
+            return;
+        }
+
+        // check that the users entity table has an entry
+        $query = "SELECT COUNT(*) AS total FROM {$db->prefix}users_entity";
+        $result = $db->getData($query);
+        if ($result && $result[0]->total > 0) {
+            $this->has_completed['admin'] = true;
+        } else {
+            return;
+        }
+    }
+
+    /**
+     * Security check to ensure the installer cannot be run after installation
+     * has finished. If this is detected, the viewer is sent to the front page.
+     *
+     * @param string $step Installation step to check against
+     *
+     * @return void
+     */
+    protected function checkInstallCompletion($step) {
+        if ($step != 'complete') {
+            if (!in_array(false, $this->has_completed)) {
+                // install complete but someone is trying to view an install page
+                forward();
+            }
+        }
+    }
+
+    /**
+     * Check if this is a case of a install being resumed and figure
+     * out where to continue from. Returns the best guess on the step.
+     *
+     * @param string $step Installation step to resume from
+     *
+     * @return string
+     */
+    protected function resumeInstall($step) {
+        // only do a resume from the first step
+        if ($step !== 'welcome') {
+            return;
+        }
+
+        if ($this->has_completed['database'] == false) {
+            return;
+        }
+
+        if ($this->has_completed['settings'] == false) {
+            forward("install.php?step=settings");
+        }
+
+        if ($this->has_completed['admin'] == false) {
+            forward("install.php?step=admin");
+        }
+
+        // everything appears to be set up
+        forward("install.php?step=complete");
+    }
+
+    /**
+     * Bootstrapping
+     */
+
+    /**
+     * Load remaining engine libraries and complete bootstrapping
+     *
+     * @param string $step Which step to boot strap for. Required because
+     *                     boot strapping is different until the DB is populated.
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function finishBootstrapping($step) {
+
+        $index_db = array_search('database', $this->getSteps());
+        $index_settings = array_search('settings', $this->getSteps());
+        $index_admin = array_search('admin', $this->getSteps());
+        $index_complete = array_search('complete', $this->getSteps());
+        $index_step = array_search($step, $this->getSteps());
+
+        // To log in the user, we need to use the Elgg core session handling.
+        // Otherwise, use default php session handling
+        $use_elgg_session = ($index_step == $index_admin && $this->is_action) || ($index_step == $index_complete);
+        if (!$use_elgg_session) {
+            $session = ElggSession::fromFiles($this->config);
+            $session->setName('Elgg_install');
+            $this->services->setValue('session', $session);
+        }
+
+        if ($index_step > $index_db) {
+            // once the database has been created, load rest of engine
+
+            // dummy site needed to boot
+            $this->config->site = new ElggSite();
+
+            $this->app->bootCore();
+        }
+    }
+
+    /**
+     * Load settings
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function loadSettingsFile() {
+        try {
+            $config = Config::fromFile(Paths::settingsFile());
+            $this->config->mergeValues($config->getValues());
+
+            // in case the DB instance is already captured in services, we re-inject its settings.
+            $this->services->db->resetConnections(DbConfig::fromElggConfig($this->config));
+        } catch (\Exception $e) {
+            $msg = elgg_echo('InstallationException:CannotLoadSettings');
+            throw new InstallationException($msg, 0, $e);
+        }
+    }
+
+    /**
+     * Action handling methods
+     */
+
+    /**
+     * If form is reshown, remember previously submitted variables
+     *
+     * @param array $formVars       Vars int he form
+     * @param array $submissionVars Submitted vars
+     *
+     * @return array
+     */
+    protected function makeFormSticky($formVars, $submissionVars) {
+        foreach ($submissionVars as $field => $value) {
+            $formVars[$field]['value'] = $value;
+        }
+        return $formVars;
+    }
+
+    /* Requirement checks support methods */
+
+    /**
+     * Indicates whether the webserver can add settings.php on its own or not.
+     *
+     * @param array $report The requirements report object
+     *
+     * @return bool
+     */
+    protected function isInstallDirWritable(&$report) {
+        if (!is_writable(Paths::projectConfig())) {
+            $msg = elgg_echo('install:check:installdir', [Paths::PATH_TO_CONFIG]);
+            $report['settings'] = [
+                [
+                    'severity' => 'failure',
+                    'message' => $msg,
+                ]
+            ];
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check that the settings file exists
+     *
+     * @param array $report The requirements report array
+     *
+     * @return bool
+     */
+    protected function checkSettingsFile(&$report = []) {
+        if (!is_file(Paths::settingsFile())) {
+            return false;
+        }
+
+        if (!is_readable(Paths::settingsFile())) {
+            $report['settings'] = [
+                [
+                    'severity' => 'failure',
+                    'message' => elgg_echo('install:check:readsettings'),
+                ]
+            ];
+        }
 		
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Check version of PHP, extensions, and variables
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPHP(&$report) {
-		$phpReport = [];
-
-		$min_php_version = '5.6.0';
-		if (version_compare(PHP_VERSION, $min_php_version, '<')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo('install:check:php:version', [$min_php_version, PHP_VERSION])
-			];
-		}
-
-		$this->checkPhpExtensions($phpReport);
-
-		$this->checkPhpDirectives($phpReport);
-
-		if (count($phpReport) == 0) {
-			$phpReport[] = [
-				'severity' => 'pass',
-				'message' => elgg_echo('install:check:php:success')
-			];
-		}
-
-		$report['php'] = $phpReport;
-	}
-
-	/**
-	 * Check the server's PHP extensions
-	 *
-	 * @param array $phpReport The PHP requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPhpExtensions(&$phpReport) {
-		$extensions = get_loaded_extensions();
-		$requiredExtensions = [
-			'pdo_mysql',
-			'json',
-			'xml',
-			'gd',
-		];
-		foreach ($requiredExtensions as $extension) {
-			if (!in_array($extension, $extensions)) {
-				$phpReport[] = [
-					'severity' => 'failure',
-					'message' => elgg_echo('install:check:php:extension', [$extension])
-				];
-			}
-		}
-
-		$recommendedExtensions = [
-			'mbstring',
-		];
-		foreach ($recommendedExtensions as $extension) {
-			if (!in_array($extension, $extensions)) {
-				$phpReport[] = [
-					'severity' => 'warning',
-					'message' => elgg_echo('install:check:php:extension:recommend', [$extension])
-				];
-			}
-		}
-	}
-
-	/**
-	 * Check PHP parameters
-	 *
-	 * @param array $phpReport The PHP requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPhpDirectives(&$phpReport) {
-		if (ini_get('open_basedir')) {
-			$phpReport[] = [
-				'severity' => 'warning',
-				'message' => elgg_echo("install:check:php:open_basedir")
-			];
-		}
-
-		if (ini_get('safe_mode')) {
-			$phpReport[] = [
-				'severity' => 'warning',
-				'message' => elgg_echo("install:check:php:safe_mode")
-			];
-		}
-
-		if (ini_get('arg_separator.output') !== '&') {
-			$separator = htmlspecialchars(ini_get('arg_separator.output'));
-			$msg = elgg_echo("install:check:php:arg_separator", [$separator]);
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => $msg,
-			];
-		}
-
-		if (ini_get('register_globals')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo("install:check:php:register_globals")
-			];
-		}
-
-		if (ini_get('session.auto_start')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo("install:check:php:session.auto_start")
-			];
-		}
-	}
-
-	/**
-	 * Confirm that the rewrite rules are firing
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkRewriteRules(&$report) {
-		$tester = new ElggRewriteTester();
-		$url = $this->config->wwwroot;
-		$url .= Request::REWRITE_TEST_TOKEN . '?' . http_build_query([
-				Request::REWRITE_TEST_TOKEN => '1',
-		]);
-		$report['rewrite'] = [$tester->run($url, Paths::project())];
-	}
-
-	/**
-	 * Count the number of failures in the requirements report
-	 *
-	 * @param array  $report    The requirements report array
-	 * @param string $condition 'failure' or 'warning'
-	 *
-	 * @return int
-	 */
-	protected function countNumConditions($report, $condition) {
-		$count = 0;
-		foreach ($report as $category => $checks) {
-			foreach ($checks as $check) {
-				if ($check['severity'] === $condition) {
-					$count++;
-				}
-			}
-		}
-
-		return $count;
-	}
-
-
-	/**
-	 * Database support methods
-	 */
-
-	/**
-	 * Validate the variables for the database step
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Vars in the form
-	 *
-	 * @return bool
-	 */
-	protected function validateDatabaseVars($submissionVars, $formVars) {
-
-		foreach ($formVars as $field => $info) {
-			if ($info['required'] == true && !$submissionVars[$field]) {
-				$name = elgg_echo("install:database:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		// check that data root is absolute path
-		if (stripos(PHP_OS, 'win') === 0) {
-			if (strpos($submissionVars['dataroot'], ':') !== 1) {
-				$msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		} else {
-			if (strpos($submissionVars['dataroot'], '/') !== 0) {
-				$msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		}
-
-		// check that data root exists
-		if (!is_dir($submissionVars['dataroot'])) {
-			$msg = elgg_echo('install:error:datadirectoryexists', [$submissionVars['dataroot']]);
-			register_error($msg);
-			return false;
-		}
-
-		// check that data root is writable
-		if (!is_writable($submissionVars['dataroot'])) {
-			$msg = elgg_echo('install:error:writedatadirectory', [$submissionVars['dataroot']]);
-			register_error($msg);
-			return false;
-		}
-
-		if (!$this->config->data_dir_override) {
-			// check that data root is not subdirectory of Elgg root
-			if (stripos($submissionVars['dataroot'], $this->config->path) === 0) {
-				$msg = elgg_echo('install:error:locationdatadirectory', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		}
-
-		// according to postgres documentation: SQL identifiers and key words must
-		// begin with a letter (a-z, but also letters with diacritical marks and
-		// non-Latin letters) or an underscore (_). Subsequent characters in an
-		// identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($).
-		// Refs #4994
-		if (!preg_match("/^[a-zA-Z_][\w]*$/", $submissionVars['dbprefix'])) {
-			register_error(elgg_echo('install:error:database_prefix'));
-			return false;
-		}
-
-		return $this->checkDatabaseSettings(
-			$submissionVars['dbuser'],
-			$submissionVars['dbpassword'],
-			$submissionVars['dbname'],
-			$submissionVars['dbhost']
-		);
-	}
-
-	/**
-	 * Confirm the settings for the database
-	 *
-	 * @param string $user     Username
-	 * @param string $password Password
-	 * @param string $dbname   Database name
-	 * @param string $host     Host
-	 *
-	 * @return bool
-	 */
-	protected function checkDatabaseSettings($user, $password, $dbname, $host) {
-		$config = new DbConfig((object) [
-			'dbhost' => $host,
-			'dbuser' => $user,
-			'dbpass' => $password,
-			'dbname' => $dbname,
-			'dbencoding' => 'utf8mb4',
-		]);
-		$db = new \Elgg\Database($config);
-
-		try {
-			$db->getDataRow("SELECT 1");
-		} catch (DatabaseException $e) {
-			if (0 === strpos($e->getMessage(), "Elgg couldn't connect")) {
-				register_error(elgg_echo('install:error:databasesettings'));
-			} else {
-				register_error(elgg_echo('install:error:nodatabase', [$dbname]));
-			}
-			return false;
-		}
-
-		// check MySQL version
-		$version = $db->getServerVersion(DbConfig::READ_WRITE);
-		if (version_compare($version, '5.5.3', '<')) {
-			register_error(elgg_echo('install:error:oldmysql2', [$version]));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Writes the settings file to the engine directory
-	 *
-	 * @param array $params Array of inputted params from the user
-	 *
-	 * @return bool
-	 */
-	protected function createSettingsFile($params) {
-		$template = Application::elggDir()->getContents("elgg-config/settings.example.php");
-		if (!$template) {
-			register_error(elgg_echo('install:error:readsettingsphp'));
-			return false;
-		}
-
-		foreach ($params as $k => $v) {
-			$template = str_replace("{{" . $k . "}}", $v, $template);
-		}
-
-		$result = file_put_contents(Paths::settingsFile(), $template);
-		if (!$result) {
-			register_error(elgg_echo('install:error:writesettingphp'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Bootstrap database connection before entire engine is available
-	 *
-	 * @return bool
-	 */
-	protected function connectToDatabase() {
-		try {
-			$this->services->db->setupConnections();
-		} catch (DatabaseException $e) {
-			register_error($e->getMessage());
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Create the database tables
-	 *
-	 * @return bool
-	 */
-	protected function installDatabase() {
-		$ret = \Elgg\Application::migrate();
-		if ($ret) {
-			init_site_secret();
-		}
-		return $ret;
-	}
-
-	/**
-	 * Site settings support methods
-	 */
-
-	/**
-	 * Create the data directory if requested
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Variables in the form
-	 *
-	 * @return bool
-	 */
-	protected function createDataDirectory(&$submissionVars, $formVars) {
-		// did the user have option of Elgg creating the data directory
-		if ($formVars['dataroot']['type'] != 'combo') {
-			return true;
-		}
-
-		// did the user select the option
-		if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
-			return true;
-		}
-
-		$dir = sanitise_filepath($submissionVars['path']) . 'data';
-		if (file_exists($dir) || mkdir($dir, 0700)) {
-			$submissionVars['dataroot'] = $dir;
-			if (!file_exists("$dir/.htaccess")) {
-				$htaccess = "Order Deny,Allow\nDeny from All\n";
-				if (!file_put_contents("$dir/.htaccess", $htaccess)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Validate the site settings form variables
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Vars in the form
-	 *
-	 * @return bool
-	 */
-	protected function validateSettingsVars($submissionVars, $formVars) {
-		foreach ($formVars as $field => $info) {
-			$submissionVars[$field] = trim($submissionVars[$field]);
-			if ($info['required'] == true && $submissionVars[$field] === '') {
-				$name = elgg_echo("install:settings:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		// check that email address is email address
-		if ($submissionVars['siteemail'] && !is_email_address($submissionVars['siteemail'])) {
-			$msg = elgg_echo('install:error:emailaddress', [$submissionVars['siteemail']]);
-			register_error($msg);
-			return false;
-		}
-
-		// @todo check that url is a url
-		// @note filter_var cannot be used because it doesn't work on international urls
-
-		return true;
-	}
-
-	/**
-	 * Initialize the site including site entity, plugins, and configuration
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return bool
-	 */
-	protected function saveSiteSettings($submissionVars) {
-		$site = new ElggSite();
-		$site->name = strip_tags($submissionVars['sitename']);
-		$site->access_id = ACCESS_PUBLIC;
-		$site->email = $submissionVars['siteemail'];
-
-		$guid = $site->save();
-		if ($guid !== 1) {
-			register_error(elgg_echo('install:error:createsite'));
-			return false;
-		}
-
-		$this->config->site = $site;
-
-		// new installations have run all the upgrades
-		$upgrades = elgg_get_upgrade_files(Paths::elgg() . "engine/lib/upgrades/");
-
-		$sets = [
-			'installed' => time(),
-			'version' => elgg_get_version(),
-			'simplecache_enabled' => 1,
-			'system_cache_enabled' => 1,
-			'simplecache_lastupdate' => time(),
-			'processed_upgrades' => $upgrades,
-			'language' => 'en',
-			'default_access' => $submissionVars['siteaccess'],
-			'allow_registration' => false,
-			'walled_garden' => false,
-			'allow_user_default_access' => '',
-			'default_limit' => 10,
-			'security_protect_upgrade' => true,
-			'security_notify_admins' => true,
-			'security_notify_user_password' => true,
-			'security_email_require_password' => true,
-		];
-		foreach ($sets as $key => $value) {
-			elgg_save_config($key, $value);
-		}
-
-		// Enable a set of default plugins
-		_elgg_generate_plugin_entities();
-
-		foreach (elgg_get_plugins('any') as $plugin) {
-			if ($plugin->getManifest()) {
-				if ($plugin->getManifest()->getActivateOnInstall()) {
-					$plugin->activate();
-				}
-				if (in_array('theme', $plugin->getManifest()->getCategories())) {
-					$plugin->setPriority('last');
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Admin account support methods
-	 */
-
-	/**
-	 * Validate account form variables
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Form vars
-	 *
-	 * @return bool
-	 */
-	protected function validateAdminVars($submissionVars, $formVars) {
-
-		foreach ($formVars as $field => $info) {
-			if ($info['required'] == true && !$submissionVars[$field]) {
-				$name = elgg_echo("install:admin:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		if ($submissionVars['password1'] !== $submissionVars['password2']) {
-			register_error(elgg_echo('install:admin:password:mismatch'));
-			return false;
-		}
-
-		if (trim($submissionVars['password1']) == "") {
-			register_error(elgg_echo('install:admin:password:empty'));
-			return false;
-		}
-
-		$minLength = $this->services->configTable->get('min_password_length');
-		if (strlen($submissionVars['password1']) < $minLength) {
-			register_error(elgg_echo('install:admin:password:tooshort'));
-			return false;
-		}
-
-		// check that email address is email address
-		if ($submissionVars['email'] && !is_email_address($submissionVars['email'])) {
-			$msg = elgg_echo('install:error:emailaddress', [$submissionVars['email']]);
-			register_error($msg);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Create a user account for the admin
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param bool  $login          Login in the admin user?
-	 *
-	 * @return bool
-	 */
-	protected function createAdminAccount($submissionVars, $login = false) {
-		try {
-			$guid = register_user(
-				$submissionVars['username'],
-				$submissionVars['password1'],
-				$submissionVars['displayname'],
-				$submissionVars['email']
-			);
-		} catch (Exception $e) {
-			register_error($e->getMessage());
-			return false;
-		}
-
-		if (!$guid) {
-			register_error(elgg_echo('install:admin:cannot_create'));
-			return false;
-		}
-
-		$user = get_entity($guid);
-		if (!$user instanceof ElggUser) {
-			register_error(elgg_echo('install:error:loadadmin'));
-			return false;
-		}
-
-		elgg_set_ignore_access(true);
-		if ($user->makeAdmin() == false) {
-			register_error(elgg_echo('install:error:adminaccess'));
-		} else {
-			$this->services->configTable->set('admin_registered', 1);
-		}
-		elgg_set_ignore_access(false);
-
-		// add validation data to satisfy user validation plugins
-		$user->validated = 1;
-		$user->validated_method = 'admin_user';
-
-		if (!$login) {
-			return true;
-		}
-
-		$session = ElggSession::fromDatabase($this->config, $this->services->db);
-		$session->start();
-		$this->services->setValue('session', $session);
-		if (login($user) == false) {
-			register_error(elgg_echo('install:error:adminlogin'));
-		}
-
-		return true;
-	}
+    /**
+     * Check version of PHP, extensions, and variables
+     *
+     * @param array $report The requirements report array
+     *
+     * @return void
+     */
+    protected function checkPHP(&$report) {
+        $phpReport = [];
+
+        $min_php_version = '5.6.0';
+        if (version_compare(PHP_VERSION, $min_php_version, '<')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo('install:check:php:version', [$min_php_version, PHP_VERSION])
+            ];
+        }
+
+        $this->checkPhpExtensions($phpReport);
+
+        $this->checkPhpDirectives($phpReport);
+
+        if (count($phpReport) == 0) {
+            $phpReport[] = [
+                'severity' => 'pass',
+                'message' => elgg_echo('install:check:php:success')
+            ];
+        }
+
+        $report['php'] = $phpReport;
+    }
+
+    /**
+     * Check the server's PHP extensions
+     *
+     * @param array $phpReport The PHP requirements report array
+     *
+     * @return void
+     */
+    protected function checkPhpExtensions(&$phpReport) {
+        $extensions = get_loaded_extensions();
+        $requiredExtensions = [
+            'pdo_mysql',
+            'json',
+            'xml',
+            'gd',
+        ];
+        foreach ($requiredExtensions as $extension) {
+            if (!in_array($extension, $extensions)) {
+                $phpReport[] = [
+                    'severity' => 'failure',
+                    'message' => elgg_echo('install:check:php:extension', [$extension])
+                ];
+            }
+        }
+
+        $recommendedExtensions = [
+            'mbstring',
+        ];
+        foreach ($recommendedExtensions as $extension) {
+            if (!in_array($extension, $extensions)) {
+                $phpReport[] = [
+                    'severity' => 'warning',
+                    'message' => elgg_echo('install:check:php:extension:recommend', [$extension])
+                ];
+            }
+        }
+    }
+
+    /**
+     * Check PHP parameters
+     *
+     * @param array $phpReport The PHP requirements report array
+     *
+     * @return void
+     */
+    protected function checkPhpDirectives(&$phpReport) {
+        if (ini_get('open_basedir')) {
+            $phpReport[] = [
+                'severity' => 'warning',
+                'message' => elgg_echo("install:check:php:open_basedir")
+            ];
+        }
+
+        if (ini_get('safe_mode')) {
+            $phpReport[] = [
+                'severity' => 'warning',
+                'message' => elgg_echo("install:check:php:safe_mode")
+            ];
+        }
+
+        if (ini_get('arg_separator.output') !== '&') {
+            $separator = htmlspecialchars(ini_get('arg_separator.output'));
+            $msg = elgg_echo("install:check:php:arg_separator", [$separator]);
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => $msg,
+            ];
+        }
+
+        if (ini_get('register_globals')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo("install:check:php:register_globals")
+            ];
+        }
+
+        if (ini_get('session.auto_start')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo("install:check:php:session.auto_start")
+            ];
+        }
+    }
+
+    /**
+     * Confirm that the rewrite rules are firing
+     *
+     * @param array $report The requirements report array
+     *
+     * @return void
+     */
+    protected function checkRewriteRules(&$report) {
+        $tester = new ElggRewriteTester();
+        $url = $this->config->wwwroot;
+        $url .= Request::REWRITE_TEST_TOKEN . '?' . http_build_query([
+                Request::REWRITE_TEST_TOKEN => '1',
+        ]);
+        $report['rewrite'] = [$tester->run($url, Paths::project())];
+    }
+
+    /**
+     * Count the number of failures in the requirements report
+     *
+     * @param array  $report    The requirements report array
+     * @param string $condition 'failure' or 'warning'
+     *
+     * @return int
+     */
+    protected function countNumConditions($report, $condition) {
+        $count = 0;
+        foreach ($report as $category => $checks) {
+            foreach ($checks as $check) {
+                if ($check['severity'] === $condition) {
+                    $count++;
+                }
+            }
+        }
+
+        return $count;
+    }
+
+
+    /**
+     * Database support methods
+     */
+
+    /**
+     * Validate the variables for the database step
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Vars in the form
+     *
+     * @return bool
+     */
+    protected function validateDatabaseVars($submissionVars, $formVars) {
+
+        foreach ($formVars as $field => $info) {
+            if ($info['required'] == true && !$submissionVars[$field]) {
+                $name = elgg_echo("install:database:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        // check that data root is absolute path
+        if (stripos(PHP_OS, 'win') === 0) {
+            if (strpos($submissionVars['dataroot'], ':') !== 1) {
+                $msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        } else {
+            if (strpos($submissionVars['dataroot'], '/') !== 0) {
+                $msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        }
+
+        // check that data root exists
+        if (!is_dir($submissionVars['dataroot'])) {
+            $msg = elgg_echo('install:error:datadirectoryexists', [$submissionVars['dataroot']]);
+            register_error($msg);
+            return false;
+        }
+
+        // check that data root is writable
+        if (!is_writable($submissionVars['dataroot'])) {
+            $msg = elgg_echo('install:error:writedatadirectory', [$submissionVars['dataroot']]);
+            register_error($msg);
+            return false;
+        }
+
+        if (!$this->config->data_dir_override) {
+            // check that data root is not subdirectory of Elgg root
+            if (stripos($submissionVars['dataroot'], $this->config->path) === 0) {
+                $msg = elgg_echo('install:error:locationdatadirectory', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        }
+
+        // according to postgres documentation: SQL identifiers and key words must
+        // begin with a letter (a-z, but also letters with diacritical marks and
+        // non-Latin letters) or an underscore (_). Subsequent characters in an
+        // identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($).
+        // Refs #4994
+        if (!preg_match("/^[a-zA-Z_][\w]*$/", $submissionVars['dbprefix'])) {
+            register_error(elgg_echo('install:error:database_prefix'));
+            return false;
+        }
+
+        return $this->checkDatabaseSettings(
+            $submissionVars['dbuser'],
+            $submissionVars['dbpassword'],
+            $submissionVars['dbname'],
+            $submissionVars['dbhost']
+        );
+    }
+
+    /**
+     * Confirm the settings for the database
+     *
+     * @param string $user     Username
+     * @param string $password Password
+     * @param string $dbname   Database name
+     * @param string $host     Host
+     *
+     * @return bool
+     */
+    protected function checkDatabaseSettings($user, $password, $dbname, $host) {
+        $config = new DbConfig((object) [
+            'dbhost' => $host,
+            'dbuser' => $user,
+            'dbpass' => $password,
+            'dbname' => $dbname,
+            'dbencoding' => 'utf8mb4',
+        ]);
+        $db = new \Elgg\Database($config);
+
+        try {
+            $db->getDataRow("SELECT 1");
+        } catch (DatabaseException $e) {
+            if (0 === strpos($e->getMessage(), "Elgg couldn't connect")) {
+                register_error(elgg_echo('install:error:databasesettings'));
+            } else {
+                register_error(elgg_echo('install:error:nodatabase', [$dbname]));
+            }
+            return false;
+        }
+
+        // check MySQL version
+        $version = $db->getServerVersion(DbConfig::READ_WRITE);
+        if (version_compare($version, '5.5.3', '<')) {
+            register_error(elgg_echo('install:error:oldmysql2', [$version]));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Writes the settings file to the engine directory
+     *
+     * @param array $params Array of inputted params from the user
+     *
+     * @return bool
+     */
+    protected function createSettingsFile($params) {
+        $template = Application::elggDir()->getContents("elgg-config/settings.example.php");
+        if (!$template) {
+            register_error(elgg_echo('install:error:readsettingsphp'));
+            return false;
+        }
+
+        foreach ($params as $k => $v) {
+            $template = str_replace("{{" . $k . "}}", $v, $template);
+        }
+
+        $result = file_put_contents(Paths::settingsFile(), $template);
+        if (!$result) {
+            register_error(elgg_echo('install:error:writesettingphp'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Bootstrap database connection before entire engine is available
+     *
+     * @return bool
+     */
+    protected function connectToDatabase() {
+        try {
+            $this->services->db->setupConnections();
+        } catch (DatabaseException $e) {
+            register_error($e->getMessage());
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create the database tables
+     *
+     * @return bool
+     */
+    protected function installDatabase() {
+        $ret = \Elgg\Application::migrate();
+        if ($ret) {
+            init_site_secret();
+        }
+        return $ret;
+    }
+
+    /**
+     * Site settings support methods
+     */
+
+    /**
+     * Create the data directory if requested
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Variables in the form
+     *
+     * @return bool
+     */
+    protected function createDataDirectory(&$submissionVars, $formVars) {
+        // did the user have option of Elgg creating the data directory
+        if ($formVars['dataroot']['type'] != 'combo') {
+            return true;
+        }
+
+        // did the user select the option
+        if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
+            return true;
+        }
+
+        $dir = sanitise_filepath($submissionVars['path']) . 'data';
+        if (file_exists($dir) || mkdir($dir, 0700)) {
+            $submissionVars['dataroot'] = $dir;
+            if (!file_exists("$dir/.htaccess")) {
+                $htaccess = "Order Deny,Allow\nDeny from All\n";
+                if (!file_put_contents("$dir/.htaccess", $htaccess)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Validate the site settings form variables
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Vars in the form
+     *
+     * @return bool
+     */
+    protected function validateSettingsVars($submissionVars, $formVars) {
+        foreach ($formVars as $field => $info) {
+            $submissionVars[$field] = trim($submissionVars[$field]);
+            if ($info['required'] == true && $submissionVars[$field] === '') {
+                $name = elgg_echo("install:settings:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        // check that email address is email address
+        if ($submissionVars['siteemail'] && !is_email_address($submissionVars['siteemail'])) {
+            $msg = elgg_echo('install:error:emailaddress', [$submissionVars['siteemail']]);
+            register_error($msg);
+            return false;
+        }
+
+        // @todo check that url is a url
+        // @note filter_var cannot be used because it doesn't work on international urls
+
+        return true;
+    }
+
+    /**
+     * Initialize the site including site entity, plugins, and configuration
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return bool
+     */
+    protected function saveSiteSettings($submissionVars) {
+        $site = new ElggSite();
+        $site->name = strip_tags($submissionVars['sitename']);
+        $site->access_id = ACCESS_PUBLIC;
+        $site->email = $submissionVars['siteemail'];
+
+        $guid = $site->save();
+        if ($guid !== 1) {
+            register_error(elgg_echo('install:error:createsite'));
+            return false;
+        }
+
+        $this->config->site = $site;
+
+        // new installations have run all the upgrades
+        $upgrades = elgg_get_upgrade_files(Paths::elgg() . "engine/lib/upgrades/");
+
+        $sets = [
+            'installed' => time(),
+            'version' => elgg_get_version(),
+            'simplecache_enabled' => 1,
+            'system_cache_enabled' => 1,
+            'simplecache_lastupdate' => time(),
+            'processed_upgrades' => $upgrades,
+            'language' => 'en',
+            'default_access' => $submissionVars['siteaccess'],
+            'allow_registration' => false,
+            'walled_garden' => false,
+            'allow_user_default_access' => '',
+            'default_limit' => 10,
+            'security_protect_upgrade' => true,
+            'security_notify_admins' => true,
+            'security_notify_user_password' => true,
+            'security_email_require_password' => true,
+        ];
+        foreach ($sets as $key => $value) {
+            elgg_save_config($key, $value);
+        }
+
+        // Enable a set of default plugins
+        _elgg_generate_plugin_entities();
+
+        foreach (elgg_get_plugins('any') as $plugin) {
+            if ($plugin->getManifest()) {
+                if ($plugin->getManifest()->getActivateOnInstall()) {
+                    $plugin->activate();
+                }
+                if (in_array('theme', $plugin->getManifest()->getCategories())) {
+                    $plugin->setPriority('last');
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Admin account support methods
+     */
+
+    /**
+     * Validate account form variables
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Form vars
+     *
+     * @return bool
+     */
+    protected function validateAdminVars($submissionVars, $formVars) {
+
+        foreach ($formVars as $field => $info) {
+            if ($info['required'] == true && !$submissionVars[$field]) {
+                $name = elgg_echo("install:admin:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        if ($submissionVars['password1'] !== $submissionVars['password2']) {
+            register_error(elgg_echo('install:admin:password:mismatch'));
+            return false;
+        }
+
+        if (trim($submissionVars['password1']) == "") {
+            register_error(elgg_echo('install:admin:password:empty'));
+            return false;
+        }
+
+        $minLength = $this->services->configTable->get('min_password_length');
+        if (strlen($submissionVars['password1']) < $minLength) {
+            register_error(elgg_echo('install:admin:password:tooshort'));
+            return false;
+        }
+
+        // check that email address is email address
+        if ($submissionVars['email'] && !is_email_address($submissionVars['email'])) {
+            $msg = elgg_echo('install:error:emailaddress', [$submissionVars['email']]);
+            register_error($msg);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a user account for the admin
+     *
+     * @param array $submissionVars Submitted vars
+     * @param bool  $login          Login in the admin user?
+     *
+     * @return bool
+     */
+    protected function createAdminAccount($submissionVars, $login = false) {
+        try {
+            $guid = register_user(
+                $submissionVars['username'],
+                $submissionVars['password1'],
+                $submissionVars['displayname'],
+                $submissionVars['email']
+            );
+        } catch (Exception $e) {
+            register_error($e->getMessage());
+            return false;
+        }
+
+        if (!$guid) {
+            register_error(elgg_echo('install:admin:cannot_create'));
+            return false;
+        }
+
+        $user = get_entity($guid);
+        if (!$user instanceof ElggUser) {
+            register_error(elgg_echo('install:error:loadadmin'));
+            return false;
+        }
+
+        elgg_set_ignore_access(true);
+        if ($user->makeAdmin() == false) {
+            register_error(elgg_echo('install:error:adminaccess'));
+        } else {
+            $this->services->configTable->set('admin_registered', 1);
+        }
+        elgg_set_ignore_access(false);
+
+        // add validation data to satisfy user validation plugins
+        $user->validated = 1;
+        $user->validated_method = 'admin_user';
+
+        if (!$login) {
+            return true;
+        }
+
+        $session = ElggSession::fromDatabase($this->config, $this->services->db);
+        $session->start();
+        $this->services->setValue('session', $session);
+        if (login($user) == false) {
+            register_error(elgg_echo('install:error:adminlogin'));
+        }
+
+        return true;
+    }
 }

engine/classes/Elgg/Application.php

Doc Comments +3 added lines, -3 removed lines

@@ -457,7 +457,7 @@ 
 	/**
 	 * Elgg's front controller. Handles basically all incoming URL requests.
 	 *
-	 * @return bool True if Elgg will handle the request, false if the server should (PHP-CLI server)
+	 * @return boolean|null True if Elgg will handle the request, false if the server should (PHP-CLI server)
 	 */
 	public static function index() {
 		$req = Request::createFromGlobals();
@@ -474,7 +474,7 @@ 
 	/**
 	 * Routes the request, booting core if not yet booted
 	 *
-	 * @return bool False if Elgg wants the PHP CLI server to handle the request
+	 * @return boolean|null False if Elgg wants the PHP CLI server to handle the request
 	 */
 	public function run() {
 		$config = $this->_services->config;
@@ -852,7 +852,7 @@ 
 	 * @param int    $linenum  The line number the error was raised at
 	 * @param array  $vars     An array that points to the active symbol table where error occurred
 	 *
-	 * @return true
+	 * @return boolean
 	 * @throws \Exception
 	 * @access private
 	 */

Spacing +24 added lines, -24 removed lines

@@ -95,13 +95,13 @@ 
 		}
 
 		if ($config->elgg_config_locks) {
-			$lock = function ($name) use ($config) {
+			$lock = function($name) use ($config) {
 				$config->lock($name);
 			};
 		} else {
 			// the installer needs to build an application with defaults then update
 			// them after they're validated, so we don't want to lock them.
-			$lock = function () {
+			$lock = function() {
 			};
 		}
 
@@ -113,7 +113,7 @@ 
 		}
 
 		if ($config->dataroot) {
-			$config->dataroot = rtrim($config->dataroot, '\\/') . DIRECTORY_SEPARATOR;
+			$config->dataroot = rtrim($config->dataroot, '\\/').DIRECTORY_SEPARATOR;
 		} else {
 			if (!$config->installer_running) {
 				throw new ConfigurationException('Config value "dataroot" is required.');
@@ -122,14 +122,14 @@ 
 		$lock('dataroot');
 
 		if ($config->cacheroot) {
-			$config->cacheroot = rtrim($config->cacheroot, '\\/') . DIRECTORY_SEPARATOR;
+			$config->cacheroot = rtrim($config->cacheroot, '\\/').DIRECTORY_SEPARATOR;
 		} else {
 			$config->cacheroot = $config->dataroot;
 		}
 		$lock('cacheroot');
 
 		if ($config->wwwroot) {
-			$config->wwwroot = rtrim($config->wwwroot, '/') . '/';
+			$config->wwwroot = rtrim($config->wwwroot, '/').'/';
 		} else {
 			$config->wwwroot = $this->_services->request->sniffElggUrl();
 		}
@@ -148,8 +148,8 @@ 
 		$locked_props = [
 			'site_guid' => 1,
 			'path' => Paths::project(),
-			'plugins_path' => Paths::project() . "mod/",
-			'pluginspath' => Paths::project() . "mod/",
+			'plugins_path' => Paths::project()."mod/",
+			'pluginspath' => Paths::project()."mod/",
 			'url' => $config->wwwroot,
 		];
 		foreach ($locked_props as $name => $value) {
@@ -199,7 +199,7 @@ 
 		}
 
 		$setups = [];
-		$path = Paths::elgg() . 'engine/lib';
+		$path = Paths::elgg().'engine/lib';
 
 		// include library files, capturing setup functions
 		foreach (self::getEngineLibs() as $file) {
@@ -261,7 +261,7 @@ 
 		$config = $this->_services->config;
 
 		if ($this->isTestingApplication()) {
-			throw new \RuntimeException('Unit tests should not call ' . __METHOD__);
+			throw new \RuntimeException('Unit tests should not call '.__METHOD__);
 		}
 
 		if ($config->boot_complete) {
@@ -300,7 +300,7 @@ 
 			// as a custom plugin that is always loaded last and can't be disabled...
 			if (!$config->system_cache_loaded) {
 				// configure view locations for the custom plugin (not Elgg core)
-				$viewsFile = Paths::project() . 'views.php';
+				$viewsFile = Paths::project().'views.php';
 				if (is_file($viewsFile)) {
 					$viewsSpec = Includer::includeFile($viewsFile);
 					if (is_array($viewsSpec)) {
@@ -317,7 +317,7 @@ 
 			}
 
 			// This is root directory start.php
-			$root_start = Paths::project() . "start.php";
+			$root_start = Paths::project()."start.php";
 			if (is_file($root_start)) {
 				require $root_start;
 			}
@@ -367,7 +367,7 @@ 
 		if (isset(self::$public_services[$name])) {
 			return $this->_services->{$name};
 		}
-		trigger_error("Undefined property: " . __CLASS__ . ":\${$name}");
+		trigger_error("Undefined property: ".__CLASS__.":\${$name}");
 	}
 
 	/**
@@ -418,7 +418,7 @@ 
 			if ($spec['request'] instanceof Request) {
 				$spec['service_provider']->setValue('request', $spec['request']);
 			} else {
-				throw new \InvalidArgumentException("Given request is not a " . Request::class);
+				throw new \InvalidArgumentException("Given request is not a ".Request::class);
 			}
 		}
 
@@ -432,7 +432,7 @@ 
 		if ($spec['handle_shutdown']) {
 			// we need to register for shutdown before Symfony registers the
 			// session_write_close() function. https://github.com/Elgg/Elgg/issues/9243
-			register_shutdown_function(function () {
+			register_shutdown_function(function() {
 				// There are cases where we may exit before this function is defined
 				if (function_exists('_elgg_shutdown_hook')) {
 					_elgg_shutdown_hook();
@@ -486,7 +486,7 @@ 
 			}
 
 			// overwrite value from settings
-			$www_root = rtrim($request->getSchemeAndHttpHost() . $request->getBaseUrl(), '/') . '/';
+			$www_root = rtrim($request->getSchemeAndHttpHost().$request->getBaseUrl(), '/').'/';
 			$config->wwwroot = $www_root;
 			$config->wwwroot_cli_server = $www_root;
 		}
@@ -564,9 +564,9 @@ 
 		ini_set('display_errors', 1);
 		$is_cli = (php_sapi_name() === 'cli');
 
-		$forward = function ($url) use ($is_cli) {
+		$forward = function($url) use ($is_cli) {
 			if ($is_cli) {
-				fwrite(STDOUT, "Open $url in your browser to continue." . PHP_EOL);
+				fwrite(STDOUT, "Open $url in your browser to continue.".PHP_EOL);
 				return;
 			}
 
@@ -585,14 +585,14 @@ 
 		}
 
 		$site_url = _elgg_config()->url;
-		$site_host = parse_url($site_url, PHP_URL_HOST) . '/';
+		$site_host = parse_url($site_url, PHP_URL_HOST).'/';
 
 		// turn any full in-site URLs into absolute paths
 		$forward_url = get_input('forward', '/admin', false);
 		$forward_url = str_replace([$site_url, $site_host], '/', $forward_url);
 
 		if (strpos($forward_url, '/') !== 0) {
-			$forward_url = '/' . $forward_url;
+			$forward_url = '/'.$forward_url;
 		}
 
 		if ($is_cli || (get_input('upgrade') == 'upgrade')) {
@@ -614,7 +614,7 @@ 
 			}
 		} else {
 			$rewriteTester = new \ElggRewriteTester();
-			$url = elgg_get_site_url() . "__testing_rewrite?__testing_rewrite=1";
+			$url = elgg_get_site_url()."__testing_rewrite?__testing_rewrite=1";
 			if (!$rewriteTester->runRewriteTest($url)) {
 				// see if there is a problem accessing the site at all
 				// due to ip restrictions for example
@@ -691,7 +691,7 @@ 
 
 		return [
 			"paths" => [
-				"migrations" => Paths::elgg() . 'engine/schema/migrations/',
+				"migrations" => Paths::elgg().'engine/schema/migrations/',
 			],
 			"environments" => [
 				"default_migration_table" => "{$conn['prefix']}migrations",
@@ -857,9 +857,9 @@ 
 	 * @access private
 	 */
 	public function handleErrors($errno, $errmsg, $filename, $linenum, $vars) {
-		$error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)";
+		$error = date("Y-m-d H:i:s (T)").": \"$errmsg\" in file $filename (line $linenum)";
 
-		$log = function ($message, $level) {
+		$log = function($message, $level) {
 			if (self::isCoreLoaded()) {
 				return elgg_log($message, $level);
 			}
@@ -915,7 +915,7 @@ 
 	 * @deprecated
 	 */
 	public function loadSettings() {
-		trigger_error(__METHOD__ . ' is no longer needed and will be removed.');
+		trigger_error(__METHOD__.' is no longer needed and will be removed.');
 	}
 
 	/**

Indentation +941 added lines, -941 removed lines

@@ -28,945 +28,945 @@
  */
 class Application {
 
-	const DEFAULT_LANG = 'en';
-	const DEFAULT_LIMIT = 10;
-
-	/**
-	 * @var ServiceProvider
-	 *
-	 * @internal DO NOT USE
-	 */
-	public $_services;
-
-	/**
-	 * @var bool
-	 */
-	private static $testing_app;
-
-	/**
-	 * Property names of the service provider to be exposed via __get()
-	 *
-	 * E.g. the presence of `'foo' => true` in the list would allow _elgg_services()->foo to
-	 * be accessed via elgg()->foo.
-	 *
-	 * @var string[]
-	 */
-	private static $public_services = [
-		//'config' => true,
-		'menus' => true,
-		'table_columns' => true,
-	];
-
-	/**
-	 * Reference to the loaded Application returned by elgg()
-	 *
-	 * @internal Do not use this. use elgg() to access the application
-	 * @access private
-	 * @var Application
-	 */
-	public static $_instance;
-
-	/**
-	 * Constructor
-	 *
-	 * Upon construction, no actions are taken to load or boot Elgg.
-	 *
-	 * @param ServiceProvider $services Elgg services provider
-	 * @throws ConfigurationException
-	 */
-	public function __construct(ServiceProvider $services) {
-		$this->_services = $services;
-
-		$this->initConfig();
-	}
-
-	/**
-	 * Validate, normalize, fill in missing values, and lock some
-	 *
-	 * @return void
-	 * @throws ConfigurationException
-	 */
-	private function initConfig() {
-		$config = $this->_services->config;
-
-		if ($config->elgg_config_locks === null) {
-			$config->elgg_config_locks = true;
-		}
-
-		if ($config->elgg_config_locks) {
-			$lock = function ($name) use ($config) {
-				$config->lock($name);
-			};
-		} else {
-			// the installer needs to build an application with defaults then update
-			// them after they're validated, so we don't want to lock them.
-			$lock = function () {
-			};
-		}
-
-		$this->_services->timer->begin([]);
-
-		// Until DB loads, let's log problems
-		if ($config->debug === null) {
-			$config->debug = 'NOTICE';
-		}
-
-		if ($config->dataroot) {
-			$config->dataroot = rtrim($config->dataroot, '\\/') . DIRECTORY_SEPARATOR;
-		} else {
-			if (!$config->installer_running) {
-				throw new ConfigurationException('Config value "dataroot" is required.');
-			}
-		}
-		$lock('dataroot');
-
-		if ($config->cacheroot) {
-			$config->cacheroot = rtrim($config->cacheroot, '\\/') . DIRECTORY_SEPARATOR;
-		} else {
-			$config->cacheroot = $config->dataroot;
-		}
-		$lock('cacheroot');
-
-		if ($config->wwwroot) {
-			$config->wwwroot = rtrim($config->wwwroot, '/') . '/';
-		} else {
-			$config->wwwroot = $this->_services->request->sniffElggUrl();
-		}
-		$lock('wwwroot');
-
-		if (!$config->language) {
-			$config->language = self::DEFAULT_LANG;
-		}
-
-		if ($config->default_limit) {
-			$lock('default_limit');
-		} else {
-			$config->default_limit = self::DEFAULT_LIMIT;
-		}
-
-		$locked_props = [
-			'site_guid' => 1,
-			'path' => Paths::project(),
-			'plugins_path' => Paths::project() . "mod/",
-			'pluginspath' => Paths::project() . "mod/",
-			'url' => $config->wwwroot,
-		];
-		foreach ($locked_props as $name => $value) {
-			$config->$name = $value;
-			$lock($name);
-		}
-
-		// move sensitive credentials into isolated services
-		$this->_services->dbConfig;
-
-		// If the site secret is in the settings file, let's move it to that component
-		// right away to keep this value out of config.
-		$secret = SiteSecret::fromConfig($config);
-		if ($secret) {
-			$this->_services->setValue('siteSecret', $secret);
-			$config->elgg_config_set_secret = true;
-		}
-
-		$config->boot_complete = false;
-	}
-
-	/**
-	 * Get the DB credentials.
-	 *
-	 * We no longer leave DB credentials in the config in case it gets accidentally dumped.
-	 *
-	 * @return \Elgg\Database\DbConfig
-	 */
-	public function getDbConfig() {
-		return $this->_services->dbConfig;
-	}
-
-	/**
-	 * Define all Elgg global functions and constants, wire up boot events, but don't boot
-	 *
-	 * This includes all the .php files in engine/lib (not upgrades). If a script returns a function,
-	 * it is queued and executed at the end.
-	 *
-	 * @return void
-	 * @access private
-	 * @internal
-	 * @throws \InstallationException
-	 */
-	public function loadCore() {
-		if (self::isCoreLoaded()) {
-			return;
-		}
-
-		$setups = [];
-		$path = Paths::elgg() . 'engine/lib';
-
-		// include library files, capturing setup functions
-		foreach (self::getEngineLibs() as $file) {
-			$return = Includer::includeFile("$path/$file");
-			if (!$return) {
-				throw new \InstallationException("Elgg lib file failed include: engine/lib/$file");
-			}
-			if ($return instanceof \Closure) {
-				$setups[$file] = $return;
-			}
-		}
-
-		// store instance to be returned by elgg()
-		self::$_instance = $this;
-
-		$hooks = $this->_services->hooks;
-		$events = $hooks->getEvents();
-
-		// run setups
-		foreach ($setups as $func) {
-			$func($events, $hooks);
-		}
-	}
-
-	/**
-	 * Start and boot the core
-	 *
-	 * @return self
-	 */
-	public static function start() {
-		$app = self::factory();
-		$app->bootCore();
-		return $app;
-	}
-
-	/**
-	 * Are Elgg's global functions loaded?
-	 *
-	 * @return bool
-	 */
-	public static function isCoreLoaded() {
-		return function_exists('elgg');
-	}
-
-	/**
-	 * Bootstrap the Elgg engine, loads plugins, and calls initial system events
-	 *
-	 * This method loads the full Elgg engine, checks the installation
-	 * state, and triggers a series of events to finish booting Elgg:
-	 * 	- {@elgg_event boot system}
-	 * 	- {@elgg_event init system}
-	 * 	- {@elgg_event ready system}
-	 *
-	 * If Elgg is not fully installed, the browser will be redirected to an installation page.
-	 *
-	 * @return void
-	 */
-	public function bootCore() {
-		$config = $this->_services->config;
-
-		if ($this->isTestingApplication()) {
-			throw new \RuntimeException('Unit tests should not call ' . __METHOD__);
-		}
-
-		if ($config->boot_complete) {
-			return;
-		}
-
-		// in case not loaded already
-		$this->loadCore();
-
-		if (!$this->_services->db) {
-			// no database boot!
-			elgg_views_boot();
-			$this->_services->session->start();
-			$this->_services->translator->loadTranslations();
-
-			actions_init();
-			_elgg_init();
-			_elgg_input_init();
-			_elgg_nav_init();
-
-			$config->boot_complete = true;
-			$config->lock('boot_complete');
-			return;
-		}
-
-		// Connect to database, load language files, load configuration, init session
-		$this->_services->boot->boot($this->_services);
-
-		elgg_views_boot();
-
-		// Load the plugins that are active
-		$this->_services->plugins->load();
-
-		if (Paths::project() != Paths::elgg()) {
-			// Elgg is installed as a composer dep, so try to treat the root directory
-			// as a custom plugin that is always loaded last and can't be disabled...
-			if (!$config->system_cache_loaded) {
-				// configure view locations for the custom plugin (not Elgg core)
-				$viewsFile = Paths::project() . 'views.php';
-				if (is_file($viewsFile)) {
-					$viewsSpec = Includer::includeFile($viewsFile);
-					if (is_array($viewsSpec)) {
-						$this->_services->views->mergeViewsSpec($viewsSpec);
-					}
-				}
-
-				// find views for the custom plugin (not Elgg core)
-				$this->_services->views->registerPluginViews(Paths::project());
-			}
-
-			if (!$config->i18n_loaded_from_cache) {
-				$this->_services->translator->registerPluginTranslations(Paths::project());
-			}
-
-			// This is root directory start.php
-			$root_start = Paths::project() . "start.php";
-			if (is_file($root_start)) {
-				require $root_start;
-			}
-		}
-
-		// after plugins are started we know which viewtypes are populated
-		$this->_services->views->clampViewtypeToPopulatedViews();
-
-		$this->allowPathRewrite();
-
-		$events = $this->_services->hooks->getEvents();
-
-		// Allows registering handlers strictly before all init, system handlers
-		$events->trigger('plugins_boot', 'system');
-
-		// Complete the boot process for both engine and plugins
-		$events->trigger('init', 'system');
-
-		$config->boot_complete = true;
-		$config->lock('boot_complete');
-
-		// System loaded and ready
-		$events->trigger('ready', 'system');
-	}
-
-	/**
-	 * Get a Database wrapper for performing queries without booting Elgg
-	 *
-	 * If settings has not been loaded, it will be loaded to configure the DB connection.
-	 *
-	 * @note Before boot, the Database instance will not yet be bound to a Logger.
-	 *
-	 * @return \Elgg\Application\Database
-	 */
-	public function getDb() {
-		return $this->_services->publicDb;
-	}
-
-	/**
-	 * Get an undefined property
-	 *
-	 * @param string $name The property name accessed
-	 *
-	 * @return mixed
-	 */
-	public function __get($name) {
-		if (isset(self::$public_services[$name])) {
-			return $this->_services->{$name};
-		}
-		trigger_error("Undefined property: " . __CLASS__ . ":\${$name}");
-	}
-
-	/**
-	 * Creates a new, trivial instance of Elgg\Application and set it as the singleton instance.
-	 * If the singleton is already set, it's returned.
-	 *
-	 * @param array $spec Specification for initial call.
-	 * @return self
-	 * @throws ConfigurationException
-	 */
-	public static function factory(array $spec = []) {
-		if (self::$_instance !== null) {
-			return self::$_instance;
-		}
-
-		$defaults = [
-			'service_provider' => null,
-			'config' => null,
-			'settings_path' => null,
-			'handle_exceptions' => true,
-			'handle_shutdown' => true,
-			'set_global_config' => true,
-			'set_start_time' => true,
-			'request' => null,
-			'set_global_instance' => true,
-		];
-		$spec = array_merge($defaults, $spec);
-
-		if ($spec['set_start_time']) {
-			/**
-			 * The time with microseconds when the Elgg engine was started.
-			 *
-			 * @global float
-			 */
-			if (!isset($GLOBALS['START_MICROTIME'])) {
-				$GLOBALS['START_MICROTIME'] = microtime(true);
-			}
-		}
-
-		if (!$spec['service_provider']) {
-			if (!$spec['config']) {
-				$spec['config'] = Config::factory($spec['settings_path']);
-			}
-			$spec['service_provider'] = new ServiceProvider($spec['config']);
-		}
-
-		if ($spec['request']) {
-			if ($spec['request'] instanceof Request) {
-				$spec['service_provider']->setValue('request', $spec['request']);
-			} else {
-				throw new \InvalidArgumentException("Given request is not a " . Request::class);
-			}
-		}
-
-		$app = new self($spec['service_provider']);
-
-		if ($spec['handle_exceptions']) {
-			set_error_handler([$app, 'handleErrors']);
-			set_exception_handler([$app, 'handleExceptions']);
-		}
-
-		if ($spec['handle_shutdown']) {
-			// we need to register for shutdown before Symfony registers the
-			// session_write_close() function. https://github.com/Elgg/Elgg/issues/9243
-			register_shutdown_function(function () {
-				// There are cases where we may exit before this function is defined
-				if (function_exists('_elgg_shutdown_hook')) {
-					_elgg_shutdown_hook();
-				}
-			});
-		}
-
-		if ($spec['set_global_config']) {
-			global $CONFIG;
-
-			// this will be buggy be at least PHP will log failures
-			$CONFIG = $spec['service_provider']->config;
-		}
-
-		if ($spec['set_global_instance']) {
-			self::$_instance = $app;
-		}
-
-		return $app;
-	}
-
-	/**
-	 * Elgg's front controller. Handles basically all incoming URL requests.
-	 *
-	 * @return bool True if Elgg will handle the request, false if the server should (PHP-CLI server)
-	 */
-	public static function index() {
-		$req = Request::createFromGlobals();
-		/** @var Request $req */
-
-		if ($req->isRewriteCheck()) {
-			echo Request::REWRITE_TEST_OUTPUT;
-			return true;
-		}
-
-		return self::factory(['request' => $req])->run();
-	}
-
-	/**
-	 * Routes the request, booting core if not yet booted
-	 *
-	 * @return bool False if Elgg wants the PHP CLI server to handle the request
-	 */
-	public function run() {
-		$config = $this->_services->config;
-		$request = $this->_services->request;
-
-		if ($request->isCliServer()) {
-			if ($request->isCliServable(Paths::project())) {
-				return false;
-			}
-
-			// overwrite value from settings
-			$www_root = rtrim($request->getSchemeAndHttpHost() . $request->getBaseUrl(), '/') . '/';
-			$config->wwwroot = $www_root;
-			$config->wwwroot_cli_server = $www_root;
-		}
-
-		if (0 === strpos($request->getElggPath(), '/cache/')) {
-			$this->_services->cacheHandler->handleRequest($request, $this)->prepare($request)->send();
-			return true;
-		}
-
-		if (0 === strpos($request->getElggPath(), '/serve-file/')) {
-			$this->_services->serveFileHandler->getResponse($request)->send();
-			return true;
-		}
-
-		$this->bootCore();
-
-		// TODO use formal Response object instead
-		// This is to set the charset to UTF-8.
-		header("Content-Type: text/html;charset=utf-8", true);
-
-		// re-fetch new request from services in case it was replaced by route:rewrite
-		$request = $this->_services->request;
-
-		if (!$this->_services->router->route($request)) {
-			forward('', '404');
-		}
-	}
-
-	/**
-	 * Returns a directory that points to the root of Elgg, but not necessarily
-	 * the install root. See `self::root()` for that.
-	 *
-	 * @return Directory
-	 */
-	public static function elggDir() {
-		return Local::elggRoot();
-	}
-
-	/**
-	 * Returns a directory that points to the project root, where composer is installed.
-	 *
-	 * @return Directory
-	 */
-	public static function projectDir() {
-		return Local::projectRoot();
-	}
-
-	/**
-	 * Renders a web UI for installing Elgg.
-	 *
-	 * @return void
-	 */
-	public static function install() {
-		ini_set('display_errors', 1);
-		$installer = new \ElggInstaller();
-		$installer->run();
-	}
-
-	/**
-	 * Elgg upgrade script.
-	 *
-	 * This script triggers any necessary upgrades. If the site has been upgraded
-	 * to the most recent version of the code, no upgrades are run but the caches
-	 * are flushed.
-	 *
-	 * Upgrades use a table {db_prefix}upgrade_lock as a mutex to prevent concurrent upgrades.
-	 *
-	 * The URL to forward to after upgrades are complete can be specified by setting $_GET['forward']
-	 * to a relative URL.
-	 *
-	 * @return void
-	 */
-	public static function upgrade() {
-		// we want to know if an error occurs
-		ini_set('display_errors', 1);
-		$is_cli = (php_sapi_name() === 'cli');
-
-		$forward = function ($url) use ($is_cli) {
-			if ($is_cli) {
-				fwrite(STDOUT, "Open $url in your browser to continue." . PHP_EOL);
-				return;
-			}
-
-			forward($url);
-		};
-
-		define('UPGRADING', 'upgrading');
-
-		self::migrate();
-		self::start();
-
-		// check security settings
-		if (!$is_cli && _elgg_config()->security_protect_upgrade && !elgg_is_admin_logged_in()) {
-			// only admin's or users with a valid token can run upgrade.php
-			elgg_signed_request_gatekeeper();
-		}
-
-		$site_url = _elgg_config()->url;
-		$site_host = parse_url($site_url, PHP_URL_HOST) . '/';
-
-		// turn any full in-site URLs into absolute paths
-		$forward_url = get_input('forward', '/admin', false);
-		$forward_url = str_replace([$site_url, $site_host], '/', $forward_url);
-
-		if (strpos($forward_url, '/') !== 0) {
-			$forward_url = '/' . $forward_url;
-		}
-
-		if ($is_cli || (get_input('upgrade') == 'upgrade')) {
-			$upgrader = _elgg_services()->upgrades;
-			$result = $upgrader->run();
-
-			if ($result['failure'] == true) {
-				register_error($result['reason']);
-				$forward($forward_url);
-			}
-
-			// Find unprocessed batch upgrade classes and save them as ElggUpgrade objects
-			$core_upgrades = (require self::elggDir()->getPath('engine/lib/upgrades/async-upgrades.php'));
-			$has_pending_upgrades = _elgg_services()->upgradeLocator->run($core_upgrades);
-
-			if ($has_pending_upgrades) {
-				// Forward to the list of pending upgrades
-				$forward_url = '/admin/upgrades';
-			}
-		} else {
-			$rewriteTester = new \ElggRewriteTester();
-			$url = elgg_get_site_url() . "__testing_rewrite?__testing_rewrite=1";
-			if (!$rewriteTester->runRewriteTest($url)) {
-				// see if there is a problem accessing the site at all
-				// due to ip restrictions for example
-				if (!$rewriteTester->runLocalhostAccessTest()) {
-					// note: translation may not be available until after upgrade
-					$msg = elgg_echo("installation:htaccess:localhost:connectionfailed");
-					if ($msg === "installation:htaccess:localhost:connectionfailed") {
-						$msg = "Elgg cannot connect to itself to test rewrite rules properly. Check "
-								. "that curl is working and there are no IP restrictions preventing "
-								. "localhost connections.";
-					}
-					echo $msg;
-					exit;
-				}
-
-				// note: translation may not be available until after upgrade
-				$msg = elgg_echo("installation:htaccess:needs_upgrade");
-				if ($msg === "installation:htaccess:needs_upgrade") {
-					$msg = "You must update your .htaccess file (use install/config/htaccess.dist as a guide).";
-				}
-				echo $msg;
-				exit;
-			}
-
-			$vars = [
-				'forward' => $forward_url
-			];
-
-			// reset cache to have latest translations available during upgrade
-			elgg_reset_system_cache();
-
-			echo elgg_view_page(elgg_echo('upgrading'), '', 'upgrade', $vars);
-			exit;
-		}
-
-		$forward($forward_url);
-	}
-
-	/**
-	 * Runs database migrations
-	 *
-	 * @throws InstallationException
-	 * @return bool
-	 */
-	public static function migrate() {
-		$conf = self::elggDir()->getPath('engine/schema/settings.php');
-		if (!$conf) {
-			throw new Exception('Settings file is required to run database migrations.');
-		}
-
-		$app = new \Phinx\Console\PhinxApplication();
-		$wrapper = new \Phinx\Wrapper\TextWrapper($app, [
-			'configuration' => $conf,
-		]);
-		$log = $wrapper->getMigrate();
-		error_log($log);
-
-		return true;
-	}
-
-	/**
-	 * Returns configuration array for database migrations
-	 * @return array
-	 */
-	public static function getMigrationSettings() {
-
-		$config = Config::factory();
-		$db_config = DbConfig::fromElggConfig($config);
-		if ($db_config->isDatabaseSplit()) {
-			$conn = $db_config->getConnectionConfig(DbConfig::WRITE);
-		} else {
-			$conn = $db_config->getConnectionConfig();
-		}
-
-		return [
-			"paths" => [
-				"migrations" => Paths::elgg() . 'engine/schema/migrations/',
-			],
-			"environments" => [
-				"default_migration_table" => "{$conn['prefix']}migrations",
-				"default_database" => "prod",
-				"prod" => [
-					"adapter" => "mysql",
-					"host" => $conn['host'],
-					"name" => $conn['database'],
-					"user" => $conn['user'],
-					"pass" => $conn['password'],
-					"charset" => $conn['encoding'],
-					"table_prefix" => $conn['prefix'],
-				],
-			],
-		];
-	}
-
-	/**
-	 * Allow plugins to rewrite the path.
-	 *
-	 * @return void
-	 */
-	private function allowPathRewrite() {
-		$request = $this->_services->request;
-		$new = $this->_services->router->allowRewrite($request);
-		if ($new === $request) {
-			return;
-		}
-
-		$this->_services->setValue('request', $new);
-		$this->_services->context->initialize($new);
-	}
-
-	/**
-	 * Flag this application as running for testing (PHPUnit)
-	 *
-	 * @param bool $testing Is testing application
-	 * @return void
-	 */
-	public static function setTestingApplication($testing = true) {
-		self::$testing_app = $testing;
-	}
-
-	/**
-	 * Checks if the application is running in PHPUnit
-	 * @return bool
-	 */
-	public static function isTestingApplication() {
-		return (bool) self::$testing_app;
-	}
-
-	/**
-	 * Intercepts, logs, and displays uncaught exceptions.
-	 *
-	 * To use a viewtype other than failsafe, create the views:
-	 *  <viewtype>/messages/exceptions/admin_exception
-	 *  <viewtype>/messages/exceptions/exception
-	 * See the json viewtype for an example.
-	 *
-	 * @warning This function should never be called directly.
-	 *
-	 * @see http://www.php.net/set-exception-handler
-	 *
-	 * @param \Exception|\Error $exception The exception/error being handled
-	 *
-	 * @return void
-	 * @access private
-	 */
-	public function handleExceptions($exception) {
-		$timestamp = time();
-		error_log("Exception at time $timestamp: $exception");
-
-		// Wipe any existing output buffer
-		ob_end_clean();
-
-		// make sure the error isn't cached
-		header("Cache-Control: no-cache, must-revalidate", true);
-		header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', true);
-
-		if ($exception instanceof \InstallationException) {
-			forward('/install.php');
-		}
-
-		if (!self::isCoreLoaded()) {
-			http_response_code(500);
-			echo "Exception loading Elgg core. Check log at time $timestamp";
-			return;
-		}
-
-		try {
-			// allow custom scripts to trigger on exception
-			// value in settings.php should be a system path to a file to include
-			$exception_include = $this->_services->config->exception_include;
-
-			if ($exception_include && is_file($exception_include)) {
-				ob_start();
-
-				// don't isolate, these scripts may use the local $exception var.
-				include $exception_include;
-
-				$exception_output = ob_get_clean();
-
-				// if content is returned from the custom handler we will output
-				// that instead of our default failsafe view
-				if (!empty($exception_output)) {
-					echo $exception_output;
-					exit;
-				}
-			}
-
-			if (elgg_is_xhr()) {
-				elgg_set_viewtype('json');
-				$response = new \Symfony\Component\HttpFoundation\JsonResponse(null, 500);
-			} else {
-				elgg_set_viewtype('failsafe');
-				$response = new \Symfony\Component\HttpFoundation\Response('', 500);
-			}
-
-			if (elgg_is_admin_logged_in()) {
-				$body = elgg_view("messages/exceptions/admin_exception", [
-					'object' => $exception,
-					'ts' => $timestamp
-				]);
-			} else {
-				$body = elgg_view("messages/exceptions/exception", [
-					'object' => $exception,
-					'ts' => $timestamp
-				]);
-			}
-
-			$response->setContent(elgg_view_page(elgg_echo('exception:title'), $body));
-			$response->send();
-		} catch (\Exception $e) {
-			$timestamp = time();
-			$message = $e->getMessage();
-			http_response_code(500);
-			echo "Fatal error in exception handler. Check log for Exception at time $timestamp";
-			error_log("Exception at time $timestamp : fatal error in exception handler : $message");
-		}
-	}
-
-	/**
-	 * Intercepts catchable PHP errors.
-	 *
-	 * @warning This function should never be called directly.
-	 *
-	 * @internal
-	 * For catchable fatal errors, throws an Exception with the error.
-	 *
-	 * For non-fatal errors, depending upon the debug settings, either
-	 * log the error or ignore it.
-	 *
-	 * @see http://www.php.net/set-error-handler
-	 *
-	 * @param int    $errno    The level of the error raised
-	 * @param string $errmsg   The error message
-	 * @param string $filename The filename the error was raised in
-	 * @param int    $linenum  The line number the error was raised at
-	 * @param array  $vars     An array that points to the active symbol table where error occurred
-	 *
-	 * @return true
-	 * @throws \Exception
-	 * @access private
-	 */
-	public function handleErrors($errno, $errmsg, $filename, $linenum, $vars) {
-		$error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)";
-
-		$log = function ($message, $level) {
-			if (self::isCoreLoaded()) {
-				return elgg_log($message, $level);
-			}
-
-			return false;
-		};
-
-		switch ($errno) {
-			case E_USER_ERROR:
-				if (!$log("PHP: $error", 'ERROR')) {
-					error_log("PHP ERROR: $error");
-				}
-				if (self::isCoreLoaded()) {
-					register_error("ERROR: $error");
-				}
-
-				// Since this is a fatal error, we want to stop any further execution but do so gracefully.
-				throw new \Exception($error);
-				break;
-
-			case E_WARNING :
-			case E_USER_WARNING :
-			case E_RECOVERABLE_ERROR: // (e.g. type hint violation)
-
-				// check if the error wasn't suppressed by the error control operator (@)
-				if (error_reporting() && !$log("PHP: $error", 'WARNING')) {
-					error_log("PHP WARNING: $error");
-				}
-				break;
-
-			default:
-				if (function_exists('_elgg_config')) {
-					$debug = _elgg_config()->debug;
-				} else {
-					$debug = isset($GLOBALS['CONFIG']->debug) ? $GLOBALS['CONFIG']->debug : null;
-				}
-				if ($debug !== 'NOTICE') {
-					return true;
-				}
-
-				if (!$log("PHP (errno $errno): $error", 'NOTICE')) {
-					error_log("PHP NOTICE: $error");
-				}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Does nothing.
-	 *
-	 * @return void
-	 * @deprecated
-	 */
-	public function loadSettings() {
-		trigger_error(__METHOD__ . ' is no longer needed and will be removed.');
-	}
-
-	/**
-	 * Get all engine/lib library filenames
-	 *
-	 * @note We can't just pull in all directory files because some users leave old files in place.
-	 *
-	 * @return string[]
-	 */
-	private static function getEngineLibs() {
-		return [
-			'access.php',
-			'actions.php',
-			'admin.php',
-			'annotations.php',
-			'autoloader.php',
-			'cache.php',
-			'comments.php',
-			'configuration.php',
-			'constants.php',
-			'cron.php',
-			'database.php',
-			'deprecated-3.0.php',
-			'elgglib.php',
-			'entities.php',
-			'filestore.php',
-			'group.php',
-			'input.php',
-			'languages.php',
-			'mb_wrapper.php',
-			'memcache.php',
-			'metadata.php',
-			'metastrings.php',
-			'navigation.php',
-			'notification.php',
-			'output.php',
-			'pagehandler.php',
-			'pageowner.php',
-			'pam.php',
-			'plugins.php',
-			'private_settings.php',
-			'relationships.php',
-			'river.php',
-			'sessions.php',
-			'statistics.php',
-			'system_log.php',
-			'tags.php',
-			'upgrade.php',
-			'user_settings.php',
-			'users.php',
-			'views.php',
-			'widgets.php',
-		];
-	}
+    const DEFAULT_LANG = 'en';
+    const DEFAULT_LIMIT = 10;
+
+    /**
+     * @var ServiceProvider
+     *
+     * @internal DO NOT USE
+     */
+    public $_services;
+
+    /**
+     * @var bool
+     */
+    private static $testing_app;
+
+    /**
+     * Property names of the service provider to be exposed via __get()
+     *
+     * E.g. the presence of `'foo' => true` in the list would allow _elgg_services()->foo to
+     * be accessed via elgg()->foo.
+     *
+     * @var string[]
+     */
+    private static $public_services = [
+        //'config' => true,
+        'menus' => true,
+        'table_columns' => true,
+    ];
+
+    /**
+     * Reference to the loaded Application returned by elgg()
+     *
+     * @internal Do not use this. use elgg() to access the application
+     * @access private
+     * @var Application
+     */
+    public static $_instance;
+
+    /**
+     * Constructor
+     *
+     * Upon construction, no actions are taken to load or boot Elgg.
+     *
+     * @param ServiceProvider $services Elgg services provider
+     * @throws ConfigurationException
+     */
+    public function __construct(ServiceProvider $services) {
+        $this->_services = $services;
+
+        $this->initConfig();
+    }
+
+    /**
+     * Validate, normalize, fill in missing values, and lock some
+     *
+     * @return void
+     * @throws ConfigurationException
+     */
+    private function initConfig() {
+        $config = $this->_services->config;
+
+        if ($config->elgg_config_locks === null) {
+            $config->elgg_config_locks = true;
+        }
+
+        if ($config->elgg_config_locks) {
+            $lock = function ($name) use ($config) {
+                $config->lock($name);
+            };
+        } else {
+            // the installer needs to build an application with defaults then update
+            // them after they're validated, so we don't want to lock them.
+            $lock = function () {
+            };
+        }
+
+        $this->_services->timer->begin([]);
+
+        // Until DB loads, let's log problems
+        if ($config->debug === null) {
+            $config->debug = 'NOTICE';
+        }
+
+        if ($config->dataroot) {
+            $config->dataroot = rtrim($config->dataroot, '\\/') . DIRECTORY_SEPARATOR;
+        } else {
+            if (!$config->installer_running) {
+                throw new ConfigurationException('Config value "dataroot" is required.');
+            }
+        }
+        $lock('dataroot');
+
+        if ($config->cacheroot) {
+            $config->cacheroot = rtrim($config->cacheroot, '\\/') . DIRECTORY_SEPARATOR;
+        } else {
+            $config->cacheroot = $config->dataroot;
+        }
+        $lock('cacheroot');
+
+        if ($config->wwwroot) {
+            $config->wwwroot = rtrim($config->wwwroot, '/') . '/';
+        } else {
+            $config->wwwroot = $this->_services->request->sniffElggUrl();
+        }
+        $lock('wwwroot');
+
+        if (!$config->language) {
+            $config->language = self::DEFAULT_LANG;
+        }
+
+        if ($config->default_limit) {
+            $lock('default_limit');
+        } else {
+            $config->default_limit = self::DEFAULT_LIMIT;
+        }
+
+        $locked_props = [
+            'site_guid' => 1,
+            'path' => Paths::project(),
+            'plugins_path' => Paths::project() . "mod/",
+            'pluginspath' => Paths::project() . "mod/",
+            'url' => $config->wwwroot,
+        ];
+        foreach ($locked_props as $name => $value) {
+            $config->$name = $value;
+            $lock($name);
+        }
+
+        // move sensitive credentials into isolated services
+        $this->_services->dbConfig;
+
+        // If the site secret is in the settings file, let's move it to that component
+        // right away to keep this value out of config.
+        $secret = SiteSecret::fromConfig($config);
+        if ($secret) {
+            $this->_services->setValue('siteSecret', $secret);
+            $config->elgg_config_set_secret = true;
+        }
+
+        $config->boot_complete = false;
+    }
+
+    /**
+     * Get the DB credentials.
+     *
+     * We no longer leave DB credentials in the config in case it gets accidentally dumped.
+     *
+     * @return \Elgg\Database\DbConfig
+     */
+    public function getDbConfig() {
+        return $this->_services->dbConfig;
+    }
+
+    /**
+     * Define all Elgg global functions and constants, wire up boot events, but don't boot
+     *
+     * This includes all the .php files in engine/lib (not upgrades). If a script returns a function,
+     * it is queued and executed at the end.
+     *
+     * @return void
+     * @access private
+     * @internal
+     * @throws \InstallationException
+     */
+    public function loadCore() {
+        if (self::isCoreLoaded()) {
+            return;
+        }
+
+        $setups = [];
+        $path = Paths::elgg() . 'engine/lib';
+
+        // include library files, capturing setup functions
+        foreach (self::getEngineLibs() as $file) {
+            $return = Includer::includeFile("$path/$file");
+            if (!$return) {
+                throw new \InstallationException("Elgg lib file failed include: engine/lib/$file");
+            }
+            if ($return instanceof \Closure) {
+                $setups[$file] = $return;
+            }
+        }
+
+        // store instance to be returned by elgg()
+        self::$_instance = $this;
+
+        $hooks = $this->_services->hooks;
+        $events = $hooks->getEvents();
+
+        // run setups
+        foreach ($setups as $func) {
+            $func($events, $hooks);
+        }
+    }
+
+    /**
+     * Start and boot the core
+     *
+     * @return self
+     */
+    public static function start() {
+        $app = self::factory();
+        $app->bootCore();
+        return $app;
+    }
+
+    /**
+     * Are Elgg's global functions loaded?
+     *
+     * @return bool
+     */
+    public static function isCoreLoaded() {
+        return function_exists('elgg');
+    }
+
+    /**
+     * Bootstrap the Elgg engine, loads plugins, and calls initial system events
+     *
+     * This method loads the full Elgg engine, checks the installation
+     * state, and triggers a series of events to finish booting Elgg:
+     * 	- {@elgg_event boot system}
+     * 	- {@elgg_event init system}
+     * 	- {@elgg_event ready system}
+     *
+     * If Elgg is not fully installed, the browser will be redirected to an installation page.
+     *
+     * @return void
+     */
+    public function bootCore() {
+        $config = $this->_services->config;
+
+        if ($this->isTestingApplication()) {
+            throw new \RuntimeException('Unit tests should not call ' . __METHOD__);
+        }
+
+        if ($config->boot_complete) {
+            return;
+        }
+
+        // in case not loaded already
+        $this->loadCore();
+
+        if (!$this->_services->db) {
+            // no database boot!
+            elgg_views_boot();
+            $this->_services->session->start();
+            $this->_services->translator->loadTranslations();
+
+            actions_init();
+            _elgg_init();
+            _elgg_input_init();
+            _elgg_nav_init();
+
+            $config->boot_complete = true;
+            $config->lock('boot_complete');
+            return;
+        }
+
+        // Connect to database, load language files, load configuration, init session
+        $this->_services->boot->boot($this->_services);
+
+        elgg_views_boot();
+
+        // Load the plugins that are active
+        $this->_services->plugins->load();
+
+        if (Paths::project() != Paths::elgg()) {
+            // Elgg is installed as a composer dep, so try to treat the root directory
+            // as a custom plugin that is always loaded last and can't be disabled...
+            if (!$config->system_cache_loaded) {
+                // configure view locations for the custom plugin (not Elgg core)
+                $viewsFile = Paths::project() . 'views.php';
+                if (is_file($viewsFile)) {
+                    $viewsSpec = Includer::includeFile($viewsFile);
+                    if (is_array($viewsSpec)) {
+                        $this->_services->views->mergeViewsSpec($viewsSpec);
+                    }
+                }
+
+                // find views for the custom plugin (not Elgg core)
+                $this->_services->views->registerPluginViews(Paths::project());
+            }
+
+            if (!$config->i18n_loaded_from_cache) {
+                $this->_services->translator->registerPluginTranslations(Paths::project());
+            }
+
+            // This is root directory start.php
+            $root_start = Paths::project() . "start.php";
+            if (is_file($root_start)) {
+                require $root_start;
+            }
+        }
+
+        // after plugins are started we know which viewtypes are populated
+        $this->_services->views->clampViewtypeToPopulatedViews();
+
+        $this->allowPathRewrite();
+
+        $events = $this->_services->hooks->getEvents();
+
+        // Allows registering handlers strictly before all init, system handlers
+        $events->trigger('plugins_boot', 'system');
+
+        // Complete the boot process for both engine and plugins
+        $events->trigger('init', 'system');
+
+        $config->boot_complete = true;
+        $config->lock('boot_complete');
+
+        // System loaded and ready
+        $events->trigger('ready', 'system');
+    }
+
+    /**
+     * Get a Database wrapper for performing queries without booting Elgg
+     *
+     * If settings has not been loaded, it will be loaded to configure the DB connection.
+     *
+     * @note Before boot, the Database instance will not yet be bound to a Logger.
+     *
+     * @return \Elgg\Application\Database
+     */
+    public function getDb() {
+        return $this->_services->publicDb;
+    }
+
+    /**
+     * Get an undefined property
+     *
+     * @param string $name The property name accessed
+     *
+     * @return mixed
+     */
+    public function __get($name) {
+        if (isset(self::$public_services[$name])) {
+            return $this->_services->{$name};
+        }
+        trigger_error("Undefined property: " . __CLASS__ . ":\${$name}");
+    }
+
+    /**
+     * Creates a new, trivial instance of Elgg\Application and set it as the singleton instance.
+     * If the singleton is already set, it's returned.
+     *
+     * @param array $spec Specification for initial call.
+     * @return self
+     * @throws ConfigurationException
+     */
+    public static function factory(array $spec = []) {
+        if (self::$_instance !== null) {
+            return self::$_instance;
+        }
+
+        $defaults = [
+            'service_provider' => null,
+            'config' => null,
+            'settings_path' => null,
+            'handle_exceptions' => true,
+            'handle_shutdown' => true,
+            'set_global_config' => true,
+            'set_start_time' => true,
+            'request' => null,
+            'set_global_instance' => true,
+        ];
+        $spec = array_merge($defaults, $spec);
+
+        if ($spec['set_start_time']) {
+            /**
+             * The time with microseconds when the Elgg engine was started.
+             *
+             * @global float
+             */
+            if (!isset($GLOBALS['START_MICROTIME'])) {
+                $GLOBALS['START_MICROTIME'] = microtime(true);
+            }
+        }
+
+        if (!$spec['service_provider']) {
+            if (!$spec['config']) {
+                $spec['config'] = Config::factory($spec['settings_path']);
+            }
+            $spec['service_provider'] = new ServiceProvider($spec['config']);
+        }
+
+        if ($spec['request']) {
+            if ($spec['request'] instanceof Request) {
+                $spec['service_provider']->setValue('request', $spec['request']);
+            } else {
+                throw new \InvalidArgumentException("Given request is not a " . Request::class);
+            }
+        }
+
+        $app = new self($spec['service_provider']);
+
+        if ($spec['handle_exceptions']) {
+            set_error_handler([$app, 'handleErrors']);
+            set_exception_handler([$app, 'handleExceptions']);
+        }
+
+        if ($spec['handle_shutdown']) {
+            // we need to register for shutdown before Symfony registers the
+            // session_write_close() function. https://github.com/Elgg/Elgg/issues/9243
+            register_shutdown_function(function () {
+                // There are cases where we may exit before this function is defined
+                if (function_exists('_elgg_shutdown_hook')) {
+                    _elgg_shutdown_hook();
+                }
+            });
+        }
+
+        if ($spec['set_global_config']) {
+            global $CONFIG;
+
+            // this will be buggy be at least PHP will log failures
+            $CONFIG = $spec['service_provider']->config;
+        }
+
+        if ($spec['set_global_instance']) {
+            self::$_instance = $app;
+        }
+
+        return $app;
+    }
+
+    /**
+     * Elgg's front controller. Handles basically all incoming URL requests.
+     *
+     * @return bool True if Elgg will handle the request, false if the server should (PHP-CLI server)
+     */
+    public static function index() {
+        $req = Request::createFromGlobals();
+        /** @var Request $req */
+
+        if ($req->isRewriteCheck()) {
+            echo Request::REWRITE_TEST_OUTPUT;
+            return true;
+        }
+
+        return self::factory(['request' => $req])->run();
+    }
+
+    /**
+     * Routes the request, booting core if not yet booted
+     *
+     * @return bool False if Elgg wants the PHP CLI server to handle the request
+     */
+    public function run() {
+        $config = $this->_services->config;
+        $request = $this->_services->request;
+
+        if ($request->isCliServer()) {
+            if ($request->isCliServable(Paths::project())) {
+                return false;
+            }
+
+            // overwrite value from settings
+            $www_root = rtrim($request->getSchemeAndHttpHost() . $request->getBaseUrl(), '/') . '/';
+            $config->wwwroot = $www_root;
+            $config->wwwroot_cli_server = $www_root;
+        }
+
+        if (0 === strpos($request->getElggPath(), '/cache/')) {
+            $this->_services->cacheHandler->handleRequest($request, $this)->prepare($request)->send();
+            return true;
+        }
+
+        if (0 === strpos($request->getElggPath(), '/serve-file/')) {
+            $this->_services->serveFileHandler->getResponse($request)->send();
+            return true;
+        }
+
+        $this->bootCore();
+
+        // TODO use formal Response object instead
+        // This is to set the charset to UTF-8.
+        header("Content-Type: text/html;charset=utf-8", true);
+
+        // re-fetch new request from services in case it was replaced by route:rewrite
+        $request = $this->_services->request;
+
+        if (!$this->_services->router->route($request)) {
+            forward('', '404');
+        }
+    }
+
+    /**
+     * Returns a directory that points to the root of Elgg, but not necessarily
+     * the install root. See `self::root()` for that.
+     *
+     * @return Directory
+     */
+    public static function elggDir() {
+        return Local::elggRoot();
+    }
+
+    /**
+     * Returns a directory that points to the project root, where composer is installed.
+     *
+     * @return Directory
+     */
+    public static function projectDir() {
+        return Local::projectRoot();
+    }
+
+    /**
+     * Renders a web UI for installing Elgg.
+     *
+     * @return void
+     */
+    public static function install() {
+        ini_set('display_errors', 1);
+        $installer = new \ElggInstaller();
+        $installer->run();
+    }
+
+    /**
+     * Elgg upgrade script.
+     *
+     * This script triggers any necessary upgrades. If the site has been upgraded
+     * to the most recent version of the code, no upgrades are run but the caches
+     * are flushed.
+     *
+     * Upgrades use a table {db_prefix}upgrade_lock as a mutex to prevent concurrent upgrades.
+     *
+     * The URL to forward to after upgrades are complete can be specified by setting $_GET['forward']
+     * to a relative URL.
+     *
+     * @return void
+     */
+    public static function upgrade() {
+        // we want to know if an error occurs
+        ini_set('display_errors', 1);
+        $is_cli = (php_sapi_name() === 'cli');
+
+        $forward = function ($url) use ($is_cli) {
+            if ($is_cli) {
+                fwrite(STDOUT, "Open $url in your browser to continue." . PHP_EOL);
+                return;
+            }
+
+            forward($url);
+        };
+
+        define('UPGRADING', 'upgrading');
+
+        self::migrate();
+        self::start();
+
+        // check security settings
+        if (!$is_cli && _elgg_config()->security_protect_upgrade && !elgg_is_admin_logged_in()) {
+            // only admin's or users with a valid token can run upgrade.php
+            elgg_signed_request_gatekeeper();
+        }
+
+        $site_url = _elgg_config()->url;
+        $site_host = parse_url($site_url, PHP_URL_HOST) . '/';
+
+        // turn any full in-site URLs into absolute paths
+        $forward_url = get_input('forward', '/admin', false);
+        $forward_url = str_replace([$site_url, $site_host], '/', $forward_url);
+
+        if (strpos($forward_url, '/') !== 0) {
+            $forward_url = '/' . $forward_url;
+        }
+
+        if ($is_cli || (get_input('upgrade') == 'upgrade')) {
+            $upgrader = _elgg_services()->upgrades;
+            $result = $upgrader->run();
+
+            if ($result['failure'] == true) {
+                register_error($result['reason']);
+                $forward($forward_url);
+            }
+
+            // Find unprocessed batch upgrade classes and save them as ElggUpgrade objects
+            $core_upgrades = (require self::elggDir()->getPath('engine/lib/upgrades/async-upgrades.php'));
+            $has_pending_upgrades = _elgg_services()->upgradeLocator->run($core_upgrades);
+
+            if ($has_pending_upgrades) {
+                // Forward to the list of pending upgrades
+                $forward_url = '/admin/upgrades';
+            }
+        } else {
+            $rewriteTester = new \ElggRewriteTester();
+            $url = elgg_get_site_url() . "__testing_rewrite?__testing_rewrite=1";
+            if (!$rewriteTester->runRewriteTest($url)) {
+                // see if there is a problem accessing the site at all
+                // due to ip restrictions for example
+                if (!$rewriteTester->runLocalhostAccessTest()) {
+                    // note: translation may not be available until after upgrade
+                    $msg = elgg_echo("installation:htaccess:localhost:connectionfailed");
+                    if ($msg === "installation:htaccess:localhost:connectionfailed") {
+                        $msg = "Elgg cannot connect to itself to test rewrite rules properly. Check "
+                                . "that curl is working and there are no IP restrictions preventing "
+                                . "localhost connections.";
+                    }
+                    echo $msg;
+                    exit;
+                }
+
+                // note: translation may not be available until after upgrade
+                $msg = elgg_echo("installation:htaccess:needs_upgrade");
+                if ($msg === "installation:htaccess:needs_upgrade") {
+                    $msg = "You must update your .htaccess file (use install/config/htaccess.dist as a guide).";
+                }
+                echo $msg;
+                exit;
+            }
+
+            $vars = [
+                'forward' => $forward_url
+            ];
+
+            // reset cache to have latest translations available during upgrade
+            elgg_reset_system_cache();
+
+            echo elgg_view_page(elgg_echo('upgrading'), '', 'upgrade', $vars);
+            exit;
+        }
+
+        $forward($forward_url);
+    }
+
+    /**
+     * Runs database migrations
+     *
+     * @throws InstallationException
+     * @return bool
+     */
+    public static function migrate() {
+        $conf = self::elggDir()->getPath('engine/schema/settings.php');
+        if (!$conf) {
+            throw new Exception('Settings file is required to run database migrations.');
+        }
+
+        $app = new \Phinx\Console\PhinxApplication();
+        $wrapper = new \Phinx\Wrapper\TextWrapper($app, [
+            'configuration' => $conf,
+        ]);
+        $log = $wrapper->getMigrate();
+        error_log($log);
+
+        return true;
+    }
+
+    /**
+     * Returns configuration array for database migrations
+     * @return array
+     */
+    public static function getMigrationSettings() {
+
+        $config = Config::factory();
+        $db_config = DbConfig::fromElggConfig($config);
+        if ($db_config->isDatabaseSplit()) {
+            $conn = $db_config->getConnectionConfig(DbConfig::WRITE);
+        } else {
+            $conn = $db_config->getConnectionConfig();
+        }
+
+        return [
+            "paths" => [
+                "migrations" => Paths::elgg() . 'engine/schema/migrations/',
+            ],
+            "environments" => [
+                "default_migration_table" => "{$conn['prefix']}migrations",
+                "default_database" => "prod",
+                "prod" => [
+                    "adapter" => "mysql",
+                    "host" => $conn['host'],
+                    "name" => $conn['database'],
+                    "user" => $conn['user'],
+                    "pass" => $conn['password'],
+                    "charset" => $conn['encoding'],
+                    "table_prefix" => $conn['prefix'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Allow plugins to rewrite the path.
+     *
+     * @return void
+     */
+    private function allowPathRewrite() {
+        $request = $this->_services->request;
+        $new = $this->_services->router->allowRewrite($request);
+        if ($new === $request) {
+            return;
+        }
+
+        $this->_services->setValue('request', $new);
+        $this->_services->context->initialize($new);
+    }
+
+    /**
+     * Flag this application as running for testing (PHPUnit)
+     *
+     * @param bool $testing Is testing application
+     * @return void
+     */
+    public static function setTestingApplication($testing = true) {
+        self::$testing_app = $testing;
+    }
+
+    /**
+     * Checks if the application is running in PHPUnit
+     * @return bool
+     */
+    public static function isTestingApplication() {
+        return (bool) self::$testing_app;
+    }
+
+    /**
+     * Intercepts, logs, and displays uncaught exceptions.
+     *
+     * To use a viewtype other than failsafe, create the views:
+     *  <viewtype>/messages/exceptions/admin_exception
+     *  <viewtype>/messages/exceptions/exception
+     * See the json viewtype for an example.
+     *
+     * @warning This function should never be called directly.
+     *
+     * @see http://www.php.net/set-exception-handler
+     *
+     * @param \Exception|\Error $exception The exception/error being handled
+     *
+     * @return void
+     * @access private
+     */
+    public function handleExceptions($exception) {
+        $timestamp = time();
+        error_log("Exception at time $timestamp: $exception");
+
+        // Wipe any existing output buffer
+        ob_end_clean();
+
+        // make sure the error isn't cached
+        header("Cache-Control: no-cache, must-revalidate", true);
+        header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', true);
+
+        if ($exception instanceof \InstallationException) {
+            forward('/install.php');
+        }
+
+        if (!self::isCoreLoaded()) {
+            http_response_code(500);
+            echo "Exception loading Elgg core. Check log at time $timestamp";
+            return;
+        }
+
+        try {
+            // allow custom scripts to trigger on exception
+            // value in settings.php should be a system path to a file to include
+            $exception_include = $this->_services->config->exception_include;
+
+            if ($exception_include && is_file($exception_include)) {
+                ob_start();
+
+                // don't isolate, these scripts may use the local $exception var.
+                include $exception_include;
+
+                $exception_output = ob_get_clean();
+
+                // if content is returned from the custom handler we will output
+                // that instead of our default failsafe view
+                if (!empty($exception_output)) {
+                    echo $exception_output;
+                    exit;
+                }
+            }
+
+            if (elgg_is_xhr()) {
+                elgg_set_viewtype('json');
+                $response = new \Symfony\Component\HttpFoundation\JsonResponse(null, 500);
+            } else {
+                elgg_set_viewtype('failsafe');
+                $response = new \Symfony\Component\HttpFoundation\Response('', 500);
+            }
+
+            if (elgg_is_admin_logged_in()) {
+                $body = elgg_view("messages/exceptions/admin_exception", [
+                    'object' => $exception,
+                    'ts' => $timestamp
+                ]);
+            } else {
+                $body = elgg_view("messages/exceptions/exception", [
+                    'object' => $exception,
+                    'ts' => $timestamp
+                ]);
+            }
+
+            $response->setContent(elgg_view_page(elgg_echo('exception:title'), $body));
+            $response->send();
+        } catch (\Exception $e) {
+            $timestamp = time();
+            $message = $e->getMessage();
+            http_response_code(500);
+            echo "Fatal error in exception handler. Check log for Exception at time $timestamp";
+            error_log("Exception at time $timestamp : fatal error in exception handler : $message");
+        }
+    }
+
+    /**
+     * Intercepts catchable PHP errors.
+     *
+     * @warning This function should never be called directly.
+     *
+     * @internal
+     * For catchable fatal errors, throws an Exception with the error.
+     *
+     * For non-fatal errors, depending upon the debug settings, either
+     * log the error or ignore it.
+     *
+     * @see http://www.php.net/set-error-handler
+     *
+     * @param int    $errno    The level of the error raised
+     * @param string $errmsg   The error message
+     * @param string $filename The filename the error was raised in
+     * @param int    $linenum  The line number the error was raised at
+     * @param array  $vars     An array that points to the active symbol table where error occurred
+     *
+     * @return true
+     * @throws \Exception
+     * @access private
+     */
+    public function handleErrors($errno, $errmsg, $filename, $linenum, $vars) {
+        $error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)";
+
+        $log = function ($message, $level) {
+            if (self::isCoreLoaded()) {
+                return elgg_log($message, $level);
+            }
+
+            return false;
+        };
+
+        switch ($errno) {
+            case E_USER_ERROR:
+                if (!$log("PHP: $error", 'ERROR')) {
+                    error_log("PHP ERROR: $error");
+                }
+                if (self::isCoreLoaded()) {
+                    register_error("ERROR: $error");
+                }
+
+                // Since this is a fatal error, we want to stop any further execution but do so gracefully.
+                throw new \Exception($error);
+                break;
+
+            case E_WARNING :
+            case E_USER_WARNING :
+            case E_RECOVERABLE_ERROR: // (e.g. type hint violation)
+
+                // check if the error wasn't suppressed by the error control operator (@)
+                if (error_reporting() && !$log("PHP: $error", 'WARNING')) {
+                    error_log("PHP WARNING: $error");
+                }
+                break;
+
+            default:
+                if (function_exists('_elgg_config')) {
+                    $debug = _elgg_config()->debug;
+                } else {
+                    $debug = isset($GLOBALS['CONFIG']->debug) ? $GLOBALS['CONFIG']->debug : null;
+                }
+                if ($debug !== 'NOTICE') {
+                    return true;
+                }
+
+                if (!$log("PHP (errno $errno): $error", 'NOTICE')) {
+                    error_log("PHP NOTICE: $error");
+                }
+        }
+
+        return true;
+    }
+
+    /**
+     * Does nothing.
+     *
+     * @return void
+     * @deprecated
+     */
+    public function loadSettings() {
+        trigger_error(__METHOD__ . ' is no longer needed and will be removed.');
+    }
+
+    /**
+     * Get all engine/lib library filenames
+     *
+     * @note We can't just pull in all directory files because some users leave old files in place.
+     *
+     * @return string[]
+     */
+    private static function getEngineLibs() {
+        return [
+            'access.php',
+            'actions.php',
+            'admin.php',
+            'annotations.php',
+            'autoloader.php',
+            'cache.php',
+            'comments.php',
+            'configuration.php',
+            'constants.php',
+            'cron.php',
+            'database.php',
+            'deprecated-3.0.php',
+            'elgglib.php',
+            'entities.php',
+            'filestore.php',
+            'group.php',
+            'input.php',
+            'languages.php',
+            'mb_wrapper.php',
+            'memcache.php',
+            'metadata.php',
+            'metastrings.php',
+            'navigation.php',
+            'notification.php',
+            'output.php',
+            'pagehandler.php',
+            'pageowner.php',
+            'pam.php',
+            'plugins.php',
+            'private_settings.php',
+            'relationships.php',
+            'river.php',
+            'sessions.php',
+            'statistics.php',
+            'system_log.php',
+            'tags.php',
+            'upgrade.php',
+            'user_settings.php',
+            'users.php',
+            'views.php',
+            'widgets.php',
+        ];
+    }
 }

engine/lib/autoloader.php

Indentation +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
  * @access private
  */
 function _elgg_services() {
-	return elgg()->_services;
+    return elgg()->_services;
 }
 
 /**
@@ -24,7 +24,7 @@ 
  * @access private
  */
 function _elgg_config() {
-	return _elgg_services()->config;
+    return _elgg_services()->config;
 }
 
 /**
@@ -33,7 +33,7 @@ 
  * @access private
  */
 function _elgg_delete_autoload_cache() {
-	_elgg_services()->autoloadManager->deleteCache();
+    _elgg_services()->autoloadManager->deleteCache();
 }
 
 
@@ -41,5 +41,5 @@ 
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	$events->registerHandler('upgrade', 'all', '_elgg_delete_autoload_cache', 600);
+    $events->registerHandler('upgrade', 'all', '_elgg_delete_autoload_cache', 600);
 };

engine/classes/Elgg/Di/ServiceProvider.php

Indentation +400 added lines, -400 removed lines

@@ -95,404 +95,404 @@
  */
 class ServiceProvider extends DiContainer {
 
-	/**
-	 * Constructor
-	 *
-	 * @param Config $config Elgg Config service
-	 */
-	public function __construct(Config $config) {
-
-		$this->setFactory('autoloadManager', function(ServiceProvider $c) {
-			$manager = new \Elgg\AutoloadManager($c->classLoader);
-			if (!$c->config->AutoloaderManager_skip_storage) {
-				$manager->setStorage($c->fileCache);
-				$manager->loadCache();
-			}
-			return $manager;
-		});
-
-		$this->setFactory('accessCache', function(ServiceProvider $c) {
-			return new \ElggStaticVariableCache('access');
-		});
-
-		$this->setFactory('accessCollections', function(ServiceProvider $c) {
-			return new \Elgg\Database\AccessCollections(
-					$c->config, $c->db, $c->entityTable, $c->accessCache, $c->hooks, $c->session, $c->translator);
-		});
-
-		$this->setFactory('actions', function(ServiceProvider $c) {
-			return new \Elgg\ActionsService($c->config, $c->session, $c->crypto);
-		});
-
-		$this->setClassName('adminNotices', \Elgg\Database\AdminNotices::class);
-
-		$this->setFactory('ajax', function(ServiceProvider $c) {
-			return new \Elgg\Ajax\Service($c->hooks, $c->systemMessages, $c->input, $c->amdConfig);
-		});
-
-		$this->setFactory('amdConfig', function(ServiceProvider $c) {
-			$obj = new \Elgg\Amd\Config($c->hooks);
-			$obj->setBaseUrl($c->simpleCache->getRoot());
-			return $obj;
-		});
-
-		$this->setFactory('annotations', function(ServiceProvider $c) {
-			return new \Elgg\Database\Annotations($c->db, $c->session, $c->hooks->getEvents());
-		});
-
-		$this->setClassName('autoP', \ElggAutoP::class);
-
-		$this->setFactory('boot', function(ServiceProvider $c) {
-			$boot = new \Elgg\BootService();
-			if ($c->config->enable_profiling) {
-				$boot->setTimer($c->timer);
-			}
-			return $boot;
-		});
-
-		$this->setFactory('batchUpgrader', function(ServiceProvider $c) {
-			return new \Elgg\BatchUpgrader($c->config);
-		});
-
-		$this->setFactory('cacheHandler', function(ServiceProvider $c) {
-			$simplecache_enabled = $c->config->simplecache_enabled;
-			if ($simplecache_enabled === null) {
-				$simplecache_enabled = $c->configTable->get('simplecache_enabled');
-			}
-			return new \Elgg\Application\CacheHandler($c->config, $c->request, $simplecache_enabled);
-		});
-
-		$this->setFactory('classLoader', function(ServiceProvider $c) {
-			$loader = new \Elgg\ClassLoader(new \Elgg\ClassMap());
-			$loader->register();
-			return $loader;
-		});
-
-		$this->setValue('config', $config);
-
-		$this->setFactory('configTable', function(ServiceProvider $c) {
-			return new \Elgg\Database\ConfigTable($c->db, $c->boot, $c->logger);
-		});
-
-		$this->setFactory('context', function(ServiceProvider $c) {
-			$context = new \Elgg\Context();
-			$context->initialize($c->request);
-			return $context;
-		});
-
-		$this->setClassName('crypto', \ElggCrypto::class);
-
-		$this->setFactory('db', function(ServiceProvider $c) {
-			$db = new \Elgg\Database($c->dbConfig);
-			$db->setLogger($c->logger);
-
-			if ($c->config->profiling_sql) {
-				$db->setTimer($c->timer);
-			}
-
-			return $db;
-		});
-
-		$this->setFactory('dbConfig', function(ServiceProvider $c) {
-			$config = $c->config;
-			$db_config = \Elgg\Database\DbConfig::fromElggConfig($config);
-
-			// get this stuff out of config!
-			unset($config->db);
-			unset($config->dbname);
-			unset($config->dbhost);
-			unset($config->dbuser);
-			unset($config->dbpass);
-
-			return $db_config;
-		});
-
-		$this->setFactory('deprecation', function(ServiceProvider $c) {
-			return new \Elgg\DeprecationService($c->logger);
-		});
-
-		$this->setFactory('emails', function(ServiceProvider $c) {
-			return new \Elgg\EmailService($c->config, $c->hooks, $c->mailer, $c->logger);
-		});
-
-		$this->setFactory('entityCache', function(ServiceProvider $c) {
-			return new \Elgg\Cache\EntityCache($c->session, $c->metadataCache);
-		});
-
-		$this->setFactory('entityPreloader', function(ServiceProvider $c) {
-			return new \Elgg\EntityPreloader($c->entityCache, $c->entityTable);
-		});
-
-		$this->setFactory('entityTable', function(ServiceProvider $c) {
-			return new \Elgg\Database\EntityTable(
-				$c->config,
-				$c->db,
-				$c->entityCache,
-				$c->metadataCache,
-				$c->subtypeTable,
-				$c->hooks->getEvents(),
-				$c->session,
-				$c->translator,
-				$c->logger
-			);
-		});
-
-		$this->setClassName('externalFiles', \Elgg\Assets\ExternalFiles::class);
-
-		$this->setFactory('fileCache', function(ServiceProvider $c) {
-			return new \ElggFileCache($c->config->cacheroot . 'system_cache/');
-		});
-
-		$this->setFactory('filestore', function(ServiceProvider $c) {
-			return new \ElggDiskFilestore($c->config->dataroot);
-		});
-
-		$this->setFactory('forms', function(ServiceProvider $c) {
-			return new \Elgg\FormsService($c->views, $c->logger);
-		});
-
-		$this->setClassName('handlers', \Elgg\HandlersService::class);
-
-		$this->setFactory('hmac', function(ServiceProvider $c) {
-			return new \Elgg\Security\HmacFactory($c->siteSecret, $c->crypto);
-		});
-
-		$this->setFactory('hooks', function(ServiceProvider $c) {
-			$events = new \Elgg\EventsService($c->handlers);
-			if ($c->config->enable_profiling) {
-				$events->setTimer($c->timer);
-			}
-			return new \Elgg\PluginHooksService($events);
-		});
-
-		$this->setFactory('iconService', function(ServiceProvider $c) {
-			return new \Elgg\EntityIconService($c->config, $c->hooks, $c->request, $c->logger, $c->entityTable);
-		});
-
-		$this->setClassName('input', \Elgg\Http\Input::class);
-
-		$this->setFactory('imageService', function(ServiceProvider $c) {
-			$imagine = new \Imagine\Gd\Imagine();
-			return new \Elgg\ImageService($imagine, $c->config);
-		});
-
-		$this->setFactory('logger', function (ServiceProvider $c) {
-			$logger = new \Elgg\Logger($c->hooks, $c->context);
-			$logger->setLevel($c->config->debug);
-			return $logger;
-		});
-
-		// TODO(evan): Support configurable transports...
-		$this->setClassName('mailer', 'Zend\Mail\Transport\Sendmail');
-
-		$this->setFactory('menus', function(ServiceProvider $c) {
-			return new \Elgg\Menu\Service($c->hooks, $c->config);
-		});
-
-		$this->setFactory('metadataCache', function (ServiceProvider $c) {
-			$cache = _elgg_get_memcache('metadata');
-			return new \Elgg\Cache\MetadataCache($cache);
-		});
-
-		$this->setFactory('memcacheStashPool', function(ServiceProvider $c) {
-			if (!$c->config->memcache) {
-				return null;
-			}
-
-			$servers = $c->config->memcache_servers;
-			if (!$servers) {
-				return null;
-			}
-			$driver = new \Stash\Driver\Memcache([
-				'servers' => $servers,
-			]);
-			return new \Stash\Pool($driver);
-		});
-
-		$this->setFactory('metadataTable', function(ServiceProvider $c) {
-			// TODO(ewinslow): Use Pool instead of MetadataCache for caching
-			return new \Elgg\Database\MetadataTable(
-				$c->metadataCache, $c->db, $c->entityTable, $c->hooks->getEvents(), $c->session);
-		});
-
-		$this->setFactory('mutex', function(ServiceProvider $c) {
-			return new \Elgg\Database\Mutex(
-				$c->db,
-				$c->logger
-			);
-		});
-
-		$this->setFactory('notifications', function(ServiceProvider $c) {
-			// @todo move queue in service provider
-			$queue_name = \Elgg\Notifications\NotificationsService::QUEUE_NAME;
-			$queue = new \Elgg\Queue\DatabaseQueue($queue_name, $c->db);
-			$sub = new \Elgg\Notifications\SubscriptionsService($c->db);
-			return new \Elgg\Notifications\NotificationsService($sub, $queue, $c->hooks, $c->session, $c->translator, $c->entityTable, $c->logger);
-		});
-
-		$this->setClassName('nullCache', \Elgg\Cache\NullCache::class);
-
-		$this->setFactory('persistentLogin', function(ServiceProvider $c) {
-			$global_cookies_config = $c->config->getCookieConfig();
-			$cookie_config = $global_cookies_config['remember_me'];
-			$cookie_name = $cookie_config['name'];
-			$cookie_token = $c->request->cookies->get($cookie_name, '');
-			return new \Elgg\PersistentLoginService(
-				$c->db, $c->session, $c->crypto, $cookie_config, $cookie_token);
-		});
-
-		$this->setClassName('passwords', \Elgg\PasswordService::class);
-
-		$this->setFactory('plugins', function(ServiceProvider $c) {
-			$pool = new Pool\InMemory();
-			$plugins = new \Elgg\Database\Plugins($pool, $c->pluginSettingsCache);
-			if ($c->config->enable_profiling) {
-				$plugins->setTimer($c->timer);
-			}
-			return $plugins;
-		});
-
-		$this->setClassName('pluginSettingsCache', \Elgg\Cache\PluginSettingsCache::class);
-
-		$this->setFactory('privateSettings', function(ServiceProvider $c) {
-			return new \Elgg\Database\PrivateSettingsTable($c->db, $c->entityTable, $c->pluginSettingsCache);
-		});
-
-		$this->setFactory('publicDb', function(ServiceProvider $c) {
-			return new \Elgg\Application\Database($c->db);
-		});
-
-		$this->setFactory('queryCounter', function(ServiceProvider $c) {
-			return new \Elgg\Database\QueryCounter($c->db);
-		}, false);
-
-		$this->setFactory('redirects', function(ServiceProvider $c) {
-			$url = current_page_url();
-			$is_xhr = $c->request->isXmlHttpRequest();
-			return new \Elgg\RedirectService($c->session, $is_xhr, $c->config->wwwroot, $url);
-		});
-
-		$this->setFactory('relationshipsTable', function(ServiceProvider $c) {
-			return new \Elgg\Database\RelationshipsTable($c->db, $c->entityTable, $c->metadataTable, $c->hooks->getEvents());
-		});
-
-		$this->setFactory('request', [\Elgg\Http\Request::class, 'createFromGlobals']);
-
-		$this->setFactory('responseFactory', function(ServiceProvider $c) {
-			if (PHP_SAPI === 'cli') {
-				$transport = new \Elgg\Http\OutputBufferTransport();
-			} else {
-				$transport = new \Elgg\Http\HttpProtocolTransport();
-			}
-			return new \Elgg\Http\ResponseFactory($c->request, $c->hooks, $c->ajax, $transport);
-		});
-
-		$this->setFactory('router', function(ServiceProvider $c) {
-			// TODO(evan): Init routes from plugins or cache
-			$router = new \Elgg\Router($c->hooks);
-			if ($c->config->enable_profiling) {
-				$router->setTimer($c->timer);
-			}
-			return $router;
-		});
-
-		$this->setFactory('seeder', function(ServiceProvider $c) {
-			return new \Elgg\Database\Seeder($c->hooks);
-		});
-
-		$this->setFactory('serveFileHandler', function(ServiceProvider $c) {
-			return new \Elgg\Application\ServeFileHandler($c->hmac, $c->config);
-		});
-
-		$this->setFactory('session', function(ServiceProvider $c) {
-			return \ElggSession::fromDatabase($c->config, $c->db);
-		});
-
-		$this->setClassName('urlSigner', \Elgg\Security\UrlSigner::class);
-
-		$this->setFactory('simpleCache', function(ServiceProvider $c) {
-			return new \Elgg\Cache\SimpleCache($c->config);
-		});
-
-		/**
-		 * If the key is in the settings file, this is injected early.
-		 *
-		 * @see \Elgg\Application::initConfig
-		 */
-		$this->setFactory('siteSecret', function(ServiceProvider $c) {
-			return \Elgg\Database\SiteSecret::fromDatabase($c->configTable);
-		});
-
-		$this->setClassName('stickyForms', \Elgg\Forms\StickyForms::class);
-
-		$this->setFactory('subtypeTable', function(ServiceProvider $c) {
-			return new \Elgg\Database\SubtypeTable($c->db);
-		});
-
-		$this->setFactory('systemCache', function (ServiceProvider $c) {
-			$cache = new \Elgg\Cache\SystemCache($c->fileCache, $c->config);
-			if ($c->config->enable_profiling) {
-				$cache->setTimer($c->timer);
-			}
-			return $cache;
-		});
-
-		$this->setFactory('systemMessages', function(ServiceProvider $c) {
-			return new \Elgg\SystemMessagesService($c->session);
-		});
-
-		$this->setClassName('table_columns', \Elgg\Views\TableColumn\ColumnFactory::class);
-
-		$this->setClassName('timer', \Elgg\Timer::class);
-
-		$this->setFactory('translator', function(ServiceProvider $c) {
-			return new \Elgg\I18n\Translator($c->config);
-		});
-
-		$this->setFactory('uploads', function(ServiceProvider $c) {
-			return new \Elgg\UploadService($c->request);
-		});
-
-		$this->setFactory('upgrades', function(ServiceProvider $c) {
-			return new \Elgg\UpgradeService(
-				$c->translator,
-				$c->hooks,
-				$c->config,
-				$c->logger,
-				$c->mutex
-			);
-		});
-
-		$this->setFactory('userCapabilities', function(ServiceProvider $c) {
-			return new \Elgg\UserCapabilities($c->hooks, $c->entityTable, $c->session);
-		});
-
-		$this->setFactory('usersTable', function(ServiceProvider $c) {
-			return new \Elgg\Database\UsersTable(
-				$c->config,
-				$c->db,
-				$c->entityTable,
-				$c->entityCache,
-				$c->hooks->getEvents()
-			);
-		});
-
-		$this->setFactory('upgradeLocator', function(ServiceProvider $c) {
-			return new \Elgg\Upgrade\Locator(
-				$c->plugins,
-				$c->logger,
-				$c->privateSettings
-			);
-		});
-
-		$this->setFactory('views', function(ServiceProvider $c) {
-			return new \Elgg\ViewsService($c->hooks, $c->logger, $c->input);
-		});
-
-		$this->setFactory('viewCacher', function(ServiceProvider $c) {
-			return new \Elgg\Cache\ViewCacher($c->views, $c->config);
-		});
-
-		$this->setClassName('widgets', \Elgg\WidgetsService::class);
-	}
+    /**
+     * Constructor
+     *
+     * @param Config $config Elgg Config service
+     */
+    public function __construct(Config $config) {
+
+        $this->setFactory('autoloadManager', function(ServiceProvider $c) {
+            $manager = new \Elgg\AutoloadManager($c->classLoader);
+            if (!$c->config->AutoloaderManager_skip_storage) {
+                $manager->setStorage($c->fileCache);
+                $manager->loadCache();
+            }
+            return $manager;
+        });
+
+        $this->setFactory('accessCache', function(ServiceProvider $c) {
+            return new \ElggStaticVariableCache('access');
+        });
+
+        $this->setFactory('accessCollections', function(ServiceProvider $c) {
+            return new \Elgg\Database\AccessCollections(
+                    $c->config, $c->db, $c->entityTable, $c->accessCache, $c->hooks, $c->session, $c->translator);
+        });
+
+        $this->setFactory('actions', function(ServiceProvider $c) {
+            return new \Elgg\ActionsService($c->config, $c->session, $c->crypto);
+        });
+
+        $this->setClassName('adminNotices', \Elgg\Database\AdminNotices::class);
+
+        $this->setFactory('ajax', function(ServiceProvider $c) {
+            return new \Elgg\Ajax\Service($c->hooks, $c->systemMessages, $c->input, $c->amdConfig);
+        });
+
+        $this->setFactory('amdConfig', function(ServiceProvider $c) {
+            $obj = new \Elgg\Amd\Config($c->hooks);
+            $obj->setBaseUrl($c->simpleCache->getRoot());
+            return $obj;
+        });
+
+        $this->setFactory('annotations', function(ServiceProvider $c) {
+            return new \Elgg\Database\Annotations($c->db, $c->session, $c->hooks->getEvents());
+        });
+
+        $this->setClassName('autoP', \ElggAutoP::class);
+
+        $this->setFactory('boot', function(ServiceProvider $c) {
+            $boot = new \Elgg\BootService();
+            if ($c->config->enable_profiling) {
+                $boot->setTimer($c->timer);
+            }
+            return $boot;
+        });
+
+        $this->setFactory('batchUpgrader', function(ServiceProvider $c) {
+            return new \Elgg\BatchUpgrader($c->config);
+        });
+
+        $this->setFactory('cacheHandler', function(ServiceProvider $c) {
+            $simplecache_enabled = $c->config->simplecache_enabled;
+            if ($simplecache_enabled === null) {
+                $simplecache_enabled = $c->configTable->get('simplecache_enabled');
+            }
+            return new \Elgg\Application\CacheHandler($c->config, $c->request, $simplecache_enabled);
+        });
+
+        $this->setFactory('classLoader', function(ServiceProvider $c) {
+            $loader = new \Elgg\ClassLoader(new \Elgg\ClassMap());
+            $loader->register();
+            return $loader;
+        });
+
+        $this->setValue('config', $config);
+
+        $this->setFactory('configTable', function(ServiceProvider $c) {
+            return new \Elgg\Database\ConfigTable($c->db, $c->boot, $c->logger);
+        });
+
+        $this->setFactory('context', function(ServiceProvider $c) {
+            $context = new \Elgg\Context();
+            $context->initialize($c->request);
+            return $context;
+        });
+
+        $this->setClassName('crypto', \ElggCrypto::class);
+
+        $this->setFactory('db', function(ServiceProvider $c) {
+            $db = new \Elgg\Database($c->dbConfig);
+            $db->setLogger($c->logger);
+
+            if ($c->config->profiling_sql) {
+                $db->setTimer($c->timer);
+            }
+
+            return $db;
+        });
+
+        $this->setFactory('dbConfig', function(ServiceProvider $c) {
+            $config = $c->config;
+            $db_config = \Elgg\Database\DbConfig::fromElggConfig($config);
+
+            // get this stuff out of config!
+            unset($config->db);
+            unset($config->dbname);
+            unset($config->dbhost);
+            unset($config->dbuser);
+            unset($config->dbpass);
+
+            return $db_config;
+        });
+
+        $this->setFactory('deprecation', function(ServiceProvider $c) {
+            return new \Elgg\DeprecationService($c->logger);
+        });
+
+        $this->setFactory('emails', function(ServiceProvider $c) {
+            return new \Elgg\EmailService($c->config, $c->hooks, $c->mailer, $c->logger);
+        });
+
+        $this->setFactory('entityCache', function(ServiceProvider $c) {
+            return new \Elgg\Cache\EntityCache($c->session, $c->metadataCache);
+        });
+
+        $this->setFactory('entityPreloader', function(ServiceProvider $c) {
+            return new \Elgg\EntityPreloader($c->entityCache, $c->entityTable);
+        });
+
+        $this->setFactory('entityTable', function(ServiceProvider $c) {
+            return new \Elgg\Database\EntityTable(
+                $c->config,
+                $c->db,
+                $c->entityCache,
+                $c->metadataCache,
+                $c->subtypeTable,
+                $c->hooks->getEvents(),
+                $c->session,
+                $c->translator,
+                $c->logger
+            );
+        });
+
+        $this->setClassName('externalFiles', \Elgg\Assets\ExternalFiles::class);
+
+        $this->setFactory('fileCache', function(ServiceProvider $c) {
+            return new \ElggFileCache($c->config->cacheroot . 'system_cache/');
+        });
+
+        $this->setFactory('filestore', function(ServiceProvider $c) {
+            return new \ElggDiskFilestore($c->config->dataroot);
+        });
+
+        $this->setFactory('forms', function(ServiceProvider $c) {
+            return new \Elgg\FormsService($c->views, $c->logger);
+        });
+
+        $this->setClassName('handlers', \Elgg\HandlersService::class);
+
+        $this->setFactory('hmac', function(ServiceProvider $c) {
+            return new \Elgg\Security\HmacFactory($c->siteSecret, $c->crypto);
+        });
+
+        $this->setFactory('hooks', function(ServiceProvider $c) {
+            $events = new \Elgg\EventsService($c->handlers);
+            if ($c->config->enable_profiling) {
+                $events->setTimer($c->timer);
+            }
+            return new \Elgg\PluginHooksService($events);
+        });
+
+        $this->setFactory('iconService', function(ServiceProvider $c) {
+            return new \Elgg\EntityIconService($c->config, $c->hooks, $c->request, $c->logger, $c->entityTable);
+        });
+
+        $this->setClassName('input', \Elgg\Http\Input::class);
+
+        $this->setFactory('imageService', function(ServiceProvider $c) {
+            $imagine = new \Imagine\Gd\Imagine();
+            return new \Elgg\ImageService($imagine, $c->config);
+        });
+
+        $this->setFactory('logger', function (ServiceProvider $c) {
+            $logger = new \Elgg\Logger($c->hooks, $c->context);
+            $logger->setLevel($c->config->debug);
+            return $logger;
+        });
+
+        // TODO(evan): Support configurable transports...
+        $this->setClassName('mailer', 'Zend\Mail\Transport\Sendmail');
+
+        $this->setFactory('menus', function(ServiceProvider $c) {
+            return new \Elgg\Menu\Service($c->hooks, $c->config);
+        });
+
+        $this->setFactory('metadataCache', function (ServiceProvider $c) {
+            $cache = _elgg_get_memcache('metadata');
+            return new \Elgg\Cache\MetadataCache($cache);
+        });
+
+        $this->setFactory('memcacheStashPool', function(ServiceProvider $c) {
+            if (!$c->config->memcache) {
+                return null;
+            }
+
+            $servers = $c->config->memcache_servers;
+            if (!$servers) {
+                return null;
+            }
+            $driver = new \Stash\Driver\Memcache([
+                'servers' => $servers,
+            ]);
+            return new \Stash\Pool($driver);
+        });
+
+        $this->setFactory('metadataTable', function(ServiceProvider $c) {
+            // TODO(ewinslow): Use Pool instead of MetadataCache for caching
+            return new \Elgg\Database\MetadataTable(
+                $c->metadataCache, $c->db, $c->entityTable, $c->hooks->getEvents(), $c->session);
+        });
+
+        $this->setFactory('mutex', function(ServiceProvider $c) {
+            return new \Elgg\Database\Mutex(
+                $c->db,
+                $c->logger
+            );
+        });
+
+        $this->setFactory('notifications', function(ServiceProvider $c) {
+            // @todo move queue in service provider
+            $queue_name = \Elgg\Notifications\NotificationsService::QUEUE_NAME;
+            $queue = new \Elgg\Queue\DatabaseQueue($queue_name, $c->db);
+            $sub = new \Elgg\Notifications\SubscriptionsService($c->db);
+            return new \Elgg\Notifications\NotificationsService($sub, $queue, $c->hooks, $c->session, $c->translator, $c->entityTable, $c->logger);
+        });
+
+        $this->setClassName('nullCache', \Elgg\Cache\NullCache::class);
+
+        $this->setFactory('persistentLogin', function(ServiceProvider $c) {
+            $global_cookies_config = $c->config->getCookieConfig();
+            $cookie_config = $global_cookies_config['remember_me'];
+            $cookie_name = $cookie_config['name'];
+            $cookie_token = $c->request->cookies->get($cookie_name, '');
+            return new \Elgg\PersistentLoginService(
+                $c->db, $c->session, $c->crypto, $cookie_config, $cookie_token);
+        });
+
+        $this->setClassName('passwords', \Elgg\PasswordService::class);
+
+        $this->setFactory('plugins', function(ServiceProvider $c) {
+            $pool = new Pool\InMemory();
+            $plugins = new \Elgg\Database\Plugins($pool, $c->pluginSettingsCache);
+            if ($c->config->enable_profiling) {
+                $plugins->setTimer($c->timer);
+            }
+            return $plugins;
+        });
+
+        $this->setClassName('pluginSettingsCache', \Elgg\Cache\PluginSettingsCache::class);
+
+        $this->setFactory('privateSettings', function(ServiceProvider $c) {
+            return new \Elgg\Database\PrivateSettingsTable($c->db, $c->entityTable, $c->pluginSettingsCache);
+        });
+
+        $this->setFactory('publicDb', function(ServiceProvider $c) {
+            return new \Elgg\Application\Database($c->db);
+        });
+
+        $this->setFactory('queryCounter', function(ServiceProvider $c) {
+            return new \Elgg\Database\QueryCounter($c->db);
+        }, false);
+
+        $this->setFactory('redirects', function(ServiceProvider $c) {
+            $url = current_page_url();
+            $is_xhr = $c->request->isXmlHttpRequest();
+            return new \Elgg\RedirectService($c->session, $is_xhr, $c->config->wwwroot, $url);
+        });
+
+        $this->setFactory('relationshipsTable', function(ServiceProvider $c) {
+            return new \Elgg\Database\RelationshipsTable($c->db, $c->entityTable, $c->metadataTable, $c->hooks->getEvents());
+        });
+
+        $this->setFactory('request', [\Elgg\Http\Request::class, 'createFromGlobals']);
+
+        $this->setFactory('responseFactory', function(ServiceProvider $c) {
+            if (PHP_SAPI === 'cli') {
+                $transport = new \Elgg\Http\OutputBufferTransport();
+            } else {
+                $transport = new \Elgg\Http\HttpProtocolTransport();
+            }
+            return new \Elgg\Http\ResponseFactory($c->request, $c->hooks, $c->ajax, $transport);
+        });
+
+        $this->setFactory('router', function(ServiceProvider $c) {
+            // TODO(evan): Init routes from plugins or cache
+            $router = new \Elgg\Router($c->hooks);
+            if ($c->config->enable_profiling) {
+                $router->setTimer($c->timer);
+            }
+            return $router;
+        });
+
+        $this->setFactory('seeder', function(ServiceProvider $c) {
+            return new \Elgg\Database\Seeder($c->hooks);
+        });
+
+        $this->setFactory('serveFileHandler', function(ServiceProvider $c) {
+            return new \Elgg\Application\ServeFileHandler($c->hmac, $c->config);
+        });
+
+        $this->setFactory('session', function(ServiceProvider $c) {
+            return \ElggSession::fromDatabase($c->config, $c->db);
+        });
+
+        $this->setClassName('urlSigner', \Elgg\Security\UrlSigner::class);
+
+        $this->setFactory('simpleCache', function(ServiceProvider $c) {
+            return new \Elgg\Cache\SimpleCache($c->config);
+        });
+
+        /**
+         * If the key is in the settings file, this is injected early.
+         *
+         * @see \Elgg\Application::initConfig
+         */
+        $this->setFactory('siteSecret', function(ServiceProvider $c) {
+            return \Elgg\Database\SiteSecret::fromDatabase($c->configTable);
+        });
+
+        $this->setClassName('stickyForms', \Elgg\Forms\StickyForms::class);
+
+        $this->setFactory('subtypeTable', function(ServiceProvider $c) {
+            return new \Elgg\Database\SubtypeTable($c->db);
+        });
+
+        $this->setFactory('systemCache', function (ServiceProvider $c) {
+            $cache = new \Elgg\Cache\SystemCache($c->fileCache, $c->config);
+            if ($c->config->enable_profiling) {
+                $cache->setTimer($c->timer);
+            }
+            return $cache;
+        });
+
+        $this->setFactory('systemMessages', function(ServiceProvider $c) {
+            return new \Elgg\SystemMessagesService($c->session);
+        });
+
+        $this->setClassName('table_columns', \Elgg\Views\TableColumn\ColumnFactory::class);
+
+        $this->setClassName('timer', \Elgg\Timer::class);
+
+        $this->setFactory('translator', function(ServiceProvider $c) {
+            return new \Elgg\I18n\Translator($c->config);
+        });
+
+        $this->setFactory('uploads', function(ServiceProvider $c) {
+            return new \Elgg\UploadService($c->request);
+        });
+
+        $this->setFactory('upgrades', function(ServiceProvider $c) {
+            return new \Elgg\UpgradeService(
+                $c->translator,
+                $c->hooks,
+                $c->config,
+                $c->logger,
+                $c->mutex
+            );
+        });
+
+        $this->setFactory('userCapabilities', function(ServiceProvider $c) {
+            return new \Elgg\UserCapabilities($c->hooks, $c->entityTable, $c->session);
+        });
+
+        $this->setFactory('usersTable', function(ServiceProvider $c) {
+            return new \Elgg\Database\UsersTable(
+                $c->config,
+                $c->db,
+                $c->entityTable,
+                $c->entityCache,
+                $c->hooks->getEvents()
+            );
+        });
+
+        $this->setFactory('upgradeLocator', function(ServiceProvider $c) {
+            return new \Elgg\Upgrade\Locator(
+                $c->plugins,
+                $c->logger,
+                $c->privateSettings
+            );
+        });
+
+        $this->setFactory('views', function(ServiceProvider $c) {
+            return new \Elgg\ViewsService($c->hooks, $c->logger, $c->input);
+        });
+
+        $this->setFactory('viewCacher', function(ServiceProvider $c) {
+            return new \Elgg\Cache\ViewCacher($c->views, $c->config);
+        });
+
+        $this->setClassName('widgets', \Elgg\WidgetsService::class);
+    }
 }

engine/classes/Elgg/Application/CacheHandler.php

Indentation +348 added lines, -348 removed lines

@@ -15,358 +15,358 @@
  */
 class CacheHandler {
 	
-	public static $extensions = [
-		'bmp' => "image/bmp",
-		'css' => "text/css",
-		'gif' => "image/gif",
-		'html' => "text/html",
-		'ico' => "image/x-icon",
-		'jpeg' => "image/jpeg",
-		'jpg' => "image/jpeg",
-		'js' => "application/javascript",
-		'json' => "application/json",
-		'png' => "image/png",
-		'svg' => "image/svg+xml",
-		'swf' => "application/x-shockwave-flash",
-		'tiff' => "image/tiff",
-		'webp' => "image/webp",
-		'xml' => "text/xml",
-		'eot' => "application/vnd.ms-fontobject",
-		'ttf' => "application/font-ttf",
-		'woff' => "application/font-woff",
-		'woff2' => "application/font-woff2",
-		'otf' => "application/font-otf",
-	];
-
-	public static $utf8_content_types = [
-		"text/css",
-		"text/html",
-		"application/javascript",
-		"application/json",
-		"image/svg+xml",
-		"text/xml",
-	];
-
-	/** @var Config */
-	private $config;
-
-	/** @var Request */
-	private $request;
-
-	/**
-	 * Constructor
-	 *
-	 * @param Config  $config              Elgg configuration
-	 * @param Request $request             HTTP request
-	 * @param bool    $simplecache_enabled Is the simplecache enabled?
-	 */
-	public function __construct(Config $config, Request $request, $simplecache_enabled) {
-		$this->config = $config;
-		$this->request = $request;
-		$this->simplecache_enabled = $simplecache_enabled;
-	}
-
-	/**
-	 * Handle a request for a cached view
-	 *
-	 * @param Request     $request Elgg request
-	 * @param Application $app     Elgg application
-	 * @return Response (unprepared)
-	 */
-	public function handleRequest(Request $request, Application $app) {
-		$config = $this->config;
-
-		$parsed = $this->parsePath($request->getElggPath());
-		if (!$parsed) {
-			return $this->send403();
-		}
+    public static $extensions = [
+        'bmp' => "image/bmp",
+        'css' => "text/css",
+        'gif' => "image/gif",
+        'html' => "text/html",
+        'ico' => "image/x-icon",
+        'jpeg' => "image/jpeg",
+        'jpg' => "image/jpeg",
+        'js' => "application/javascript",
+        'json' => "application/json",
+        'png' => "image/png",
+        'svg' => "image/svg+xml",
+        'swf' => "application/x-shockwave-flash",
+        'tiff' => "image/tiff",
+        'webp' => "image/webp",
+        'xml' => "text/xml",
+        'eot' => "application/vnd.ms-fontobject",
+        'ttf' => "application/font-ttf",
+        'woff' => "application/font-woff",
+        'woff2' => "application/font-woff2",
+        'otf' => "application/font-otf",
+    ];
+
+    public static $utf8_content_types = [
+        "text/css",
+        "text/html",
+        "application/javascript",
+        "application/json",
+        "image/svg+xml",
+        "text/xml",
+    ];
+
+    /** @var Config */
+    private $config;
+
+    /** @var Request */
+    private $request;
+
+    /**
+     * Constructor
+     *
+     * @param Config  $config              Elgg configuration
+     * @param Request $request             HTTP request
+     * @param bool    $simplecache_enabled Is the simplecache enabled?
+     */
+    public function __construct(Config $config, Request $request, $simplecache_enabled) {
+        $this->config = $config;
+        $this->request = $request;
+        $this->simplecache_enabled = $simplecache_enabled;
+    }
+
+    /**
+     * Handle a request for a cached view
+     *
+     * @param Request     $request Elgg request
+     * @param Application $app     Elgg application
+     * @return Response (unprepared)
+     */
+    public function handleRequest(Request $request, Application $app) {
+        $config = $this->config;
+
+        $parsed = $this->parsePath($request->getElggPath());
+        if (!$parsed) {
+            return $this->send403();
+        }
 		
-		$ts = $parsed['ts'];
-		$view = $parsed['view'];
-		$viewtype = $parsed['viewtype'];
-
-		$content_type = $this->getContentType($view);
-		if (empty($content_type)) {
-			return $this->send403("Asset must have a valid file extension");
-		}
-
-		$response = Response::create();
-		if (in_array($content_type, self::$utf8_content_types)) {
-			$response->headers->set('Content-Type', "$content_type;charset=utf-8", true);
-		} else {
-			$response->headers->set('Content-Type', $content_type, true);
-		}
-
-		if (!$this->simplecache_enabled) {
-			$app->bootCore();
-			header_remove('Cache-Control');
-			header_remove('Pragma');
-			header_remove('Expires');
-
-			if (!$this->isCacheableView($view)) {
-				return $this->send403("Requested view is not an asset");
-			}
-
-			$content = $this->getProcessedView($view, $viewtype);
-			if ($content === false) {
-				return $this->send403();
-			}
-
-			$etag = '"' . md5($content) . '"';
-			$this->setRevalidateHeaders($etag, $response);
-			if ($this->is304($etag)) {
-				return Response::create()->setNotModified();
-			}
-
-			return $response->setContent($content);
-		}
-
-		$etag = "\"$ts\"";
-		if ($this->is304($etag)) {
-			return Response::create()->setNotModified();
-		}
-
-		// trust the client but check for an existing cache file
-		$filename = $config->cacheroot . "views_simplecache/$ts/$viewtype/$view";
-		if (file_exists($filename)) {
-			$this->sendCacheHeaders($etag, $response);
-			return BinaryFileResponse::create($filename, 200, $response->headers->all());
-		}
-
-		// the hard way
-		$app->bootCore();
-		header_remove('Cache-Control');
-		header_remove('Pragma');
-		header_remove('Expires');
-
-		elgg_set_viewtype($viewtype);
-		if (!$this->isCacheableView($view)) {
-			return $this->send403("Requested view is not an asset");
-		}
-
-		$lastcache = (int) $config->lastcache;
-
-		$filename = $config->cacheroot . "views_simplecache/$lastcache/$viewtype/$view";
-
-		if ($lastcache == $ts) {
-			$this->sendCacheHeaders($etag, $response);
-
-			$content = $this->getProcessedView($view, $viewtype);
-
-			$dir_name = dirname($filename);
-			if (!is_dir($dir_name)) {
-				// PHP and the server accessing the cache symlink may be a different user. And here
-				// it's safe to make everything readable anyway.
-				mkdir($dir_name, 0775, true);
-			}
-
-			file_put_contents($filename, $content);
-			chmod($filename, 0664);
-		} else {
-			// if wrong timestamp, don't send HTTP cache
-			$content = $this->getProcessedView($view, $viewtype);
-		}
-
-		return $response->setContent($content);
-	}
-
-	/**
-	 * Parse a request
-	 *
-	 * @param string $path Request URL path
-	 * @return array Cache parameters (empty array if failure)
-	 */
-	public function parsePath($path) {
-		// no '..'
-		if (false !== strpos($path, '..')) {
-			return [];
-		}
-		// only alphanumeric characters plus /, ., -, and _
-		if (preg_match('#[^a-zA-Z0-9/\.\-_]#', $path)) {
-			return [];
-		}
-
-		// testing showed regex to be marginally faster than array / string functions over 100000 reps
-		// it won't make a difference in real life and regex is easier to read.
-		// <ts>/<viewtype>/<name/of/view.and.dots>.<type>
-		if (!preg_match('#^/cache/([0-9]+)/([^/]+)/(.+)$#', $path, $matches)) {
-			return [];
-		}
-
-		return [
-			'ts' => $matches[1],
-			'viewtype' => $matches[2],
-			'view' => $matches[3],
-		];
-	}
-
-	/**
-	 * Is the view cacheable. Language views are handled specially.
-	 *
-	 * @param string $view View name
-	 *
-	 * @return bool
-	 */
-	protected function isCacheableView($view) {
-		if (preg_match('~^languages/(.*)\.js$~', $view, $m)) {
-			return in_array($m[1],  _elgg_services()->translator->getAllLanguageCodes());
-		}
-		return _elgg_services()->views->isCacheableView($view);
-	}
-
-	/**
-	 * Send cache headers
-	 *
-	 * @param string $etag ETag value
-	 * @return void
-	 */
-	protected function sendCacheHeaders($etag, Response $response) {
-		$response->setSharedMaxAge(86400 * 30 * 6);
-		$response->setMaxAge(86400 * 30 * 6);
-		$response->headers->set('ETag', $etag);
-	}
-
-	/**
-	 * Send revalidate cache headers
-	 *
-	 * @param string $etag ETag value
-	 * @return void
-	 */
-	protected function setRevalidateHeaders($etag, Response $response) {
-		$response->headers->set('Cache-Control', "public, max-age=0, must-revalidate", true);
-		$response->headers->set('ETag', $etag);
-	}
-
-	/**
-	 * Send a 304 and exit() if the ETag matches the request
-	 *
-	 * @param string $etag ETag value
-	 * @return bool
-	 */
-	protected function is304($etag) {
-		$if_none_match = $this->request->headers->get('If-None-Match');
-		if ($if_none_match === null) {
-			return false;
-		}
-
-		// strip -gzip and leading /W
-		$if_none_match = trim($if_none_match);
-		if (0 === strpos($if_none_match, 'W/')) {
-			$if_none_match = substr($if_none_match, 2);
-		}
-		$if_none_match = str_replace('-gzip', '', $if_none_match);
-
-		return ($if_none_match === $etag);
-	}
-
-	/**
-	 * Get the content type
-	 *
-	 * @param string $view The view name
-	 *
-	 * @return string|null
-	 * @access private
-	 */
-	public function getContentType($view) {
-		$extension = $this->getViewFileType($view);
+        $ts = $parsed['ts'];
+        $view = $parsed['view'];
+        $viewtype = $parsed['viewtype'];
+
+        $content_type = $this->getContentType($view);
+        if (empty($content_type)) {
+            return $this->send403("Asset must have a valid file extension");
+        }
+
+        $response = Response::create();
+        if (in_array($content_type, self::$utf8_content_types)) {
+            $response->headers->set('Content-Type', "$content_type;charset=utf-8", true);
+        } else {
+            $response->headers->set('Content-Type', $content_type, true);
+        }
+
+        if (!$this->simplecache_enabled) {
+            $app->bootCore();
+            header_remove('Cache-Control');
+            header_remove('Pragma');
+            header_remove('Expires');
+
+            if (!$this->isCacheableView($view)) {
+                return $this->send403("Requested view is not an asset");
+            }
+
+            $content = $this->getProcessedView($view, $viewtype);
+            if ($content === false) {
+                return $this->send403();
+            }
+
+            $etag = '"' . md5($content) . '"';
+            $this->setRevalidateHeaders($etag, $response);
+            if ($this->is304($etag)) {
+                return Response::create()->setNotModified();
+            }
+
+            return $response->setContent($content);
+        }
+
+        $etag = "\"$ts\"";
+        if ($this->is304($etag)) {
+            return Response::create()->setNotModified();
+        }
+
+        // trust the client but check for an existing cache file
+        $filename = $config->cacheroot . "views_simplecache/$ts/$viewtype/$view";
+        if (file_exists($filename)) {
+            $this->sendCacheHeaders($etag, $response);
+            return BinaryFileResponse::create($filename, 200, $response->headers->all());
+        }
+
+        // the hard way
+        $app->bootCore();
+        header_remove('Cache-Control');
+        header_remove('Pragma');
+        header_remove('Expires');
+
+        elgg_set_viewtype($viewtype);
+        if (!$this->isCacheableView($view)) {
+            return $this->send403("Requested view is not an asset");
+        }
+
+        $lastcache = (int) $config->lastcache;
+
+        $filename = $config->cacheroot . "views_simplecache/$lastcache/$viewtype/$view";
+
+        if ($lastcache == $ts) {
+            $this->sendCacheHeaders($etag, $response);
+
+            $content = $this->getProcessedView($view, $viewtype);
+
+            $dir_name = dirname($filename);
+            if (!is_dir($dir_name)) {
+                // PHP and the server accessing the cache symlink may be a different user. And here
+                // it's safe to make everything readable anyway.
+                mkdir($dir_name, 0775, true);
+            }
+
+            file_put_contents($filename, $content);
+            chmod($filename, 0664);
+        } else {
+            // if wrong timestamp, don't send HTTP cache
+            $content = $this->getProcessedView($view, $viewtype);
+        }
+
+        return $response->setContent($content);
+    }
+
+    /**
+     * Parse a request
+     *
+     * @param string $path Request URL path
+     * @return array Cache parameters (empty array if failure)
+     */
+    public function parsePath($path) {
+        // no '..'
+        if (false !== strpos($path, '..')) {
+            return [];
+        }
+        // only alphanumeric characters plus /, ., -, and _
+        if (preg_match('#[^a-zA-Z0-9/\.\-_]#', $path)) {
+            return [];
+        }
+
+        // testing showed regex to be marginally faster than array / string functions over 100000 reps
+        // it won't make a difference in real life and regex is easier to read.
+        // <ts>/<viewtype>/<name/of/view.and.dots>.<type>
+        if (!preg_match('#^/cache/([0-9]+)/([^/]+)/(.+)$#', $path, $matches)) {
+            return [];
+        }
+
+        return [
+            'ts' => $matches[1],
+            'viewtype' => $matches[2],
+            'view' => $matches[3],
+        ];
+    }
+
+    /**
+     * Is the view cacheable. Language views are handled specially.
+     *
+     * @param string $view View name
+     *
+     * @return bool
+     */
+    protected function isCacheableView($view) {
+        if (preg_match('~^languages/(.*)\.js$~', $view, $m)) {
+            return in_array($m[1],  _elgg_services()->translator->getAllLanguageCodes());
+        }
+        return _elgg_services()->views->isCacheableView($view);
+    }
+
+    /**
+     * Send cache headers
+     *
+     * @param string $etag ETag value
+     * @return void
+     */
+    protected function sendCacheHeaders($etag, Response $response) {
+        $response->setSharedMaxAge(86400 * 30 * 6);
+        $response->setMaxAge(86400 * 30 * 6);
+        $response->headers->set('ETag', $etag);
+    }
+
+    /**
+     * Send revalidate cache headers
+     *
+     * @param string $etag ETag value
+     * @return void
+     */
+    protected function setRevalidateHeaders($etag, Response $response) {
+        $response->headers->set('Cache-Control', "public, max-age=0, must-revalidate", true);
+        $response->headers->set('ETag', $etag);
+    }
+
+    /**
+     * Send a 304 and exit() if the ETag matches the request
+     *
+     * @param string $etag ETag value
+     * @return bool
+     */
+    protected function is304($etag) {
+        $if_none_match = $this->request->headers->get('If-None-Match');
+        if ($if_none_match === null) {
+            return false;
+        }
+
+        // strip -gzip and leading /W
+        $if_none_match = trim($if_none_match);
+        if (0 === strpos($if_none_match, 'W/')) {
+            $if_none_match = substr($if_none_match, 2);
+        }
+        $if_none_match = str_replace('-gzip', '', $if_none_match);
+
+        return ($if_none_match === $etag);
+    }
+
+    /**
+     * Get the content type
+     *
+     * @param string $view The view name
+     *
+     * @return string|null
+     * @access private
+     */
+    public function getContentType($view) {
+        $extension = $this->getViewFileType($view);
 		
-		if (isset(self::$extensions[$extension])) {
-			return self::$extensions[$extension];
-		} else {
-			return null;
-		}
-	}
+        if (isset(self::$extensions[$extension])) {
+            return self::$extensions[$extension];
+        } else {
+            return null;
+        }
+    }
 	
-	/**
-	 * Returns the type of output expected from the view.
-	 *
-	 *  - view/name.extension returns "extension" if "extension" is valid
-	 *  - css/view return "css"
-	 *  - js/view return "js"
-	 *  - Otherwise, returns "unknown"
-	 *
-	 * @param string $view The view name
-	 * @return string
-	 * @access private
-	 */
-	public function getViewFileType($view) {
-		$extension = (new \SplFileInfo($view))->getExtension();
-		$hasValidExtension = isset(self::$extensions[$extension]);
-
-		if ($hasValidExtension) {
-			return $extension;
-		}
+    /**
+     * Returns the type of output expected from the view.
+     *
+     *  - view/name.extension returns "extension" if "extension" is valid
+     *  - css/view return "css"
+     *  - js/view return "js"
+     *  - Otherwise, returns "unknown"
+     *
+     * @param string $view The view name
+     * @return string
+     * @access private
+     */
+    public function getViewFileType($view) {
+        $extension = (new \SplFileInfo($view))->getExtension();
+        $hasValidExtension = isset(self::$extensions[$extension]);
+
+        if ($hasValidExtension) {
+            return $extension;
+        }
 		
-		if (preg_match('~(?:^|/)(css|js)(?:$|/)~', $view, $m)) {
-			return $m[1];
-		}
+        if (preg_match('~(?:^|/)(css|js)(?:$|/)~', $view, $m)) {
+            return $m[1];
+        }
 		
-		return 'unknown';
-	}
-
-	/**
-	 * Get the contents of a view for caching
-	 *
-	 * @param string $view     The view name
-	 * @param string $viewtype The viewtype
-	 * @return string|false
-	 * @see CacheHandler::renderView()
-	 */
-	protected function getProcessedView($view, $viewtype) {
-		$content = $this->renderView($view, $viewtype);
-		if ($content === false) {
-			return false;
-		}
-
-		if ($this->simplecache_enabled) {
-			$hook_name = 'simplecache:generate';
-		} else {
-			$hook_name = 'cache:generate';
-		}
-		$hook_type = $this->getViewFileType($view);
-		$hook_params = [
-			'view' => $view,
-			'viewtype' => $viewtype,
-			'view_content' => $content,
-		];
-		return \_elgg_services()->hooks->trigger($hook_name, $hook_type, $hook_params, $content);
-	}
-
-	/**
-	 * Render a view for caching. Language views are handled specially.
-	 *
-	 * @param string $view     The view name
-	 * @param string $viewtype The viewtype
-	 * @return string|false
-	 */
-	protected function renderView($view, $viewtype) {
-		elgg_set_viewtype($viewtype);
-
-		if ($viewtype === 'default' && preg_match("#^languages/(.*?)\\.js$#", $view, $matches)) {
-			$view = "languages.js";
-			$vars = ['language' => $matches[1]];
-		} else {
-			$vars = [];
-		}
-
-		if (!elgg_view_exists($view)) {
-			return false;
-		}
-
-		// disable error reporting so we don't cache problems
-		$this->config->debug = null;
-
-		return elgg_view($view, $vars);
-	}
-
-	/**
-	 * Send an error message to requestor
-	 *
-	 * @param string $msg Optional message text
-	 * @return Response
-	 */
-	protected function send403($msg = 'Cache error: bad request') {
-		return Response::create($msg, 403);
-	}
+        return 'unknown';
+    }
+
+    /**
+     * Get the contents of a view for caching
+     *
+     * @param string $view     The view name
+     * @param string $viewtype The viewtype
+     * @return string|false
+     * @see CacheHandler::renderView()
+     */
+    protected function getProcessedView($view, $viewtype) {
+        $content = $this->renderView($view, $viewtype);
+        if ($content === false) {
+            return false;
+        }
+
+        if ($this->simplecache_enabled) {
+            $hook_name = 'simplecache:generate';
+        } else {
+            $hook_name = 'cache:generate';
+        }
+        $hook_type = $this->getViewFileType($view);
+        $hook_params = [
+            'view' => $view,
+            'viewtype' => $viewtype,
+            'view_content' => $content,
+        ];
+        return \_elgg_services()->hooks->trigger($hook_name, $hook_type, $hook_params, $content);
+    }
+
+    /**
+     * Render a view for caching. Language views are handled specially.
+     *
+     * @param string $view     The view name
+     * @param string $viewtype The viewtype
+     * @return string|false
+     */
+    protected function renderView($view, $viewtype) {
+        elgg_set_viewtype($viewtype);
+
+        if ($viewtype === 'default' && preg_match("#^languages/(.*?)\\.js$#", $view, $matches)) {
+            $view = "languages.js";
+            $vars = ['language' => $matches[1]];
+        } else {
+            $vars = [];
+        }
+
+        if (!elgg_view_exists($view)) {
+            return false;
+        }
+
+        // disable error reporting so we don't cache problems
+        $this->config->debug = null;
+
+        return elgg_view($view, $vars);
+    }
+
+    /**
+     * Send an error message to requestor
+     *
+     * @param string $msg Optional message text
+     * @return Response
+     */
+    protected function send403($msg = 'Cache error: bad request') {
+        return Response::create($msg, 403);
+    }
 }