still rearranging configs

Author: hiqsol

src/_bootstrap.php renamed to src/config/bootstrap.php

@@ -10,7 +10,7 @@
  */
 
 if (!defined('HISITE_VENDOR_DIR')) {
-    foreach ([dirname(__DIR__) . '/vendor', dirname(dirname(dirname(__DIR__)))] as $dir) {
+    foreach ([dirname(dirname(__DIR__)) . '/vendor', dirname(dirname(dirname(dirname(__DIR__))))] as $dir) {
         if (file_exists($dir . '/autoload.php')) {
             define('HISITE_VENDOR_DIR', $dir);
             break;

src/config/hidev.php

@@ -9,6 +9,8 @@
  * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
  */
 
+$common = require __DIR__ . '/common.php';
+
 $config = [
     'components' => [
         'config' => [
@@ -17,7 +19,4 @@
     ],
 ];
 
-return yii\helpers\ArrayHelper::merge(
-    require __DIR__ . '/common.php',
-    $config
-);
+return yii\helpers\ArrayHelper::merge($common, $config);

src/config/hisite.php

@@ -9,6 +9,8 @@
  * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
  */
 
+$common = require __DIR__ . '/common.php';
+
 $config = [
     'id'            => 'asset-packagist',
     'name'          => 'Asset Packagist',
@@ -37,7 +39,4 @@
     ],
 ];
 
-return yii\helpers\ArrayHelper::merge(
-    require __DIR__ . '/common.php',
-    $config
-);
+return yii\helpers\ArrayHelper::merge($common, $config);

tests/_bootstrap.php

@@ -11,4 +11,4 @@
 
 error_reporting(E_ALL & ~E_NOTICE);
 
-require_once __DIR__ . '/../src/_bootstrap.php';
+require_once __DIR__ . '/../src/config/bootstrap.php';