Adding support for ConfigKit 2.0

app/commands/PostInstallController.php

@@ -2,9 +2,9 @@
 
 namespace app\commands;
 
-use SideKit\Config\ConfigKit;
 use Yii;
 use yii\console\Controller;
+use Da\Config\Configuration;
 
 class PostInstallController extends Controller
 {
@@ -14,6 +14,6 @@ class PostInstallController extends Controller
     public function actionGenerateCookieValidation()
     {
         $key = Yii::$app->security->generateRandomString();
-        ConfigKit::env()->changeEnvironmentFile(['APP_COOKIE_VALIDATION_KEY' => $key]);
+        Configuration::env()->changeEnvironmentFile(['APP_COOKIE_VALIDATION_KEY' => $key]);
     }
 }

app/models/User.php

@@ -2,7 +2,7 @@
 
 namespace app\models;
 
-class User extends \yii\base\Object implements \yii\web\IdentityInterface
+class User extends \yii\base\BaseObject implements \yii\web\IdentityInterface
 {
     public $id;
     public $username;

bootstrap/aliases.php

@@ -1,13 +1,14 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
+
 /*
  * --------------------------------------------------------------------------
  * Register custom Yii aliases
  * --------------------------------------------------------------------------
  *
  * As we have changed the structure. Modify default Yii aliases here.
  */
-Yii::setAlias('@tests', ConfigKit::config()->getBasePath() . DIRECTORY_SEPARATOR . '../tests');
-Yii::setAlias('@root', ConfigKit::config()->getRootPath());
-Yii::setAlias('@web', ConfigKit::config()->getBasePath() . DIRECTORY_SEPARATOR . '../public');
+Yii::setAlias('@tests', Configuration::app()->getBasePath() . DIRECTORY_SEPARATOR . '../tests');
+Yii::setAlias('@root', Configuration::app()->getRootPath());
+Yii::setAlias('@web', Configuration::app()->getBasePath() . DIRECTORY_SEPARATOR . '../public');

bootstrap/console.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 use yii\console\Application;
 
 /*
@@ -14,7 +14,7 @@
  * variables.
  */
 
-$config = ConfigKit::config()->build('console', ConfigKit::env()->get('CONFIG_USE_CACHE'));
+$config = Configuration::app()->build('console', Configuration::env()->get('CONFIG_USE_CACHE'));
 
 $app = new Application($config);
 

bootstrap/sidekit-test.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 use App\Configuration\ConfigurationBuilder;
 
 /*
@@ -21,7 +21,7 @@
 
 $builder = new ConfigurationBuilder();
 
-ConfigKit::config()
+Configuration::app()
     ->useConfigurationBuilder($builder)
     ->useRootPath($root);
 
@@ -35,7 +35,7 @@
  * as the following is specified.
  */
 
-// ConfigKit::config()
+// Configuration::app()
 //    ->useConfigurationBuilder($builder)
 //    ->useRootPath($root)
 //    ->useBasePath($root . '/app')
@@ -55,8 +55,7 @@
  * the appropriate .env file in the path specified in SideKit.
  */
 
-ConfigKit::env()->loadEnvironmentFrom('.env.test')->load();
-
+Configuration::env()->loadEnvironmentFrom('.env.test')->load();
 /*
  * --------------------------------------------------------------------------
  * Initialize constants required by Yii
@@ -65,8 +64,8 @@
  * I cannot get rid of them. They are being used within core. Oh well...
  */
 
-defined('YII_DEBUG') or define('YII_DEBUG', ConfigKit::env()->get('YII_DEBUG'));
-defined('YII_ENV') or define('YII_ENV', ConfigKit::env()->get('YII_ENV'));
+defined('YII_DEBUG') or define('YII_DEBUG', Configuration::env()->get('YII_DEBUG'));
+defined('YII_ENV') or define('YII_ENV', Configuration::env()->get('YII_ENV'));
 
 /*
  * --------------------------------------------------------------------------

bootstrap/sidekit.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 use App\Configuration\ConfigurationBuilder;
 
 /*
@@ -21,7 +21,7 @@
 
 $builder = new ConfigurationBuilder();
 
-ConfigKit::config()
+Configuration::app()
     ->useConfigurationBuilder($builder)
     ->useRootPath($root);
 
@@ -35,7 +35,7 @@
  * as the following is specified.
  */
 
-// ConfigKit::config()
+// Configuration::app()
 //    ->useConfigurationBuilder($builder)
 //    ->useRootPath($root)
 //    ->useBasePath($root . '/app')
@@ -55,7 +55,7 @@
  * the appropriate .env file in the path specified in SideKit.
  */
 
-ConfigKit::env()->load();
+Configuration::env()->load();
 
 /*
  * --------------------------------------------------------------------------
@@ -65,8 +65,8 @@
  * I cannot get rid of them. They are being used within core. Oh well...
  */
 
-defined('YII_DEBUG') or define('YII_DEBUG', ConfigKit::env()->get('YII_DEBUG'));
-defined('YII_ENV') or define('YII_ENV', ConfigKit::env()->get('YII_ENV'));
+defined('YII_DEBUG') or define('YII_DEBUG', Configuration::env()->get('YII_DEBUG'));
+defined('YII_ENV') or define('YII_ENV', Configuration::env()->get('YII_ENV'));
 
 /*
  * --------------------------------------------------------------------------

bootstrap/test.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 use yii\web\Application;
 use App\Configuration\ConfigurationBuilder;
 
@@ -22,7 +22,7 @@
 
 $builder = (new ConfigurationBuilder())->useDirectory($root . DIRECTORY_SEPARATOR . 'config');
 
-ConfigKit::config()
+Configuration::app()
     ->useConfigurationBuilder($builder)
     ->useRootPath($root);
 
@@ -37,7 +37,7 @@
  * the appropriate .env file in the path specified in SideKit.
  */
 
-ConfigKit::env()->loadEnvironmentFrom('.env.test')->overload();
+Configuration::env()->loadEnvironmentFrom('.env.test')->overload();
 
 /*
  * --------------------------------------------------------------------------
@@ -50,7 +50,7 @@
  * variables.
  */
 
-$config = ConfigKit::config()->build('test', ConfigKit::env()->get('CONFIG_USE_CACHE'));
+$config = Configuration::app()->build('test', Configuration::env()->get('CONFIG_USE_CACHE'));
 
 $app = new Application($config);
 

bootstrap/web.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 use yii\web\Application;
 
 /*
@@ -14,7 +14,7 @@
  * variables.
  */
 
-$config = ConfigKit::config()->build('web', ConfigKit::env()->get('CONFIG_USE_CACHE'));
+$config = Configuration::app()->build('web', Configuration::env()->get('CONFIG_USE_CACHE'));
 $app = new Application($config);
 
 /*

codeception.yml

@@ -4,8 +4,8 @@ paths:
     log: tests/_output
     data: tests/_data
     helpers: tests/_support
+bootstrap: _bootstrap.php
 settings:
-    bootstrap: _bootstrap.php
     memory_limit: 1024M
     colors: true
     log: true

composer.json

@@ -26,16 +26,20 @@
         "vlucas/phpdotenv": "^2.4",
         "league/container": "^2.2",
         "symfony/finder": "^3.1",
-        "2amigos/yii2-config-kit": "^1.0"
+        "2amigos/yii2-config-kit": "^2.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.0.0",
         "yiisoft/yii2-gii": "~2.0.0",
         "yiisoft/yii2-faker": "~2.0.0",
         "yiisoft/yii2-shell": "~2.0.0",
-        "codeception/base": "^2.2.3",
-        "codeception/verify": "~0.3.1",
-        "codeception/specify": "~0.4.3",
+        "codeception/codeception": "^4.1",
+        "codeception/verify": "^2.1",
+        "codeception/specify": "^1.4",
+        "codeception/module-asserts": "^1.3",
+        "codeception/module-yii2": "^1.1",
+        "codeception/module-phpbrowser": "^1.0",
+        "codeception/module-filesystem": "^1.0",
         "facebook/webdriver": "^1.2",
         "squizlabs/php_codesniffer": "^2.7",
         "friendsofphp/php-cs-fixer": "^2.0",

config/codeception/app.php

@@ -43,6 +43,6 @@
  * advantage of its loaded configuration values
  */
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
-return ConfigKit::config()->build('test', ConfigKit::env()->get('CONFIG_USE_CACHE'));
+return Configuration::app()->build('test', Configuration::env()->get('CONFIG_USE_CACHE'));

config/console/app.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
 
@@ -17,13 +17,13 @@
 
     'id' => 'application-id-console',
 
-    'basePath' => ConfigKit::config()->getBasePath(),
+    'basePath' => Configuration::app()->getBasePath(),
 
-    'vendorPath' => ConfigKit::config()->getVendorPath(),
+    'vendorPath' => Configuration::app()->getVendorPath(),
 
-    'runtimePath' => ConfigKit::config()->getRuntimePath(),
+    'runtimePath' => Configuration::app()->getRuntimePath(),
 
-    'language' => ConfigKit::env()->get('APP_LANGUAGE'),
+    'language' => Configuration::env()->get('APP_LANGUAGE'),
 
     'bootstrap' => ['log'],
 

config/console/components/db.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
 
@@ -14,13 +14,13 @@
 
     'class' => 'yii\db\Connection',
 
-    'dsn' => ConfigKit::env()->get('DATABASE_DSN'),
+    'dsn' => Configuration::env()->get('DATABASE_DSN'),
 
-    'username' => ConfigKit::env()->get('DATABASE_USER'),
+    'username' => Configuration::env()->get('DATABASE_USER'),
 
-    'password' => ConfigKit::env()->get('DATABASE_PASSWORD'),
+    'password' => Configuration::env()->get('DATABASE_PASSWORD'),
 
-    'charset' => ConfigKit::env()->get('DATABASE_CHARSET'),
+    'charset' => Configuration::env()->get('DATABASE_CHARSET'),
 
-    'tablePrefix' => ConfigKit::env()->get('DATABASE_TABLE_PREFIX'),
+    'tablePrefix' => Configuration::env()->get('DATABASE_TABLE_PREFIX'),
 ];

config/console/components/log.php

@@ -1,10 +1,10 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
 
-    'traceLevel' => ConfigKit::env()->get('YII_TRACE_LEVEL'),
+    'traceLevel' => Configuration::env()->get('YII_TRACE_LEVEL'),
 
     /*
      * --------------------------------------------------------------------------

config/test/app.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
 
@@ -17,13 +17,13 @@
 
     'id' => 'application-id-tests',
 
-    'basePath' => ConfigKit::config()->getBasePath(),
+    'basePath' => Configuration::app()->getBasePath(),
 
-    'vendorPath' => ConfigKit::config()->getVendorPath(),
+    'vendorPath' => Configuration::app()->getVendorPath(),
 
-    'runtimePath' => ConfigKit::config()->getRuntimePath(),
+    'runtimePath' => Configuration::app()->getRuntimePath(),
 
-    'language' => ConfigKit::env()->get('APP_LANGUAGE'),
+    'language' => Configuration::env()->get('APP_LANGUAGE'),
 
     'aliases' => [
         '@bower' => '@vendor/bower-asset',

config/test/components/assetManager.php

@@ -1,9 +1,8 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
-
-    'basePath' => ConfigKit::config()->getRootPath() . '/public/assets',
+    'basePath' => Configuration::app()->getRootPath() . '/public/assets',
 
 ];

config/test/components/db.php

@@ -1,6 +1,6 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
 
@@ -14,13 +14,13 @@
 
     'class' => 'yii\db\Connection',
 
-    'dsn' => ConfigKit::env()->get('DATABASE_DSN'),
+    'dsn' => Configuration::env()->get('DATABASE_DSN'),
 
-    'username' => ConfigKit::env()->get('DATABASE_USER'),
+    'username' => Configuration::env()->get('DATABASE_USER'),
 
-    'password' => ConfigKit::env()->get('DATABASE_PASSWORD'),
+    'password' => Configuration::env()->get('DATABASE_PASSWORD'),
 
-    'charset' => ConfigKit::env()->get('DATABASE_CHARSET'),
+    'charset' => Configuration::env()->get('DATABASE_CHARSET'),
 
-    'tablePrefix' => ConfigKit::env()->get('DATABASE_TABLE_PREFIX'),
+    'tablePrefix' => Configuration::env()->get('DATABASE_TABLE_PREFIX'),
 ];

config/test/components/request.php

@@ -1,10 +1,9 @@
 <?php
 
-use SideKit\Config\ConfigKit;
+use Da\Config\Configuration;
 
 return [
-
-    'cookieValidationKey' => ConfigKit::env()->get('APP_COOKIE_VALIDATION_KEY'),
+    'cookieValidationKey' => Configuration::env()->get('APP_COOKIE_VALIDATION_KEY'),
 
     'enableCsrfValidation' => false,