From 1f5901d3c73935fd11e76c15852841c18a4bf919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Sun, 28 Jun 2020 00:24:03 +0300
Subject: [PATCH] added php version control to console

---
 artisan                | 46 ++++++++++--------------------------------
 bootstrap/app.php      |  2 +-
 bootstrap/autoload.php | 25 ++++++++++-------------
 index.php              | 13 +++---------
 4 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/artisan b/artisan
index df630d0d6..d8c80fa7a 100644
--- a/artisan
+++ b/artisan
@@ -1,33 +1,20 @@
 #!/usr/bin/env php
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
+/**
+ * @package     Akaunting
+ * @copyright   2017-2020 Akaunting. All rights reserved.
+ * @license     GNU GPL version 3; see LICENSE.txt
+ * @link        https://akaunting.com
+ */
 
-require __DIR__.'/bootstrap/autoload.php';
+// Register the auto-loader
+require __DIR__ . '/bootstrap/autoload.php';
 
-$app = require_once __DIR__.'/bootstrap/app.php';
-
-/*
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
+// Load the app
+$app = require_once __DIR__ . '/bootstrap/app.php';
 
+// Run the app
 $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
 
 $status = $kernel->handle(
@@ -35,17 +22,6 @@ $status = $kernel->handle(
     new Symfony\Component\Console\Output\ConsoleOutput
 );
 
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running. We will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
-
 $kernel->terminate($input, $status);
 
 exit($status);
diff --git a/bootstrap/app.php b/bootstrap/app.php
index f2801adf6..037e17df0 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 629983380..e99ead36e 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,20 +1,17 @@
 <?php
 
+// Define minimum supported PHP version
+define('AKAUNTING_PHP', '7.2.5');
+
+// Check PHP version
+if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) {
+    die('ERROR: Your host needs to use PHP ' . AKAUNTING_PHP . ' or higher to run Akaunting');
+}
+
 define('LARAVEL_START', microtime(true));
 
-/*
-|--------------------------------------------------------------------------
-| Register The Composer Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-
-require __DIR__.'/../vendor/autoload.php';
+// Load composer for core
+require __DIR__ . '/../vendor/autoload.php';
 
 // Load composer for modules
 foreach (glob(__DIR__ . '/../modules/*') as $folder) {
@@ -25,4 +22,4 @@ foreach (glob(__DIR__ . '/../modules/*') as $folder) {
     }
 
     require $autoload;
-}
\ No newline at end of file
+}
diff --git a/index.php b/index.php
index a05b18516..297dfb013 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package     Akaunting
  * @copyright   2017-2020 Akaunting. All rights reserved.
@@ -6,19 +7,11 @@
  * @link        https://akaunting.com
  */
 
-// Define minimum supported PHP version
-define('AKAUNTING_PHP', '7.2.5');
-
-// Check PHP version
-if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) {
-    die('Your host needs to use PHP ' . AKAUNTING_PHP . ' or higher to run Akaunting');
-}
-
 // Register the auto-loader
-require(__DIR__.'/bootstrap/autoload.php');
+require(__DIR__ . '/bootstrap/autoload.php');
 
 // Load the app
-$app = require_once(__DIR__.'/bootstrap/app.php');
+$app = require_once(__DIR__ . '/bootstrap/app.php');
 
 // Run the app
 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);