Skip to content

Commit

Permalink
feat(public): simplify the definition of directories
Browse files Browse the repository at this point in the history
  • Loading branch information
Tinsh committed Jan 7, 2019
1 parent 149afe8 commit 1b0465e
Showing 1 changed file with 10 additions and 51 deletions.
61 changes: 10 additions & 51 deletions public/index.php
Original file line number Diff line number Diff line change
@@ -1,28 +1,5 @@
<?php

/**
* The directory in which your application specific resources are located.
* The application directory must contain the bootstrap.php file.
*
* @link https://kohana.top/guide/about.install#application
*/
$application = 'application';

/**
* The directory in which your modules are located.
*
* @link https://kohana.top/guide/about.install#modules
*/
$modules = 'modules';

/**
* The directory in which the Kohana resources are located. The system
* directory must contain the classes/kohana.php file.
*
* @link https://kohana.top/guide/about.install#system
*/
$system = 'system';

/**
* The default extension of resource files. If you change this, all resources
* must be renamed to use the new extension.
Expand All @@ -36,15 +13,12 @@
* @link http://www.php.net/manual/errorfunc.configuration#ini.error-reporting
*
* When developing your application, it is highly recommended to enable notices
* and strict warnings. Enable them by using: E_ALL | E_STRICT
*
* In a production environment, it is safe to ignore notices and strict warnings.
* Disable them by using: E_ALL ^ E_NOTICE
* and warnings. Enable them by using: E_ALL
*
* When using a legacy application with PHP >= 5.3, it is recommended to disable
* deprecated notices. Disable with: E_ALL & ~E_DEPRECATED
* In a production environment, it is safe to ignore notices and warnings.
* Disable them by using: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
*/
error_reporting(E_ALL | E_STRICT);
error_reporting(E_ALL);

/**
* End of standard configuration! Changing any of the code below should only be
Expand All @@ -53,27 +27,12 @@
* @link https://kohana.top/guide/using.configuration
*/
// Set the full path to the docroot
define('DOCROOT', realpath(__DIR__ . '/..') . DIRECTORY_SEPARATOR);

// Make the application relative to the docroot, for symlink'd index.php
if (!is_dir($application) AND is_dir(DOCROOT . $application))
$application = DOCROOT . $application;

// Make the modules relative to the docroot, for symlink'd index.php
if (!is_dir($modules) AND is_dir(DOCROOT . $modules))
$modules = DOCROOT . $modules;

// Make the system relative to the docroot, for symlink'd index.php
if (!is_dir($system) AND is_dir(DOCROOT . $system))
$system = DOCROOT . $system;

// Define the absolute paths for configured directories
define('APPPATH', realpath($application) . DIRECTORY_SEPARATOR);
define('MODPATH', realpath($modules) . DIRECTORY_SEPARATOR);
define('SYSPATH', realpath($system) . DIRECTORY_SEPARATOR);
define('DOCROOT', __DIR__ . DIRECTORY_SEPARATOR);

// Clean up the configuration vars
unset($application, $modules, $system);
// Define the absolute paths for required directories
define('APPPATH', realpath(DOCROOT . '../application') . DIRECTORY_SEPARATOR);
define('MODPATH', realpath(DOCROOT . '../modules') . DIRECTORY_SEPARATOR);
define('SYSPATH', realpath(DOCROOT . '../system') . DIRECTORY_SEPARATOR);

if (file_exists('install' . EXT)) {
// Load the installation check
Expand All @@ -97,7 +56,7 @@
// Bootstrap the application
require APPPATH . 'bootstrap' . EXT;

if (PHP_SAPI == 'cli') {
if (PHP_SAPI === 'cli') {
// Try and load minion
class_exists('Minion_Task') OR die('Please enable the Minion module for CLI support.');
set_exception_handler(['Minion_Exception', 'handler']);
Expand Down

0 comments on commit 1b0465e

Please sign in to comment.