Merge branch 'develop'

This commit is contained in:
ErickSkrauch 2017-06-11 22:10:04 +03:00
commit 4594603db2
2 changed files with 11 additions and 1 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
return [ return [
'version' => '1.1.13', 'version' => '1.1.14',
'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
'components' => [ 'components' => [
'cache' => [ 'cache' => [
@ -79,6 +79,11 @@ return [
], ],
], ],
], ],
'container' => [
'definitions' => [
GuzzleHttp\ClientInterface::class => GuzzleHttp\Client::class,
],
],
'aliases' => [ 'aliases' => [
'@bower' => '@vendor/bower-asset', '@bower' => '@vendor/bower-asset',
'@npm' => '@vendor/npm-asset', '@npm' => '@vendor/npm-asset',

View File

@ -6,6 +6,11 @@ use yii\console\Controller;
class CleanupController extends Controller { class CleanupController extends Controller {
public function actionTest() {
$validator = \Yii::createObject(\api\components\ReCaptcha\Validator::class);
var_dump($validator);
}
public function actionEmailKeys() { public function actionEmailKeys() {
$query = EmailActivation::find(); $query = EmailActivation::find();
$conditions = ['OR']; $conditions = ['OR'];