Drop src/bootstrap.php file

perftools · Dec 22, 2020 · 22db6ae · 22db6ae
1 parent 0f80f6e
commit 22db6ae
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/external/import.php b/external/import.php
@@ -3,9 +3,7 @@
 use XHGui\Saver\SaverInterface;
 use XHGui\ServiceContainer;
 
-if (!defined('XHGUI_ROOT_DIR')) {
-    require dirname(__DIR__) . '/src/bootstrap.php';
-}
+require __DIR__ . '/../vendor/autoload.php';
 
 $options = getopt('f:');
 

diff --git a/src/ServiceProvider/ConfigProvider.php b/src/ServiceProvider/ConfigProvider.php
@@ -11,6 +11,12 @@ class ConfigProvider implements ServiceProviderInterface
     public function register(Container $app)
     {
         $app['config'] = static function ($app) {
+            // @deprecated
+            // define XHGUI_ROOT_DIR constant, config files may use it
+            if (!defined('XHGUI_ROOT_DIR')) {
+                define('XHGUI_ROOT_DIR', $app['app.dir']);
+            }
+
             Config::load($app['app.config_dir'] . '/config.default.php');
 
             if (file_exists($app['app.config_dir'] . '/config.php')) {

diff --git a/src/bootstrap.php b/src/bootstrap.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -5,7 +5,7 @@
 
 use XHGui\ServiceContainer;
 
-require dirname(__DIR__) . '/src/bootstrap.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 $di = ServiceContainer::instance();
 

diff --git a/webroot/index.php b/webroot/index.php
@@ -3,7 +3,7 @@
 use Slim\Slim as App;
 use XHGui\ServiceContainer;
 
-require dirname(__DIR__) . '/src/bootstrap.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $di = ServiceContainer::instance();
 /** @var App $app */