Merge branch 'master' into full

# Conflicts:
#	README.md
#	composer.json
#	src/config/modules.php

Author: ZAYEC77

composer.json

@@ -13,22 +13,29 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.4",
-        "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
+        "php": ">=5.5.0",
+        "yiisoft/yii2": ">=2.0.13",
+        "yiisoft/yii2-bootstrap": "^2.0",
+        "yiisoft/yii2-swiftmailer": "^2.0",
         "vlucas/phpdotenv": "~1.0@dev",
-        "nullref/yii2-useful": "dev-master",
-        "nullref/yii2-core": "dev-master",
+        "nullref/yii2-useful": ">=0.0.4",
+        "nullref/yii2-core": ">=0.0.3",
+        "nullref/yii2-admin": ">=0.0.2"
         "nullref/yii2-full-admin": "dev-master",
         "yiisoft/yii2-shell": "^2.0"
     },
     "require-dev": {
-        "yiisoft/yii2-codeception": "*",
+        "codeception/codeception": "^2.2",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
     "config": {
         "process-timeout": 1800,
         "sort-packages": true,

src/config/console.php

@@ -3,7 +3,6 @@
 $params = require(__DIR__ . '/params.php');
 $modules = require(__DIR__ . '/modules.php');
 
-Yii::setAlias('@webroot', dirname(dirname(__DIR__)) . '/web');
 
 return [
     'id' => 'console-app',
@@ -13,6 +12,11 @@
     'bootstrap' => ['log', 'core'],
     'modules' => $modules,
     'params' => $params,
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm' => '@vendor/npm-asset',
+        '@webroot' => dirname(dirname(__DIR__)) . '/web',
+    ],
     'components' => [
         'db' => require(__DIR__ . '/db.php'),
     ]

src/config/web.php

@@ -10,6 +10,10 @@
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
     'runtimePath' => dirname(dirname(__DIR__)) . '/runtime',
     'bootstrap' => ['log'],
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm' => '@vendor/npm-asset',
+    ],
     'components' => [
         'formatter' => [
             'class' => 'app\components\Formatter',

src/controllers/SiteController.php

@@ -2,7 +2,6 @@
 
 namespace app\controllers;
 
-use Yii;
 use yii\filters\VerbFilter;
 use yii\web\Controller;
 
@@ -13,7 +12,7 @@ public function behaviors()
     {
         return [
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'logout' => ['post'],
                 ],

web/index.php

@@ -6,10 +6,11 @@
 Dotenv::required(['DB_HOST', 'DB_NAME', 'DB_USER', 'DB_PASS', 'YII_DEBUG', 'YII_MAIL_USE_FILE_TRANSPORT']);
 
 defined('YII_DEBUG') or define('YII_DEBUG', getenv('YII_DEBUG') != 'false');
+defined('YII_CLI') or define('YII_CLI', false);
 defined('YII_ENV') or define('YII_ENV', getenv('YII_ENV'));
 defined('YII_MAIL_USE_FILE_TRANSPORT') or define('YII_MAIL_USE_FILE_TRANSPORT', getenv('YII_MAIL_USE_FILE_TRANSPORT') == 'true');
 
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
 $config = require(__DIR__ . '/../src/config/web.php');
-(new yii\web\Application($config))->run();
+(new \yii\web\Application($config))->run();

yii

@@ -8,6 +8,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
+defined('YII_CLI') or define('YII_CLI', true);
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN and STDOUT defined by default