From 280e92c2fbdbb8872e9c5c680fa06ed7feee396f Mon Sep 17 00:00:00 2001 From: Dmitryi Date: Thu, 26 Nov 2015 12:04:02 +0200 Subject: [PATCH] авторизация через соц сети --- common/config/main.php | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/models/LoginForm.php | 50 ++++++++++++++++++-------------------------------- common/models/User.php | 39 +++++++++++++++++++++++++++++++++++---- composer.json | 3 ++- composer.lock | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- frontend/controllers/SiteController.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- frontend/views/site/login.php | 52 +++++++++++++++++++++++----------------------------- vendor/composer/autoload_classmap.php | 2 ++ vendor/composer/autoload_namespaces.php | 2 ++ vendor/composer/autoload_psr4.php | 1 + vendor/composer/installed.json | 483 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------- vendor/dmstr/yii2-adminlte-asset/CHANGELOG.md | 9 ++++++++- vendor/dmstr/yii2-adminlte-asset/example-views/phundament/app/layouts/main.php | 2 +- vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php | 14 ++++---------- vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/left.php | 14 +------------- vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/main.php | 2 +- vendor/dmstr/yii2-adminlte-asset/widgets/Menu.php | 3 +++ vendor/kartik-v/yii2-krajee-base/AnimateAsset.php | 2 +- vendor/kartik-v/yii2-krajee-base/AssetBundle.php | 19 ++++++++++--------- vendor/kartik-v/yii2-krajee-base/CHANGE.md | 73 +++++++++++++++++++++++++++++++++++++++++++------------------------------ vendor/kartik-v/yii2-krajee-base/Config.php | 13 +++++++++---- vendor/kartik-v/yii2-krajee-base/Html5Input.php | 52 ++++++++++++++++++++++++++++++++-------------------- vendor/kartik-v/yii2-krajee-base/Html5InputAsset.php | 4 ++-- vendor/kartik-v/yii2-krajee-base/InputWidget.php | 42 +++++++++++++++++++++++++++++++----------- vendor/kartik-v/yii2-krajee-base/Module.php | 4 ++-- vendor/kartik-v/yii2-krajee-base/PluginAssetBundle.php | 3 +-- vendor/kartik-v/yii2-krajee-base/README.md | 4 ++-- vendor/kartik-v/yii2-krajee-base/TranslationTrait.php | 24 ++++++++++++++++-------- vendor/kartik-v/yii2-krajee-base/Widget.php | 12 ++++++++---- vendor/kartik-v/yii2-krajee-base/WidgetAsset.php | 2 +- vendor/kartik-v/yii2-krajee-base/WidgetTrait.php | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- vendor/kartik-v/yii2-krajee-base/assets/css/html5input.css | 2 +- vendor/kartik-v/yii2-krajee-base/assets/css/html5input.min.css | 2 +- vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.css | 2 +- vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.min.css | 2 +- vendor/rmrevin/yii2-fontawesome/.bowerrc | 4 ---- vendor/rmrevin/yii2-fontawesome/.scrutinizer.yml | 2 +- vendor/rmrevin/yii2-fontawesome/CHANGELOG.md | 11 +++++++++++ vendor/rmrevin/yii2-fontawesome/FA.php | 3 --- vendor/rmrevin/yii2-fontawesome/FontAwesome.php | 36 +++++++++++++++++++++++++++++++++++- vendor/rmrevin/yii2-fontawesome/README.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- vendor/rmrevin/yii2-fontawesome/component/Icon.php | 3 ++- vendor/rmrevin/yii2-fontawesome/composer.json | 6 +++--- vendor/rmrevin/yii2-fontawesome/composer.lock | 3 ++- vendor/rmrevin/yii2-fontawesome/phpunit.xml.dist | 11 +++++++---- vendor/rmrevin/yii2-fontawesome/tests/unit/fontawesome/MainTest.php | 38 ++++++++++++++++++++++++++++++++++++++ vendor/yiisoft/extensions.php | 64 +++++++++++++++++++++++++++++++++++++--------------------------- 47 files changed, 1191 insertions(+), 435 deletions(-) delete mode 100644 vendor/rmrevin/yii2-fontawesome/.bowerrc diff --git a/common/config/main.php b/common/config/main.php index d484172..a288bcf 100644 --- a/common/config/main.php +++ b/common/config/main.php @@ -40,6 +40,125 @@ return [ 'authManager' => [ 'class' => 'yii\rbac\DbManager', ], + + //подключаем конфигурации API соц сетей для авторизации + + 'eauth' => [ + 'class' => 'nodge\eauth\EAuth', + 'popup' => true, // Use the popup window instead of redirecting. + 'cache' => false, // Cache component name or false to disable cache. Defaults to 'cache' on production environments. + 'cacheExpire' => 0, // Cache lifetime. Defaults to 0 - means unlimited. + 'httpClient' => [ + // uncomment this to use streams in safe_mode + //'useStreamsFallback' => true, + ], + 'services' => [ // You can change the providers and their classes. + 'google' => [ + // register your app here: https://code.google.com/apis/console/ + 'class' => 'nodge\eauth\services\GoogleOAuth2Service', + 'clientId' => 'artbox-1138', + 'clientSecret' => '', + 'title' => 'Google', + ], + 'twitter' => [ + // register your app here: https://dev.twitter.com/apps/new + 'class' => 'nodge\eauth\services\TwitterOAuth1Service', + 'key' => '8vReLxI63vTs98MBMqhvrszwy', + 'secret' => 'jOqNbHIkQw4cVKKJkgrMtaEeCcfbeT1GTik4pF6O9D7AmqcwOG', + ], + 'yandex' => [ + // register your app here: https://oauth.yandex.ru/client/my + 'class' => 'nodge\eauth\services\YandexOAuth2Service', + 'clientId' => 'ea13195ac0424ff8a190838bec41bb71', + 'clientSecret' => '911f2c9afcbf4f5f9319b3134c096c86', + 'title' => 'Yandex', + ], + 'facebook' => [ + // register your app here: https://developers.facebook.com/apps/ + 'class' => 'nodge\eauth\services\FacebookOAuth2Service', + 'clientId' => '1642047622727997', + 'clientSecret' => 'f5b7ba4f062a568678b764fc74cc416e', + ], + 'yahoo' => [ + 'class' => 'nodge\eauth\services\YahooOpenIDService', + //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. + ], + 'linkedin' => [ + // register your app here: https://www.linkedin.com/secure/developer + 'class' => 'nodge\eauth\services\LinkedinOAuth1Service', + 'key' => '77s41eixn3dyvo', + 'secret' => '1xLZQ7RRK6RNjo4U', + 'title' => 'LinkedIn (OAuth1)', + ], + 'linkedin_oauth2' => [ + // register your app here: https://www.linkedin.com/secure/developer + 'class' => 'nodge\eauth\services\LinkedinOAuth2Service', + 'clientId' => '77s41eixn3dyvo', + 'clientSecret' => '1xLZQ7RRK6RNjo4U', + 'title' => 'LinkedIn (OAuth2)', + ], + 'github' => [ + // register your app here: https://github.com/settings/applications + 'class' => 'nodge\eauth\services\GitHubOAuth2Service', + 'clientId' => 'd00283b5cfb225cd1600', + 'clientSecret' => 'f482361fad7184819d452f421c8b09db60830b42', + ], + 'live' => [ + // register your app here: https://account.live.com/developers/applications/index + 'class' => 'nodge\eauth\services\LiveOAuth2Service', + 'clientId' => '00000000481796AE', + 'clientSecret' => 'rt9GiJrlKz3sE6CvdOeuwWyYbl1tQT03', + ], + 'steam' => [ + 'class' => 'nodge\eauth\services\SteamOpenIDService', + //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. + ], + 'instagram' => [ + // register your app here: https://instagram.com/developer/register/ + 'class' => 'nodge\eauth\services\InstagramOAuth2Service', + 'clientId' => '...', + 'clientSecret' => '...', + ], + 'vkontakte' => [ + // register your app here: https://vk.com/editapp?act=create&site=1 + 'class' => 'nodge\eauth\services\VKontakteOAuth2Service', + 'clientId' => '5155388', + 'clientSecret' => 'jxgmdGVQw7huGKRpnX3a', + ], + 'mailru' => [ + // register your app here: http://api.mail.ru/sites/my/add + 'class' => 'nodge\eauth\services\MailruOAuth2Service', + 'clientId' => '739322', + 'clientSecret' => 'd6ce7be6ff791375adff58fe0e4460b2', + ], + 'odnoklassniki' => [ + // register your app here: http://dev.odnoklassniki.ru/wiki/pages/viewpage.action?pageId=13992188 + // ... or here: http://www.odnoklassniki.ru/dk?st.cmd=appsInfoMyDevList&st._aid=Apps_Info_MyDev + 'class' => 'nodge\eauth\services\OdnoklassnikiOAuth2Service', + 'clientId' => '...', + 'clientSecret' => '...', + 'clientPublic' => '...', + 'title' => 'Odnoklas.', + ], + ], + ], + + // (optionally) you can configure logging + 'log' => [ + 'targets' => [ + [ + 'class' => 'yii\log\FileTarget', + 'logFile' => '@app/runtime/logs/eauth.log', + 'categories' => ['nodge\eauth\*'], + 'logVars' => [], + ], + ], + ], + + /*========End======= + *end api sicial + * */ + ], 'language' => 'ru-RU' ]; diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php index afc1c23..eee2366 100644 --- a/common/models/LoginForm.php +++ b/common/models/LoginForm.php @@ -1,78 +1,64 @@ hasErrors()) { - $user = $this->getUser(); - if (!$user || !$user->validatePassword($this->password)) { - $this->addError($attribute, 'Incorrect username or password.'); - } + $user = $this->getUser(); + if (!$user || !$user->validatePassword($this->password)) { + $this->addError('password', 'Incorrect username or password.'); } } - /** * Logs in a user using the provided username and password. - * * @return boolean whether the user is logged in successfully */ public function login() { if ($this->validate()) { - return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0); + return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0); } else { return false; } } - /** * Finds user by [[username]] * * @return User|null */ - protected function getUser() + private function getUser() { - if ($this->_user === null) { + if ($this->_user === false) { $this->_user = User::findByUsername($this->username); } - return $this->_user; } -} +} \ No newline at end of file diff --git a/common/models/User.php b/common/models/User.php index 21ec7ac..720697a 100644 --- a/common/models/User.php +++ b/common/models/User.php @@ -24,8 +24,13 @@ use developeruz\db_rbac\interfaces\UserRbacInterface; */ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface { + /** + * @var array EAuth attributes + */ + const STATUS_DELETED = 0; const STATUS_ACTIVE = 10; + public $profile; /** * @inheritdoc @@ -59,10 +64,36 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface /** * @inheritdoc */ - public static function findIdentity($id) - { - return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]); - } + public static function findIdentity($id) { + if (Yii::$app->getSession()->has('user-'.$id)) { + return new self(Yii::$app->getSession()->get('user-'.$id)); + } + else { + return isset(self::$users[$id]) ? new self(self::$users[$id]) : null; + } + } + /** + * @param \nodge\eauth\ServiceBase $service + * @return User + * @throws ErrorException + */ + public static function findByEAuth($service) { + if (!$service->getIsAuthenticated()) { + throw new ErrorException('EAuth user should be authenticated before creating identity.'); + } + $id = $service->getServiceName().'-'.$service->getId(); + $attributes = array( + 'id' => $id, + 'username' => $service->getAttribute('name'), + 'authKey' => md5($id), + 'profile' => $service->getAttributes(), + ); + $attributes['profile']['service'] = $service->getServiceName(); + Yii::$app->getSession()->set('user-'.$id, $attributes); + return new self($attributes); + } + + public $authKey; /** * @inheritdoc diff --git a/composer.json b/composer.json index 55b907d..a2cf6a9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "dmstr/yii2-adminlte-asset": "2.*", "yiisoft/yii2-jui": "^2.0", "kartik-v/yii2-widget-select2": "@dev", - "developeruz/yii2-db-rbac": "*" + "developeruz/yii2-db-rbac": "*", + "nodge/yii2-eauth": "*" }, "require-dev": { "yiisoft/yii2-codeception": "*", diff --git a/composer.lock b/composer.lock index 603df36..2f55525 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "52ade047603d8461342b32b7f76785af", - "content-hash": "35117bfe670ed414624b171df746a308", + "hash": "6b310fccece1d1eddc11db43624c06ab", "packages": [ { "name": "almasaeed2010/adminlte", @@ -461,16 +460,16 @@ }, { "name": "dmstr/yii2-adminlte-asset", - "version": "2.2.3", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/dmstr/yii2-adminlte-asset.git", - "reference": "45cffbfe90d79f3c405b4cc98f7f318ae372bb10" + "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/45cffbfe90d79f3c405b4cc98f7f318ae372bb10", - "reference": "45cffbfe90d79f3c405b4cc98f7f318ae372bb10", + "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/c842a15ceef4e903f70ac927ec3246e6d53e1148", + "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148", "shasum": "" }, "require": { @@ -511,7 +510,7 @@ "extension", "yii2" ], - "time": "2015-10-07 21:31:26" + "time": "2015-11-06 10:35:36" }, { "name": "ezyang/htmlpurifier", @@ -559,16 +558,16 @@ }, { "name": "kartik-v/yii2-krajee-base", - "version": "v1.7.7", + "version": "v1.7.8", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-krajee-base.git", - "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19" + "reference": "f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19", - "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19", + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f", + "reference": "f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f", "shasum": "" }, "require": { @@ -601,7 +600,7 @@ "widget", "yii2" ], - "time": "2015-06-16 05:19:57" + "time": "2015-11-22 06:35:23" }, { "name": "kartik-v/yii2-widget-select2", @@ -652,17 +651,178 @@ "time": "2015-09-22 03:10:57" }, { + "name": "lusitanian/oauth", + "version": "v0.3.6", + "source": { + "type": "git", + "url": "https://github.com/Lusitanian/PHPoAuthLib.git", + "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/4ce8c488971410233eb3b1e6d9ac4e81debb41d5", + "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "predis/predis": "0.8.*@dev", + "symfony/http-foundation": "~2.1" + }, + "suggest": { + "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", + "predis/predis": "Allows using the Redis storage backend.", + "symfony/http-foundation": "Allows using the Symfony Session storage backend." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "psr-0": { + "OAuth": "src", + "OAuth\\Unit": "tests" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David Desberg", + "email": "david@daviddesberg.com" + }, + { + "name": "Pieter Hordijk", + "email": "info@pieterhordijk.com" + } + ], + "description": "PHP 5.3+ oAuth 1/2 Library", + "keywords": [ + "Authentication", + "authorization", + "oauth", + "security" + ], + "time": "2015-09-09 06:43:02" + }, + { + "name": "nodge/lightopenid", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/Nodge/LightOpenID.git", + "reference": "a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nodge/LightOpenID/zipball/a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041", + "reference": "a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "autoload": { + "classmap": [ + "openid.php", + "provider/provider.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT License" + ], + "authors": [ + { + "name": "Mewp", + "homepage": "http://code.google.com/p/lightopenid/" + }, + { + "name": "Ignat Ignatov", + "homepage": "https://github.com/iignatov/LightOpenID" + } + ], + "description": "Lightweight PHP5 library for easy OpenID authentication.", + "homepage": "https://github.com/Nodge/LightOpenID", + "keywords": [ + "Authentication", + "OpenId" + ], + "time": "2013-08-31 16:48:56" + }, + { + "name": "nodge/yii2-eauth", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/Nodge/yii2-eauth.git", + "reference": "25963e78c6083734736187bff992dd9da60fd125" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nodge/yii2-eauth/zipball/25963e78c6083734736187bff992dd9da60fd125", + "reference": "25963e78c6083734736187bff992dd9da60fd125", + "shasum": "" + }, + "require": { + "lib-curl": "*", + "lusitanian/oauth": "~0.3.0", + "nodge/lightopenid": "~1.1.0", + "php": ">=5.4.0", + "yiisoft/yii2": "*" + }, + "type": "yii2-extension", + "extra": { + "bootstrap": "nodge\\eauth\\Bootstrap" + }, + "autoload": { + "psr-4": { + "nodge\\eauth\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "New BSD License" + ], + "authors": [ + { + "name": "Maxim Zemskov", + "email": "nodge@yandex.ru", + "homepage": "http://nodge.ru/" + } + ], + "description": "Yii2 EAuth Extension. EAuth allows to authenticate users with accounts on other websites (Google, Facebook, Twitter, etc).", + "homepage": "https://github.com/Nodge/yii2-eauth", + "keywords": [ + "Authentication", + "OpenId", + "eauth", + "extension", + "oauth", + "yii2" + ], + "time": "2015-10-17 16:51:17" + }, + { "name": "rmrevin/yii2-fontawesome", - "version": "2.12.0", + "version": "2.12.2", "source": { "type": "git", "url": "https://github.com/rmrevin/yii2-fontawesome.git", - "reference": "51d33ec9d1d7edab2166f1d42668c1bc8d28c068" + "reference": "62308687477734c166753de0ad9e2333dc7dce32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/51d33ec9d1d7edab2166f1d42668c1bc8d28c068", - "reference": "51d33ec9d1d7edab2166f1d42668c1bc8d28c068", + "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/62308687477734c166753de0ad9e2333dc7dce32", + "reference": "62308687477734c166753de0ad9e2333dc7dce32", "shasum": "" }, "require": { @@ -688,9 +848,9 @@ ], "authors": [ { - "name": "Roman Revin", - "email": "xgismox@gmail.com", - "homepage": "http://rmrevin.ru/" + "name": "Revin Roman", + "email": "roman@rmrevin.com", + "homepage": "https://rmrevin.com/" } ], "description": "Asset Bundle for Yii2 with Font Awesome", @@ -701,7 +861,7 @@ "font", "yii" ], - "time": "2015-08-15 16:50:16" + "time": "2015-11-20 09:17:45" }, { "name": "swiftmailer/swiftmailer", diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index f66584a..bd77425 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -16,7 +16,8 @@ use yii\filters\VerbFilter; use yii\filters\AccessControl; use frontend\models\OptionsToValues; use yii\validators\EmailValidator; - +use common\models\User; +use yii\helpers\VarDumper; use common\models\Page; /** @@ -52,6 +53,11 @@ class SiteController extends Controller 'logout' => ['post'], ], ], + 'eauth' => [ + // required to disable csrf validation on OpenID requests + 'class' => \nodge\eauth\openid\ControllerBehavior::className(), + 'only' => ['login'], + ], ]; } @@ -94,6 +100,42 @@ class SiteController extends Controller */ public function actionLogin() { + + $serviceName = Yii::$app->getRequest()->getQueryParam('service'); + if (isset($serviceName)) { + /** @var $eauth \nodge\eauth\ServiceBase */ + $eauth = Yii::$app->get('eauth')->getIdentity($serviceName); + $eauth->setRedirectUrl(Yii::$app->getUser()->getReturnUrl()); + $eauth->setCancelUrl(Yii::$app->getUrlManager()->createAbsoluteUrl('site/login')); + + try { + if ($eauth->authenticate()) { +// var_dump($eauth->getIsAuthenticated(), $eauth->getAttributes()); exit; + + $identity = User::findByEAuth($eauth); + Yii::$app->getUser()->login($identity); + + // special redirect with closing popup window + $eauth->redirect(); + } + else { + // close popup window and redirect to cancelUrl + $eauth->cancel(); + } + } + catch (\nodge\eauth\ErrorException $e) { + // save error to show it later + Yii::$app->getSession()->setFlash('error', 'EAuthException: '.$e->getMessage()); + + // close popup window and redirect to cancelUrl +// $eauth->cancel(); + $eauth->redirect($eauth->getCancelUrl()); + } + } + + + + if (!\Yii::$app->user->isGuest) { return $this->goHome(); } @@ -126,7 +168,13 @@ class SiteController extends Controller * @return mixed */ public function actionContact() - { + { + + //Yii::$app->user->logout(); + $identity = Yii::$app->getUser()->getIdentity(); + var_dump($identity[profile]); + die(); + $model = new ContactForm(); if ($model->load(Yii::$app->request->post()) && $model->validate()) { if ($model->sendEmail(Yii::$app->params['adminEmail'])) { @@ -217,6 +265,7 @@ class SiteController extends Controller $option_list = $option_model->find()->where(1)->all(); $option_values = array(); $post = \Yii::$app->request->post(); + if(!empty(\Yii::$app->request->post())) { $options_to_values = array(); $hasErrors = false; diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php index fe67ee0..746a527 100644 --- a/frontend/views/site/login.php +++ b/frontend/views/site/login.php @@ -1,39 +1,33 @@ title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?> -
-

title) ?>

- -

Please fill out the following fields to login:

- -
-
- 'login-form']); ?> +

title); ?>

- field($model, 'username') ?> - - field($model, 'password')->passwordInput() ?> - - field($model, 'rememberMe')->checkbox() ?> +getSession()->hasFlash('error')) { + echo '
'.Yii::$app->getSession()->getFlash('error').'
'; + } +?> -
- If you forgot your password you can . -
+

Do you already have an account on one of these sites? Click the logo to log in with it here:

+ 'site/login')); ?> +
-
- 'btn btn-primary', 'name' => 'login-button']) ?> -
+

Please fill out the following fields to login:

- -
+ array('class' => 'form-horizontal', 'id' => 'login-form'))); ?> + field($model, 'username')->textInput(); ?> + field($model, 'password')->passwordInput(); ?> + field($model, 'rememberMe')->checkbox(); ?> +
+ 'btn btn-primary')); ?>
-
+ \ No newline at end of file diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 7a91153..229b13d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,4 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'LightOpenID' => $vendorDir . '/nodge/lightopenid/openid.php', + 'LightOpenIDProvider' => $vendorDir . '/nodge/lightopenid/provider/provider.php', ); diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php index 2c62e15..edeba18 100644 --- a/vendor/composer/autoload_namespaces.php +++ b/vendor/composer/autoload_namespaces.php @@ -7,6 +7,8 @@ $baseDir = dirname($vendorDir); return array( 'cebe\\gravatar\\' => array($vendorDir . '/cebe/yii2-gravatar'), + 'OAuth\\Unit' => array($vendorDir . '/lusitanian/oauth/tests'), + 'OAuth' => array($vendorDir . '/lusitanian/oauth/src'), 'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'), 'Diff' => array($vendorDir . '/phpspec/php-diff/lib'), ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index ea9e652..f2e301e 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -16,6 +16,7 @@ return array( 'yii\\bootstrap\\' => array($vendorDir . '/yiisoft/yii2-bootstrap'), 'yii\\' => array($vendorDir . '/yiisoft/yii2'), 'rmrevin\\yii\\fontawesome\\' => array($vendorDir . '/rmrevin/yii2-fontawesome'), + 'nodge\\eauth\\' => array($vendorDir . '/nodge/yii2-eauth/src'), 'kartik\\select2\\' => array($vendorDir . '/kartik-v/yii2-widget-select2'), 'kartik\\base\\' => array($vendorDir . '/kartik-v/yii2-krajee-base'), 'dmstr\\' => array($vendorDir . '/dmstr/yii2-adminlte-asset'), diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 982df43..1b6e5d6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -696,60 +696,6 @@ ] }, { - "name": "rmrevin/yii2-fontawesome", - "version": "2.12.0", - "version_normalized": "2.12.0.0", - "source": { - "type": "git", - "url": "https://github.com/rmrevin/yii2-fontawesome.git", - "reference": "51d33ec9d1d7edab2166f1d42668c1bc8d28c068" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/51d33ec9d1d7edab2166f1d42668c1bc8d28c068", - "reference": "51d33ec9d1d7edab2166f1d42668c1bc8d28c068", - "shasum": "" - }, - "require": { - "bower-asset/fontawesome": "4.4.*", - "php": ">=5.4.0", - "yiisoft/yii2": "2.0.*" - }, - "time": "2015-08-15 16:50:16", - "type": "yii2-extension", - "extra": { - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "rmrevin\\yii\\fontawesome\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Revin", - "email": "xgismox@gmail.com", - "homepage": "http://rmrevin.ru/" - } - ], - "description": "Asset Bundle for Yii2 with Font Awesome", - "keywords": [ - "asset", - "awesome", - "bundle", - "font", - "yii" - ] - }, - { "name": "almasaeed2010/adminlte", "version": "v2.3.2", "version_normalized": "2.3.2.0", @@ -837,62 +783,6 @@ ] }, { - "name": "dmstr/yii2-adminlte-asset", - "version": "2.2.3", - "version_normalized": "2.2.3.0", - "source": { - "type": "git", - "url": "https://github.com/dmstr/yii2-adminlte-asset.git", - "reference": "45cffbfe90d79f3c405b4cc98f7f318ae372bb10" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/45cffbfe90d79f3c405b4cc98f7f318ae372bb10", - "reference": "45cffbfe90d79f3c405b4cc98f7f318ae372bb10", - "shasum": "" - }, - "require": { - "almasaeed2010/adminlte": "~2.0", - "cebe/yii2-gravatar": "1.*", - "rmrevin/yii2-fontawesome": "~2.9", - "yiisoft/yii2": "2.*", - "yiisoft/yii2-bootstrap": "2.*" - }, - "time": "2015-10-07 21:31:26", - "type": "yii2-extension", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "dmstr\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Tobias Munk", - "email": "tobias@diemeisterei.de" - }, - { - "name": "Evgeniy Tkachenko", - "email": "et.coder@gmail.com" - } - ], - "description": "Backend theme for Yii2 Framework", - "keywords": [ - "AdminLTE", - "extension", - "yii2" - ] - }, - { "name": "yiisoft/yii2-jui", "version": "2.0.4", "version_normalized": "2.0.4.0", @@ -945,54 +835,6 @@ ] }, { - "name": "kartik-v/yii2-krajee-base", - "version": "v1.7.7", - "version_normalized": "1.7.7.0", - "source": { - "type": "git", - "url": "https://github.com/kartik-v/yii2-krajee-base.git", - "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19", - "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19", - "shasum": "" - }, - "require": { - "yiisoft/yii2-bootstrap": "@dev" - }, - "time": "2015-06-16 05:19:57", - "type": "yii2-extension", - "installation-source": "dist", - "autoload": { - "psr-4": { - "kartik\\base\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kartik Visweswaran", - "email": "kartikv2@gmail.com", - "homepage": "http://www.krajee.com/" - } - ], - "description": "Base library and foundation components for all Yii2 Krajee extensions.", - "homepage": "https://github.com/kartik-v/yii2-krajee-base", - "keywords": [ - "base", - "extension", - "foundation", - "krajee", - "widget", - "yii2" - ] - }, - { "name": "bower-asset/jquery", "version": "2.1.4", "version_normalized": "2.1.4.0", @@ -1395,5 +1237,330 @@ "CC-BY-3.0" ], "description": "Font Awesome" + }, + { + "name": "dmstr/yii2-adminlte-asset", + "version": "2.2.4", + "version_normalized": "2.2.4.0", + "source": { + "type": "git", + "url": "https://github.com/dmstr/yii2-adminlte-asset.git", + "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/c842a15ceef4e903f70ac927ec3246e6d53e1148", + "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148", + "shasum": "" + }, + "require": { + "almasaeed2010/adminlte": "~2.0", + "cebe/yii2-gravatar": "1.*", + "rmrevin/yii2-fontawesome": "~2.9", + "yiisoft/yii2": "2.*", + "yiisoft/yii2-bootstrap": "2.*" + }, + "time": "2015-11-06 10:35:36", + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "dmstr\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Tobias Munk", + "email": "tobias@diemeisterei.de" + }, + { + "name": "Evgeniy Tkachenko", + "email": "et.coder@gmail.com" + } + ], + "description": "Backend theme for Yii2 Framework", + "keywords": [ + "AdminLTE", + "extension", + "yii2" + ] + }, + { + "name": "nodge/lightopenid", + "version": "1.1.2", + "version_normalized": "1.1.2.0", + "source": { + "type": "git", + "url": "https://github.com/Nodge/LightOpenID.git", + "reference": "a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nodge/LightOpenID/zipball/a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041", + "reference": "a5492cc0c932c557b7e9b54a6e5bbd85cc5fa041", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "time": "2013-08-31 16:48:56", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "openid.php", + "provider/provider.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT License" + ], + "authors": [ + { + "name": "Mewp", + "homepage": "http://code.google.com/p/lightopenid/" + }, + { + "name": "Ignat Ignatov", + "homepage": "https://github.com/iignatov/LightOpenID" + } + ], + "description": "Lightweight PHP5 library for easy OpenID authentication.", + "homepage": "https://github.com/Nodge/LightOpenID", + "keywords": [ + "Authentication", + "OpenId" + ] + }, + { + "name": "lusitanian/oauth", + "version": "v0.3.6", + "version_normalized": "0.3.6.0", + "source": { + "type": "git", + "url": "https://github.com/Lusitanian/PHPoAuthLib.git", + "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/4ce8c488971410233eb3b1e6d9ac4e81debb41d5", + "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "predis/predis": "0.8.*@dev", + "symfony/http-foundation": "~2.1" + }, + "suggest": { + "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", + "predis/predis": "Allows using the Redis storage backend.", + "symfony/http-foundation": "Allows using the Symfony Session storage backend." + }, + "time": "2015-09-09 06:43:02", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "OAuth": "src", + "OAuth\\Unit": "tests" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David Desberg", + "email": "david@daviddesberg.com" + }, + { + "name": "Pieter Hordijk", + "email": "info@pieterhordijk.com" + } + ], + "description": "PHP 5.3+ oAuth 1/2 Library", + "keywords": [ + "Authentication", + "authorization", + "oauth", + "security" + ] + }, + { + "name": "nodge/yii2-eauth", + "version": "2.3.0", + "version_normalized": "2.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/Nodge/yii2-eauth.git", + "reference": "25963e78c6083734736187bff992dd9da60fd125" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nodge/yii2-eauth/zipball/25963e78c6083734736187bff992dd9da60fd125", + "reference": "25963e78c6083734736187bff992dd9da60fd125", + "shasum": "" + }, + "require": { + "lib-curl": "*", + "lusitanian/oauth": "~0.3.0", + "nodge/lightopenid": "~1.1.0", + "php": ">=5.4.0", + "yiisoft/yii2": "*" + }, + "time": "2015-10-17 16:51:17", + "type": "yii2-extension", + "extra": { + "bootstrap": "nodge\\eauth\\Bootstrap" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "nodge\\eauth\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "New BSD License" + ], + "authors": [ + { + "name": "Maxim Zemskov", + "email": "nodge@yandex.ru", + "homepage": "http://nodge.ru/" + } + ], + "description": "Yii2 EAuth Extension. EAuth allows to authenticate users with accounts on other websites (Google, Facebook, Twitter, etc).", + "homepage": "https://github.com/Nodge/yii2-eauth", + "keywords": [ + "Authentication", + "OpenId", + "eauth", + "extension", + "oauth", + "yii2" + ] + }, + { + "name": "kartik-v/yii2-krajee-base", + "version": "v1.7.8", + "version_normalized": "1.7.8.0", + "source": { + "type": "git", + "url": "https://github.com/kartik-v/yii2-krajee-base.git", + "reference": "f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f", + "reference": "f90b9ff515ced4e40ff5ec8156a5c9f7f51e2a7f", + "shasum": "" + }, + "require": { + "yiisoft/yii2-bootstrap": "@dev" + }, + "time": "2015-11-22 06:35:23", + "type": "yii2-extension", + "installation-source": "dist", + "autoload": { + "psr-4": { + "kartik\\base\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com", + "homepage": "http://www.krajee.com/" + } + ], + "description": "Base library and foundation components for all Yii2 Krajee extensions.", + "homepage": "https://github.com/kartik-v/yii2-krajee-base", + "keywords": [ + "base", + "extension", + "foundation", + "krajee", + "widget", + "yii2" + ] + }, + { + "name": "rmrevin/yii2-fontawesome", + "version": "2.12.2", + "version_normalized": "2.12.2.0", + "source": { + "type": "git", + "url": "https://github.com/rmrevin/yii2-fontawesome.git", + "reference": "62308687477734c166753de0ad9e2333dc7dce32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/62308687477734c166753de0ad9e2333dc7dce32", + "reference": "62308687477734c166753de0ad9e2333dc7dce32", + "shasum": "" + }, + "require": { + "bower-asset/fontawesome": "4.4.*", + "php": ">=5.4.0", + "yiisoft/yii2": "2.0.*" + }, + "time": "2015-11-20 09:17:45", + "type": "yii2-extension", + "extra": { + "asset-installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "rmrevin\\yii\\fontawesome\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Revin Roman", + "email": "roman@rmrevin.com", + "homepage": "https://rmrevin.com/" + } + ], + "description": "Asset Bundle for Yii2 with Font Awesome", + "keywords": [ + "asset", + "awesome", + "bundle", + "font", + "yii" + ] } ] diff --git a/vendor/dmstr/yii2-adminlte-asset/CHANGELOG.md b/vendor/dmstr/yii2-adminlte-asset/CHANGELOG.md index a1adb8d..5e963fe 100644 --- a/vendor/dmstr/yii2-adminlte-asset/CHANGELOG.md +++ b/vendor/dmstr/yii2-adminlte-asset/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG --------- +## 2.2.4 + * [FIX] fixed active menu with modules (Vasiliy Baranov) + * [ENH] added .hold-transition + +## 2.2.3 + * [ENH] : updated Gravatar widget E-Mail usage (@Quexer69) + ## 2.2.2 * fixed Menu widget selection * updated example views @@ -114,4 +121,4 @@ CHANGELOG * fixed missing csrf token, updated menu, code-formatting * updated paths, added Phundament 4 template * update README.md - * initial commit \ No newline at end of file + * initial commit diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/phundament/app/layouts/main.php b/vendor/dmstr/yii2-adminlte-asset/example-views/phundament/app/layouts/main.php index 7aa21d0..cb22270 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/phundament/app/layouts/main.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/phundament/app/layouts/main.php @@ -29,7 +29,7 @@ dmstr\web\AdminLteAsset::register($this); - + beginBody() ?>
diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php index 9149654..543feed 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php @@ -1,9 +1,5 @@ user->identity->firstname.' '.Yii::$app->user->identity->lastname; /* @var $this \yii\web\View */ /* @var $content string */ @@ -234,7 +230,7 @@ $username = Yii::$app->user->identity->firstname.' '.Yii::$app->user->identity->
  • User Image - +
      @@ -243,12 +239,11 @@ $username = Yii::$app->user->identity->firstname.' '.Yii::$app->user->identity-> alt="User Image"/>

      - - Web Developer + Alexander Pierce - Web Developer Member since Nov. 2012

      -
    • Followers @@ -260,11 +255,10 @@ $username = Yii::$app->user->identity->firstname.' '.Yii::$app->user->identity-> Friends
      • - -->
    • - Profile + Profile
      ['class' => 'sidebar-menu'], 'items' => [ - ['label' => 'Страница', 'icon' => 'fa fa-file-code-o', 'url' => ['/page/']], - ['label' => 'Термин', 'icon' => 'fa fa-file-code-o', 'url' => ['/termin_lang/']], - ['label' => 'Меню', 'icon' => 'fa fa-file-code-o', 'url' => ['/menu/']], + ['label' => 'Menu Yii2', 'options' => ['class' => 'header']], ['label' => 'Gii', 'icon' => 'fa fa-file-code-o', 'url' => ['/gii']], ['label' => 'Debug', 'icon' => 'fa fa-dashboard', 'url' => ['/debug']], ['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest], - ['label' => 'Пользователи', 'icon' => 'fa fa-file-code-o', 'url' => ['/user/']], - [ - 'label' => 'Роли', - 'icon' => 'fa fa-share', - 'url' => '#', - 'items' => [ - ['label' => 'Управление ролями', 'icon' => 'fa fa-file-code-o', 'url' => ['/permit/access/role'],], - ['label' => 'Управление правами доступа', 'icon' => 'fa fa-dashboard', 'url' => ['/permit/access/permission'],], - ], - ], [ 'label' => 'Same tools', 'icon' => 'fa fa-share', diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/main.php b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/main.php index 1aa871f..329db7a 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/main.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/main.php @@ -36,7 +36,7 @@ if (Yii::$app->controller->action->id === 'login') { <?= Html::encode($this->title) ?> head() ?> - + beginBody() ?>
      diff --git a/vendor/dmstr/yii2-adminlte-asset/widgets/Menu.php b/vendor/dmstr/yii2-adminlte-asset/widgets/Menu.php index 1d39e74..c1a20fb 100644 --- a/vendor/dmstr/yii2-adminlte-asset/widgets/Menu.php +++ b/vendor/dmstr/yii2-adminlte-asset/widgets/Menu.php @@ -152,6 +152,9 @@ class Menu extends \yii\widgets\Menu if (isset($arrayRoute[1]) && $arrayRoute[1] !== $arrayThisRoute[1]) { return false; } + if (isset($arrayRoute[2]) && $arrayRoute[2] !== $arrayThisRoute[2]) { + return false; + } unset($item['url']['#']); if (count($item['url']) > 1) { foreach (array_splice($item['url'], 1) as $name => $value) { diff --git a/vendor/kartik-v/yii2-krajee-base/AnimateAsset.php b/vendor/kartik-v/yii2-krajee-base/AnimateAsset.php index a54bd0c..4412baf 100644 --- a/vendor/kartik-v/yii2-krajee-base/AnimateAsset.php +++ b/vendor/kartik-v/yii2-krajee-base/AnimateAsset.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; diff --git a/vendor/kartik-v/yii2-krajee-base/AssetBundle.php b/vendor/kartik-v/yii2-krajee-base/AssetBundle.php index f3e27e2..0182ec9 100644 --- a/vendor/kartik-v/yii2-krajee-base/AssetBundle.php +++ b/vendor/kartik-v/yii2-krajee-base/AssetBundle.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -21,10 +21,10 @@ class AssetBundle extends \yii\web\AssetBundle const EMPTY_PATH = 'N0/P@T#'; const KRAJEE_ASSET = 'K3/@$$3T$'; const KRAJEE_PATH = 'K3/P@T#'; - + public $js = self::KRAJEE_ASSET; public $css = self::KRAJEE_ASSET; - public $sourcePath = self::KRAJEE_PATH; + public $sourcePath = self::KRAJEE_PATH; public $depends = [ 'yii\web\JqueryAsset', 'yii\web\YiiAsset', @@ -34,7 +34,8 @@ class AssetBundle extends \yii\web\AssetBundle /** * @inheritdoc */ - public function init() { + public function init() + { parent::init(); if ($this->js === self::KRAJEE_ASSET) { $this->js = []; @@ -46,7 +47,7 @@ class AssetBundle extends \yii\web\AssetBundle $this->sourcePath = null; } } - + /** * Adds a language JS locale file * @@ -62,7 +63,7 @@ class AssetBundle extends \yii\web\AssetBundle if (empty($lang) || substr($lang, 0, 2) == 'en') { return $this; } - $ext = $min ? (YII_DEBUG ? ".min.js" : ".js") : ".js"; + $ext = $min ? (YII_DEBUG ? ".min.js" : ".js") : ".js"; $file = "{$prefix}{$lang}{$ext}"; if ($dir === null) { $dir = 'js'; @@ -75,16 +76,16 @@ class AssetBundle extends \yii\web\AssetBundle $file = "{$prefix}{$lang}{$ext}"; } if (Config::fileExists("{$path}/{$file}")) { - $this->js[] = empty($dir) ? $file : "{$dir}/{$file}"; + $this->js[] = empty($dir) ? $file : "{$dir}/{$file}"; } return $this; } - + /** * Set up CSS and JS asset arrays based on the base-file names * * @param string $type whether 'css' or 'js' - * @param array $files the list of 'css' or 'js' basefile names + * @param array $files the list of 'css' or 'js' basefile names */ protected function setupAssets($type, $files = []) { diff --git a/vendor/kartik-v/yii2-krajee-base/CHANGE.md b/vendor/kartik-v/yii2-krajee-base/CHANGE.md index 73e4abf..d012d84 100644 --- a/vendor/kartik-v/yii2-krajee-base/CHANGE.md +++ b/vendor/kartik-v/yii2-krajee-base/CHANGE.md @@ -1,18 +1,31 @@ -version 1.7.7 -============= +Change Log: `yii2-krajee-base` +============================== + +## Version 1.7.8 + +**Date:** 22-Nov-2015 + +- (enh #40): Various enhancements for PJAX . +- (enh #41): Added .gitignore for Composer stuff. +- (bug #42): Better and more correct date format parsing. +- (enh #46): Enhance `Html5Input` initialization. +- (enh #47): Implement message translations. + +## Version 1.7.7 + **Date:** 16-Jun-2015 - (enh #37): Set range input caption to change during slide. - (enh #38): Update to use `Json::htmlEncode` as per yii release v2.0.4. -version 1.7.6 -============= +## Version 1.7.6 + **Date:** 09-May-2015 - (enh #36): Add kv-input-group-hide class. -version 1.7.5 -============= +## Version 1.7.5 + **Date:** 03-May-2015 - (enh #30): Improve translation trait for determining messages folder. @@ -20,8 +33,8 @@ version 1.7.5 - (enh #34): New `addLanguage` method in `AssetBundle`. - (enh #35): Allow extending translation messages. -version 1.7.4 -============= +## Version 1.7.4 + **Date:** 13-Feb-2015 - (enh #28): Create WidgetTrait for better code reuse. @@ -29,27 +42,27 @@ version 1.7.4 - (enh #29): New `getModule` and `initModule` methods in `Config`. - Set copyright year to current. -version 1.7.3 -============= +## Version 1.7.3 + **Date:** 25-Jan-2015 - (enh #26): Enhance `Widget` options to store multiple plugin config. - (enh #27): Set directory and URL separator rightly for the setLanguage validation. -version 1.7.2 -============= +## Version 1.7.2 + **Date:** 20-Jan-2015 - (enh #24): Revert use of DIRECTORY_SEPARATOR and use forward slash instead. -version 1.7.1 -============= +## Version 1.7.1 + **Date:** 15-Jan-2015 - (enh #23): Enhance AssetBundle for over riding empty assets from AssetManager. -version 1.7.0 -============= +## Version 1.7.0 + **Date:** 12-Jan-2015 - Fix kartik-v/yii2-widget-datepicker#10 - Language definition in pluginOptions @@ -57,8 +70,8 @@ version 1.7.0 - (enh #22): Implement base Module class. - Code formatting updates as per Yii2 coding style. -version 1.6.0 -============= +## Version 1.6.0 + **Date:** 16-Dec-2014 - (bug #16): variable `$short` in `InputWidget` in method `setLanguage` set without `$prefix`. @@ -67,8 +80,8 @@ version 1.6.0 - (enh #19): Avoid inspect errors in IDE for `Html5Input`. - (enh #20): Add new PluginAssetBundle for bootstrap JS dependent plugins. -version 1.5.0 -============= +## Version 1.5.0 + **Date:** 06-Dec-2014 - (enh #11): Added new properties `disabled` and `readonly` to `InputWidget` and `Html5Input`. @@ -79,8 +92,8 @@ version 1.5.0 - (enh #13): Enhancements to Config helper and change `self` methods to `static`. - (bug #14): Fix line terminators and new lines in `getPluginScript`. -version 1.4.0 -============= +## Version 1.4.0 + **Date:** 29-Nov-2014 - (enh #9): Enhanced language validation for combined ISO-639 and ISO-3166 codes @@ -93,8 +106,8 @@ version 1.4.0 - `getCurrentDir` - gets the current directory of the extended class object - `fileExists` - modified file_exists method after replacing the slashes with right directory separator -version 1.3.0 -============= +## Version 1.3.0 + **Date:** 25-Nov-2014 - (enh #6): Enhance `InputWidget` for attaching multiple jQuery plugins. @@ -118,8 +131,8 @@ Following functionality included in `InputWidget` and `Widget` classes: - New protected property `_dataVar` included for generating the above data attribute. -version 1.2.0 -============= +## Version 1.2.0 + **Date:** 25-Nov-2014 - (bug #2): AssetBundle::EMPTY_PATH is not setting sourcePath to null. @@ -127,8 +140,8 @@ version 1.2.0 - (enh #4): Add validations for html inputs, dropdowns, and widgets in `Config`. - (enh #5): Correctly validate checkbox and radio checked states for `InputWidget`. -version 1.1.0 -============= +## Version 1.1.0 + **Date:** 10-Nov-2014 - Validation for sub repositories containing input widgets. @@ -137,8 +150,8 @@ version 1.1.0 - Include `AnimateAsset` bundle. - Code formatting as per standards. -version 1.0.0 -============= +## Version 1.0.0 + **Date:** 06-Nov-2014 Initial release \ No newline at end of file diff --git a/vendor/kartik-v/yii2-krajee-base/Config.php b/vendor/kartik-v/yii2-krajee-base/Config.php index 764b834..4baa878 100644 --- a/vendor/kartik-v/yii2-krajee-base/Config.php +++ b/vendor/kartik-v/yii2-krajee-base/Config.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -43,7 +43,9 @@ class Config 'listBox', 'dropDownList', 'checkboxList', - 'radioList' + 'radioList', + 'checkboxButtonGroup', + 'radioButtonGroup' ]; protected static $_validInputWidgets = [ @@ -187,6 +189,9 @@ class Config /** * Check if a namespaced widget is valid or installed. * + * @param string $type the widget type + * @param string $reason the message to be displayed for dependency failure + * * @throws InvalidConfigException */ public static function validateInputWidget($type, $reason = self::DEFAULT_REASON) @@ -197,8 +202,7 @@ class Config } /** - * Convert a language string in yii\i18n format to - * a ISO-639 format (2 or 3 letter code). + * Convert a language string in yii\i18n format to a ISO-639 format (2 or 3 letter code). * * @param string $language the input language string * @@ -263,6 +267,7 @@ class Config */ public static function initModule($class) { + /** @noinspection PhpUndefinedFieldInspection */ $m = $class::MODULE; $module = $m ? static::getModule($m) : null; if ($module === null || !$module instanceof $class) { diff --git a/vendor/kartik-v/yii2-krajee-base/Html5Input.php b/vendor/kartik-v/yii2-krajee-base/Html5Input.php index e66b67b..d8ae3d3 100644 --- a/vendor/kartik-v/yii2-krajee-base/Html5Input.php +++ b/vendor/kartik-v/yii2-krajee-base/Html5Input.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -23,73 +23,82 @@ use yii\helpers\ArrayHelper; class Html5Input extends InputWidget { /** - * @var array the special inputs which need captions - */ - private static $_specialInputs = [ - 'color', - 'range' - ]; - /** * @var string the HTML 5 input type */ public $type; + /** * @var string the width in 'px' or '%' of the HTML5 input container */ public $width; + /** * @var array the HTML attributes for the widget container */ public $containerOptions = []; + /** * @var array the HTML attributes for the HTML-5 input. */ public $html5Options = []; + /** * @var array the HTML attributes for the HTML-5 input container */ public $html5Container = []; + /** * @var string|boolean the message shown for unsupported browser. If set to false * will not be displayed */ public $noSupport; + /** * @var string array the HTML attributes for container displaying unsupported browser message */ public $noSupportOptions = []; + /** * @var string one of the SIZE modifiers 'lg', 'md', 'sm', 'xs' */ public $size; + /** * @var array the addon content - * - prepend: array/string the prepend addon content. If set as an array, the - * following options can be set: + * - prepend: array/string the prepend addon content. If set as an array, the following options can be set: * - content: string the prepend addon content * - asButton: boolean whether the addon is a button * - options: array the HTML attributes for the prepend addon - * - append: array/string the append addon content. If set as an array, the - * following options can be set: + * - append: array/string the append addon content. If set as an array, the following options can be set: * - content: string the append addon content * - asButton: boolean whether the addon is a button * - options: array the HTML attributes for the append addon - * - preCaption: array/string the addon content placed before the caption. If - * set as an array, the following options can be set: + * - preCaption: array/string the addon content placed before the caption. If set as an array, the following + * options can be set: * - content: string the append addon content * - asButton: boolean whether the addon is a button * - options: array the HTML attributes for the append addon */ public $addon = []; /** - * Runs the widget + * @var array the special inputs which need captions + */ + private static $_specialInputs = [ + 'color', + 'range' + ]; + + /** + * @inheritdoc */ - public function init() + public function run() { - parent::init(); $this->initInput(); } + /** + * Initializes the input + */ protected function initInput() { $this->initDisability($this->html5Options); @@ -117,7 +126,7 @@ class Html5Input extends InputWidget $input = 'jQuery("#' . $this->html5Options['id'] . '")'; $js = "{$caption}.on('change',function(){{$input}.val(this.value)});\n" . "{$input}.on('input change',function(e){{$caption}.val(this.value);if(e.type=='change'){{$caption}.trigger('change');}});"; - $view->registerJs($js); + $this->registerWidgetJs($js); } /** @@ -146,8 +155,11 @@ class Html5Input extends InputWidget $message = ''; } else { $noSupport = !empty($this->noSupport) ? $this->noSupport : - Yii::t('app', 'It is recommended you use an upgraded browser to display the {type} control properly.', - ['type' => $this->type]); + Yii::t( + 'kvbase', + 'It is recommended you use an upgraded browser to display the {type} control properly.', + ['type' => $this->type] + ); $message = "\n
      " . Html::tag('div', $noSupport, $this->noSupportOptions); } return "\n{$content}\n"; diff --git a/vendor/kartik-v/yii2-krajee-base/Html5InputAsset.php b/vendor/kartik-v/yii2-krajee-base/Html5InputAsset.php index a484dbe..03730d6 100644 --- a/vendor/kartik-v/yii2-krajee-base/Html5InputAsset.php +++ b/vendor/kartik-v/yii2-krajee-base/Html5InputAsset.php @@ -3,7 +3,7 @@ /** * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 * @package yii2-krajee-base - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -14,7 +14,7 @@ namespace kartik\base; * @author Kartik Visweswaran * @since 1.0 */ -class Html5InputAsset extends \kartik\base\AssetBundle +class Html5InputAsset extends AssetBundle { /** * @inheritdoc diff --git a/vendor/kartik-v/yii2-krajee-base/InputWidget.php b/vendor/kartik-v/yii2-krajee-base/InputWidget.php index cdb88e2..95231d8 100644 --- a/vendor/kartik-v/yii2-krajee-base/InputWidget.php +++ b/vendor/kartik-v/yii2-krajee-base/InputWidget.php @@ -4,12 +4,13 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; use Yii; +use yii\base\InvalidConfigException; use yii\helpers\FormatConverter; use yii\helpers\Html; use yii\helpers\ArrayHelper; @@ -77,6 +78,12 @@ class InputWidget extends \yii\widgets\InputWidget * ~~~ */ public $pluginEvents = []; + + /** + * @var string a pjax container identifier if applicable inside which the widget will be rendered. + * If this is set, the widget will automatically reinitialize on pjax completion. + */ + public $pjaxContainerId; /** * @var boolean whether the widget should automatically format the date from @@ -132,6 +139,15 @@ class InputWidget extends \yii\widgets\InputWidget public function init() { parent::init(); + $this->initInputWidget(); + } + + /** + * Initializes the input widget + */ + protected function initInputWidget() + { + $this->initI18N(__DIR__, 'kvbase'); if (!isset($this->language)) { $this->language = Yii::$app->language; } @@ -182,6 +198,7 @@ class InputWidget extends \yii\widgets\InputWidget /** * Sets the language JS file if it exists * + * @param string $prefix the language filename prefix * @param string $assetPath the path to the assets * @param string $filePath the path to the JS file with the file name prefix * @param string $suffix the file name suffix - defaults to '.js' @@ -220,6 +237,11 @@ class InputWidget extends \yii\widgets\InputWidget /** * Generates an input + * + * @param string $type the input type + * @param bool $list whether the input is of dropdown list type + * + * @return mixed */ protected function getInput($type, $list = false) { @@ -313,20 +335,18 @@ class InputWidget extends \yii\widgets\InputWidget } if (isset($this->pluginOptions['format'])) { $format = $this->pluginOptions['format']; - $format = strncmp($format, 'php:', 4) === 0 ? substr($format, - 4) : FormatConverter::convertDateIcuToPhp($format, $type); + $format = strncmp($format, 'php:', 4) === 0 ? substr($format, 4) : + FormatConverter::convertDateIcuToPhp($format, $type); $this->pluginOptions['format'] = static::convertDateFormat($format); return; } $attrib = $type . 'Format'; $format = isset(Yii::$app->formatter->$attrib) ? Yii::$app->formatter->$attrib : ''; - if (isset($this->dateFormat) && strncmp($this->dateFormat, 'php:', 4) === 0) { - $this->pluginOptions['format'] = static::convertDateFormat(substr($format, 4)); - } elseif ($format != '') { - $format = FormatConverter::convertDateIcuToPhp($format, $type); - $this->pluginOptions['format'] = static::convertDateFormat($format); - } else { - throw InvalidConfigException("Error parsing '{$type}' format."); + if (empty($format)) { + throw new InvalidConfigException("Error parsing '{$type}' format."); } + $format = strncmp($format, 'php:', 4) === 0 ? substr($format, 4) : + FormatConverter::convertDateIcuToPhp($format, $type); + $this->pluginOptions['format'] = static::convertDateFormat($format); } -} \ No newline at end of file +} diff --git a/vendor/kartik-v/yii2-krajee-base/Module.php b/vendor/kartik-v/yii2-krajee-base/Module.php index 049b674..44427c1 100644 --- a/vendor/kartik-v/yii2-krajee-base/Module.php +++ b/vendor/kartik-v/yii2-krajee-base/Module.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -13,7 +13,7 @@ namespace kartik\base; * Base module class for Krajee extensions * * @author Kartik Visweswaran - * @since 1.7.7 + * @since 1.7.8 */ class Module extends \yii\base\Module { diff --git a/vendor/kartik-v/yii2-krajee-base/PluginAssetBundle.php b/vendor/kartik-v/yii2-krajee-base/PluginAssetBundle.php index c11fcba..02382a4 100644 --- a/vendor/kartik-v/yii2-krajee-base/PluginAssetBundle.php +++ b/vendor/kartik-v/yii2-krajee-base/PluginAssetBundle.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -26,4 +26,3 @@ class PluginAssetBundle extends AssetBundle 'yii\bootstrap\BootstrapPluginAsset' ]; } - \ No newline at end of file diff --git a/vendor/kartik-v/yii2-krajee-base/README.md b/vendor/kartik-v/yii2-krajee-base/README.md index 9b2bf3c..b01d6b5 100644 --- a/vendor/kartik-v/yii2-krajee-base/README.md +++ b/vendor/kartik-v/yii2-krajee-base/README.md @@ -1,7 +1,7 @@ yii2-krajee-base ================ -[![Latest Stable Version](https://poser.pugx.org/kartik-v/yii2-krajee-base/v/stable)](https://packagist.org/packages/kartik-v/yii2-krajee-base) +[![Latest Stable Version](https://img.shields.io/packagist/v/kartik-v/yii2-krajee-base.svg)](https://packagist.org/packages/kartik-v/yii2-krajee-base) [![License](https://poser.pugx.org/kartik-v/yii2-krajee-base/license)](https://packagist.org/packages/kartik-v/yii2-krajee-base) [![Total Downloads](https://poser.pugx.org/kartik-v/yii2-krajee-base/downloads)](https://packagist.org/packages/kartik-v/yii2-krajee-base) [![Monthly Downloads](https://poser.pugx.org/kartik-v/yii2-krajee-base/d/monthly)](https://packagist.org/packages/kartik-v/yii2-krajee-base) @@ -15,7 +15,7 @@ This is a base library with set of foundation classes and components used by all To ensure a leaner code base / foundation component for use in all Krajee extensions (e.g. yii2-widgets, yii2-datecontrol, yii2-grid, yii2-dynagrid etc.). This should allow most developers to plug and play components only they need, without needing the complete suite of widgets. For example, this mitigates [this issue](https://github.com/kartik-v/yii2-grid/issues/123). ## Latest Release -The latest version of the extension is v1.7.7. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-krajee-base/blob/master/CHANGE.md) for details. +The latest version of the extension is v1.7.8. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-krajee-base/blob/master/CHANGE.md) for details. ## Extension Classes diff --git a/vendor/kartik-v/yii2-krajee-base/TranslationTrait.php b/vendor/kartik-v/yii2-krajee-base/TranslationTrait.php index ed57418..56e26e8 100644 --- a/vendor/kartik-v/yii2-krajee-base/TranslationTrait.php +++ b/vendor/kartik-v/yii2-krajee-base/TranslationTrait.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -14,33 +14,41 @@ use Yii; /** * Trait for all translations used in Krajee extensions * + * @property array $i18n + * * @author Kartik Visweswaran - * @since 1.7.7 + * @since 1.7.8 */ trait TranslationTrait { /** * Yii i18n messages configuration for generating translations * + * @param string $dir the directory path where translation files will exist + * @param string $cat the message category + * * @return void */ - public function initI18N($dir = '') + public function initI18N($dir = '', $cat = '') { - if (empty($this->_msgCat)) { + if (empty($cat) && empty($this->_msgCat)) { return; } + if (empty($cat)) { + $cat = $this->_msgCat; + } if (empty($dir)) { $reflector = new \ReflectionClass(get_class($this)); $dir = dirname($reflector->getFileName()); } - Yii::setAlias("@{$this->_msgCat}", $dir); + Yii::setAlias("@{$cat}", $dir); if (empty($this->i18n)) { $this->i18n = [ 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => "@{$this->_msgCat}/messages", + 'basePath' => "@{$cat}/messages", 'forceTranslation' => true ]; } - Yii::$app->i18n->translations[$this->_msgCat . '*'] = $this->i18n; + Yii::$app->i18n->translations["{$cat}*"] = $this->i18n; } -} \ No newline at end of file +} diff --git a/vendor/kartik-v/yii2-krajee-base/Widget.php b/vendor/kartik-v/yii2-krajee-base/Widget.php index 7876f4f..31fbfe4 100644 --- a/vendor/kartik-v/yii2-krajee-base/Widget.php +++ b/vendor/kartik-v/yii2-krajee-base/Widget.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -33,9 +33,7 @@ class Widget extends \yii\base\Widget public $pluginOptions = []; /** - * @var array widget JQuery events. You must define events in - * event-name => event-function format - * for example: + * @var array widget JQuery events. You must define events in event-name => event-function format for example: * ~~~ * pluginEvents = [ * "change" => "function() { log("change"); }", @@ -46,6 +44,12 @@ class Widget extends \yii\base\Widget public $pluginEvents = []; /** + * @var string a pjax container identifier if applicable inside which the widget will be rendered. If this is set, + * the widget will automatically reinitialize on pjax completion. + */ + public $pjaxContainerId; + + /** * @var array the the internalization configuration for this widget */ public $i18n = []; diff --git a/vendor/kartik-v/yii2-krajee-base/WidgetAsset.php b/vendor/kartik-v/yii2-krajee-base/WidgetAsset.php index 4f8e627..f391903 100644 --- a/vendor/kartik-v/yii2-krajee-base/WidgetAsset.php +++ b/vendor/kartik-v/yii2-krajee-base/WidgetAsset.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; diff --git a/vendor/kartik-v/yii2-krajee-base/WidgetTrait.php b/vendor/kartik-v/yii2-krajee-base/WidgetTrait.php index f842306..4daa51f 100644 --- a/vendor/kartik-v/yii2-krajee-base/WidgetTrait.php +++ b/vendor/kartik-v/yii2-krajee-base/WidgetTrait.php @@ -4,7 +4,7 @@ * @package yii2-krajee-base * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 */ namespace kartik\base; @@ -16,6 +16,14 @@ use yii\web\View; /** * Trait used for Krajee widgets. * + * @property array $options + * @property array $pluginOptions + * @property array $_encOptions + * @property string $_hashVar + * @property string $_dataVar + * + * @method View getView() + * * @author Kartik Visweswaran * @since 1.6.0 */ @@ -30,6 +38,7 @@ trait WidgetTrait */ protected function setDataVar($name) { + /** @noinspection PhpUndefinedFieldInspection */ $this->_dataVar = "data-krajee-{$name}"; } @@ -76,14 +85,15 @@ trait WidgetTrait /** * Registers plugin options by storing it in a hashed javascript variable * + * @param string $name the plugin name + * * @return void */ protected function registerPluginOptions($name) { - $view = $this->getView(); $this->hashPluginOptions($name); $encOptions = empty($this->_encOptions) ? '{}' : $this->_encOptions; - $view->registerJs("var {$this->_hashVar} = {$encOptions};\n", View::POS_HEAD); + $this->registerWidgetJs("var {$this->_hashVar} = {$encOptions};\n", View::POS_HEAD); } /** @@ -94,7 +104,7 @@ trait WidgetTrait * @param string $callback the javascript callback function to be called after plugin loads * @param string $callbackCon the javascript callback function to be passed to the plugin constructor * - * @return the generated plugin script + * @return string the generated plugin script */ protected function getPluginScript($name, $element = null, $callback = null, $callbackCon = null) { @@ -131,9 +141,35 @@ trait WidgetTrait protected function registerPlugin($name, $element = null, $callback = null, $callbackCon = null) { $script = $this->getPluginScript($name, $element, $callback, $callbackCon); - if (!empty($script)) { - $view = $this->getView(); - $view->registerJs($script); + $this->registerWidgetJs($script); + } + + /** + * Registers a JS code block for the widget. + * + * @param string $js the JS code block to be registered + * @param integer $position the position at which the JS script tag should be inserted in a page. The possible + * values are: + * - [[POS_HEAD]]: in the head section + * - [[POS_BEGIN]]: at the beginning of the body section + * - [[POS_END]]: at the end of the body section + * - [[POS_LOAD]]: enclosed within jQuery(window).load(). Note that by using this position, the method will + * automatically register the jQuery js file. + * - [[POS_READY]]: enclosed within jQuery(document).ready(). This is the default value. Note that by using + * this position, the method will automatically register the jQuery js file. + * @param string $key the key that identifies the JS code block. If null, it will use $js as the key. If two JS + * code blocks are registered with the same key, the latter will overwrite the former. + */ + public function registerWidgetJs($js, $position = View::POS_READY, $key = null) + { + if (empty($js)) { + return; + } + $view = $this->getView(); + $view->registerJs($js, $position, $key); + if (!empty($this->pjaxContainerId) && ($position === View::POS_LOAD || $position === View::POS_READY)) { + $pjax = 'jQuery("#' . $this->pjaxContainerId . '")'; + $view->registerJs("{$pjax}.on('pjax:complete',function(){ {$js} });"); } } -} \ No newline at end of file +} diff --git a/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.css b/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.css index afda59d..2010dad 100644 --- a/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.css +++ b/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.css @@ -3,7 +3,7 @@ * @subpackage yii2-widget-activeform * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 * * HTML 5 input styling for Twitter Bootstrap 3.0 * Covers color and range inputs diff --git a/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.min.css b/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.min.css index 03fd6ca..429d0a8 100644 --- a/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.min.css +++ b/vendor/kartik-v/yii2-krajee-base/assets/css/html5input.min.css @@ -3,7 +3,7 @@ * @subpackage yii2-widget-activeform * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 * * HTML 5 input styling for Twitter Bootstrap 3.0 * Covers color and range inputs diff --git a/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.css b/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.css index 83c2d0b..0ba26e7 100644 --- a/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.css +++ b/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.css @@ -3,7 +3,7 @@ * @subpackage yii2-widget-activeform * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 * * Common CSS file for all kartik\widgets. * diff --git a/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.min.css b/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.min.css index 96d70a8..786b9f5 100644 --- a/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.min.css +++ b/vendor/kartik-v/yii2-krajee-base/assets/css/kv-widgets.min.css @@ -3,7 +3,7 @@ * @subpackage yii2-widget-activeform * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015 - * @version 1.7.7 + * @version 1.7.8 * * Common CSS file for all kartik\widgets. * diff --git a/vendor/rmrevin/yii2-fontawesome/.bowerrc b/vendor/rmrevin/yii2-fontawesome/.bowerrc deleted file mode 100644 index d60ccd3..0000000 --- a/vendor/rmrevin/yii2-fontawesome/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "vendor/bower", - "interactive": true -} \ No newline at end of file diff --git a/vendor/rmrevin/yii2-fontawesome/.scrutinizer.yml b/vendor/rmrevin/yii2-fontawesome/.scrutinizer.yml index 2b54bc8..1187ac6 100644 --- a/vendor/rmrevin/yii2-fontawesome/.scrutinizer.yml +++ b/vendor/rmrevin/yii2-fontawesome/.scrutinizer.yml @@ -4,7 +4,7 @@ build: version: 5.5.12 dependencies: before: - - composer global require "fxp/composer-asset-plugin:1.0.0" + - composer global require "fxp/composer-asset-plugin:~1.0.0" tests: override: - phpunit diff --git a/vendor/rmrevin/yii2-fontawesome/CHANGELOG.md b/vendor/rmrevin/yii2-fontawesome/CHANGELOG.md index fece258..616fd3b 100644 --- a/vendor/rmrevin/yii2-fontawesome/CHANGELOG.md +++ b/vendor/rmrevin/yii2-fontawesome/CHANGELOG.md @@ -1,3 +1,14 @@ +2015-11-20 - 2.12.2 +------------------- +* Add shortcuts methods `i()` for `FA::icon()` and `FA::s()` for `FA::stack()` +* Update readme + +2015-11-09 - 2.12.1 +------------------- +* Variable `FA::$cssPrefix` transferred to the class `FontAwesome`. +* Refactoring. +* Update tests. + 2015-08-15 - 2.12.0 ------------------- * `Font Awesome` updated to version `4.4`. diff --git a/vendor/rmrevin/yii2-fontawesome/FA.php b/vendor/rmrevin/yii2-fontawesome/FA.php index 0135c57..bae9bda 100644 --- a/vendor/rmrevin/yii2-fontawesome/FA.php +++ b/vendor/rmrevin/yii2-fontawesome/FA.php @@ -14,9 +14,6 @@ namespace rmrevin\yii\fontawesome; class FA extends FontAwesome { - /** @var string CSS Class prefix */ - public static $cssPrefix = 'fa'; - /** * Get all icon constants for dropdown list in example * @param bool $html whether to render icon as array value prefix diff --git a/vendor/rmrevin/yii2-fontawesome/FontAwesome.php b/vendor/rmrevin/yii2-fontawesome/FontAwesome.php index ef9bebf..b3c3e00 100644 --- a/vendor/rmrevin/yii2-fontawesome/FontAwesome.php +++ b/vendor/rmrevin/yii2-fontawesome/FontAwesome.php @@ -7,6 +7,8 @@ namespace rmrevin\yii\fontawesome; +use rmrevin\yii\fontawesome\component; + /** * Class FA * @package rmrevin\yii\fontawesome @@ -14,7 +16,12 @@ namespace rmrevin\yii\fontawesome; class FontAwesome { + /** @var string CSS Class prefix */ + public static $cssPrefix = 'fa'; + /** + * Creates an `Icon` component that can be used to FontAwesome html icon + * * @param string $name * @param array $options * @return component\Icon @@ -25,6 +32,21 @@ class FontAwesome } /** + * Shortcut for `icon()` method + * @see icon() + * + * @param string $name + * @param array $options + * @return component\Icon + */ + public static function i($name, $options = []) + { + return static::icon($name, $options); + } + + /** + * Creates an `Stack` component that can be used to FontAwesome html icon + * * @param array $options * @return component\Stack */ @@ -34,6 +56,18 @@ class FontAwesome } /** + * Shortcut for `stack()` method + * @see stack() + * + * @param array $options + * @return component\Stack + */ + public static function s($options = []) + { + return static::stack($options); + } + + /** * Size values * @see rmrevin\yii\fontawesome\component\Icon::size */ @@ -57,4 +91,4 @@ class FontAwesome */ const FLIP_HORIZONTAL = 'horizontal'; const FLIP_VERTICAL = 'vertical'; -} \ No newline at end of file +} diff --git a/vendor/rmrevin/yii2-fontawesome/README.md b/vendor/rmrevin/yii2-fontawesome/README.md index 259bc5a..56f823f 100644 --- a/vendor/rmrevin/yii2-fontawesome/README.md +++ b/vendor/rmrevin/yii2-fontawesome/README.md @@ -1,4 +1,4 @@ -Yii 2 Font Awesome Asset Bundle +Yii 2 [Font Awesome](http://fortawesome.github.io/Font-Awesome/) Asset Bundle =============================== This extension provides a assets bundle with [Font Awesome](http://fortawesome.github.io/Font-Awesome/) @@ -20,7 +20,8 @@ Code Status Support ------- -[GutHub issues](https://github.com/rmrevin/yii2-fontawesome/issues) or [public chat](https://gitter.im/rmrevin/support). +* [GutHub issues](https://github.com/rmrevin/yii2-fontawesome/issues) +* [Public chat](https://gitter.im/rmrevin/support) Installation ------------ @@ -30,13 +31,13 @@ The preferred way to install this extension is through [composer](https://getcom Either run ```bash -composer require "rmrevin/yii2-fontawesome:2.10.*" +composer require "rmrevin/yii2-fontawesome:~2.12" ``` or add ``` -"rmrevin/yii2-fontawesome": "2.10.*", +"rmrevin/yii2-fontawesome": "~2.12", ``` to the `require` section of your `composer.json` file. @@ -66,22 +67,78 @@ class AppAsset extends AssetBundle ``` -Helper ------- +Class reference +--------------- + +Namespace: `rmrevin\yii\fontawesome`; + +###Class `FA` or `FontAwesome` + +* `static FA::icon($name, $options=[])` - Creates an [`component\Icon`](#class-componenticon-icon) that can be used to FontAwesome html icon + * `$name` - name of icon in font awesome set. + * `$options` - additional attributes for `i.fa` html tag. +* `static FA::stack($name, $options=[])` - Creates an [`component\Stack`](#class-componentstack-stack) that can be used to FontAwesome html icon + * `$options` - additional attributes for `span.fa-stack` html tag. + +###Class `component\Icon` (`$Icon`) + +* `(string)$Icon` - render icon +* `$Icon->render()` - render icon +* `$Icon->tag($value)` - set another html tag for icon (default `i`) + * `$value` - name of tag +* `$Icon->addCssClass($value)` - add to html tag css class in `$value` + * `$value` - name of css class +* `$Icon->inverse()` - add to html tag css class `fa-inverse` +* `$Icon->spin()` - add to html tag css class `fa-spin` +* `$Icon->fixedWidth()` - add to html tag css class `fa-fw` +* `$Icon->ul()` - add to html tag css class `fa-ul` +* `$Icon->li()` - add to html tag css class `fa-li` +* `$Icon->border()` - add to html tag css class `fa-border` +* `$Icon->pullLeft()` - add to html tag css class `pull-left` +* `$Icon->pullRight()` - add to html tag css class `pull-right` +* `$Icon->size($value)` - add to html tag css class with size + * `$value` - size value (variants: `FA::SIZE_LARGE`, `FA::SIZE_2X`, `FA::SIZE_3X`, `FA::SIZE_4X`, `FA::SIZE_5X`) +* `$Icon->rotate($value)` - add to html tag css class with rotate + * `$value` - rotate value (variants: `FA::ROTATE_90`, `FA::ROTATE_180`, `FA::ROTATE_270`) +* `$Icon->flip($value)` - add to html tag css class with rotate + * `$value` - flip value (variants: `FA::FLIP_HORIZONTAL`, `FA::FLIP_VERTICAL`) + +###Class `component\Stack` (`$Stack`) + +* `(string)$Stack` - render icon stack +* `$Stack->render()` - render icon stack +* `$Stack->tag($value)` - set another html tag for icon stack (default `span`) +* `$Stack->icon($icon, $options=[])` - set icon for stack + * `$icon` - name of icon or `component\Icon` object + * `$options` - additional attributes for icon html tag. +* `$Stack->icon($icon, $options=[])` - set background icon for stack + * `$icon` - name of icon or `component\Icon` object + * `$options` - additional attributes for icon html tag. + +Helper examples +--------------- ```php use rmrevin\yii\fontawesome\FA; +// normal use echo FA::icon('home'); // + +// shortcut +echo FA::i('home'); // + +// icon with additional attributes echo FA::icon( 'arrow-left', ['class' => 'big', 'data-role' => 'arrow'] ); // +// icon in button echo Html::submitButton( Yii::t('app', '{icon} Save', ['icon' => FA::icon('check')]) ); // +// icon with additional methods echo FA::icon('cog')->inverse(); // echo FA::icon('cog')->spin(); // echo FA::icon('cog')->fixedWidth(); // @@ -91,18 +148,22 @@ echo FA::icon('cog')->border(); // echo FA::icon('cog')->pullLeft(); // echo FA::icon('cog')->pullRight(); // +// icon size echo FA::icon('cog')->size(FA::SIZE_3X); // values: FA::SIZE_LARGE, FA::SIZE_2X, FA::SIZE_3X, FA::SIZE_4X, FA::SIZE_5X // +// icon rotate echo FA::icon('cog')->rotate(FA::ROTATE_90); // values: FA::ROTATE_90, FA::ROTATE_180, FA::ROTATE_180 // +// icon flip echo FA::icon('cog')->flip(FA::FLIP_VERTICAL); // values: FA::FLIP_HORIZONTAL, FA::FLIP_VERTICAL // +// icon with multiple methods echo FA::icon('cog') ->spin() ->fixedWidth() @@ -110,6 +171,7 @@ echo FA::icon('cog') ->size(FA::SIZE_LARGE); // +// icons stack echo FA::stack() ->icon('twitter') ->on('square-o'); @@ -118,9 +180,10 @@ echo FA::stack() // // +// icons stack with additional attributes echo FA::stack(['data-role' => 'stacked-icon']) - ->on((new FA\Icon('square'))->inverse()) - ->icon((new FA\Icon('cog'))->spin()); + ->on(FA::Icon('square')->inverse()) + ->icon(FA::Icon('cog')->spin()); // // // @@ -130,8 +193,8 @@ echo FA::stack(['data-role' => 'stacked-icon']) echo FA::icon(FA::_COG); echo FA::icon(FA::_DESKTOP); echo FA::stack() - ->on((new FA\Icon(FA::_SQUARE))->inverse()) - ->icon((new FA\Icon(FA::_COG))->spin()); + ->on(FA::_CIRCLE_O) + ->icon(FA::_TWITTER); ``` ### Set another prefix diff --git a/vendor/rmrevin/yii2-fontawesome/component/Icon.php b/vendor/rmrevin/yii2-fontawesome/component/Icon.php index b408cd0..3497b23 100644 --- a/vendor/rmrevin/yii2-fontawesome/component/Icon.php +++ b/vendor/rmrevin/yii2-fontawesome/component/Icon.php @@ -215,6 +215,7 @@ class Icon * @param string|bool $throw * @return \rmrevin\yii\fontawesome\component\Icon * @throws \yii\base\InvalidConfigException + * @codeCoverageIgnore */ public function addCssClass($class, $condition = true, $throw = false) { @@ -249,4 +250,4 @@ class Icon return Html::tag($tag, $content, $options); } -} +} \ No newline at end of file diff --git a/vendor/rmrevin/yii2-fontawesome/composer.json b/vendor/rmrevin/yii2-fontawesome/composer.json index 3718e41..4341b59 100644 --- a/vendor/rmrevin/yii2-fontawesome/composer.json +++ b/vendor/rmrevin/yii2-fontawesome/composer.json @@ -17,9 +17,9 @@ }, "authors": [ { - "name": "Roman Revin", - "email": "xgismox@gmail.com", - "homepage": "http://rmrevin.ru/" + "name": "Revin Roman", + "email": "roman@rmrevin.com", + "homepage": "https://rmrevin.com/" } ], "require": { diff --git a/vendor/rmrevin/yii2-fontawesome/composer.lock b/vendor/rmrevin/yii2-fontawesome/composer.lock index edfdd81..cc35b03 100644 --- a/vendor/rmrevin/yii2-fontawesome/composer.lock +++ b/vendor/rmrevin/yii2-fontawesome/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "54ddca2d2b639ae136422a58590cdccc", + "hash": "a6e2105374df8af26fdde9137b018143", + "content-hash": "94d3274c874502d1e22ab4ff59c2386f", "packages": [ { "name": "bower-asset/fontawesome", diff --git a/vendor/rmrevin/yii2-fontawesome/phpunit.xml.dist b/vendor/rmrevin/yii2-fontawesome/phpunit.xml.dist index c3cf7a3..43dc0b3 100644 --- a/vendor/rmrevin/yii2-fontawesome/phpunit.xml.dist +++ b/vendor/rmrevin/yii2-fontawesome/phpunit.xml.dist @@ -6,10 +6,13 @@ convertWarningsToExceptions="true" stopOnFailure="false"> - - ./tests - ./vendor - + + ./ + + ./tests + ./vendor + + diff --git a/vendor/rmrevin/yii2-fontawesome/tests/unit/fontawesome/MainTest.php b/vendor/rmrevin/yii2-fontawesome/tests/unit/fontawesome/MainTest.php index b6e989f..ff8b63e 100644 --- a/vendor/rmrevin/yii2-fontawesome/tests/unit/fontawesome/MainTest.php +++ b/vendor/rmrevin/yii2-fontawesome/tests/unit/fontawesome/MainTest.php @@ -76,6 +76,33 @@ class MainTest extends \rmrevin\yii\fontawesome\tests\unit\TestCase ->on((new Icon('square-o'))->size(FA::SIZE_3X)), '' ); + + $this->assertEquals( + (string)FA::stack() + ->icon(FA::Icon('cog')->spin()) + ->on(FA::Icon('square-o')->size(FA::SIZE_3X)), + '' + ); + + $this->assertNotEquals( + (string)FA::stack() + ->icon((string)FA::Icon('cog')->spin()) + ->on((string)FA::Icon('square-o')->size(FA::SIZE_3X)), + '' + ); + } + + public function testAnotherPrefix() + { + $old_prefix = FA::$cssPrefix; + + FA::$cssPrefix = 'fontawesome'; + + $this->assertEquals(FA::icon('cog'), ''); + $this->assertEquals(FA::icon('cog')->tag('span'), ''); + $this->assertEquals(FA::icon('cog')->addCssClass('highlight'), ''); + + FA::$cssPrefix = $old_prefix; } public function testIconOutput() @@ -145,4 +172,15 @@ class MainTest extends \rmrevin\yii\fontawesome\tests\unit\TestCase FA::icon('cog') ->flip('badvalue'); } + + public function testIconAddCssClassCondition() + { + $this->assertEquals(FA::icon('cog')->addCssClass('highlight', true), ''); + + $this->setExpectedException( + 'yii\base\InvalidConfigException', + 'Condition is false' + ); + FA::icon('cog')->addCssClass('highlight', false, true); + } } \ No newline at end of file diff --git a/vendor/yiisoft/extensions.php b/vendor/yiisoft/extensions.php index 5445293..2b2bcb6 100644 --- a/vendor/yiisoft/extensions.php +++ b/vendor/yiisoft/extensions.php @@ -57,15 +57,6 @@ return array ( '@yii/faker' => $vendorDir . '/yiisoft/yii2-faker', ), ), - 'rmrevin/yii2-fontawesome' => - array ( - 'name' => 'rmrevin/yii2-fontawesome', - 'version' => '2.12.0.0', - 'alias' => - array ( - '@rmrevin/yii/fontawesome' => $vendorDir . '/rmrevin/yii2-fontawesome', - ), - ), 'cebe/yii2-gravatar' => array ( 'name' => 'cebe/yii2-gravatar', @@ -75,15 +66,6 @@ return array ( '@cebe/gravatar' => $vendorDir . '/cebe/yii2-gravatar/cebe/gravatar', ), ), - 'dmstr/yii2-adminlte-asset' => - array ( - 'name' => 'dmstr/yii2-adminlte-asset', - 'version' => '2.2.3.0', - 'alias' => - array ( - '@dmstr' => $vendorDir . '/dmstr/yii2-adminlte-asset', - ), - ), 'yiisoft/yii2-jui' => array ( 'name' => 'yiisoft/yii2-jui', @@ -93,15 +75,6 @@ return array ( '@yii/jui' => $vendorDir . '/yiisoft/yii2-jui', ), ), - 'kartik-v/yii2-krajee-base' => - array ( - 'name' => 'kartik-v/yii2-krajee-base', - 'version' => '1.7.7.0', - 'alias' => - array ( - '@kartik/base' => $vendorDir . '/kartik-v/yii2-krajee-base', - ), - ), 'kartik-v/yii2-widget-select2' => array ( 'name' => 'kartik-v/yii2-widget-select2', @@ -120,4 +93,41 @@ return array ( '@developeruz/db_rbac' => $vendorDir . '/developeruz/yii2-db-rbac', ), ), + 'dmstr/yii2-adminlte-asset' => + array ( + 'name' => 'dmstr/yii2-adminlte-asset', + 'version' => '2.2.4.0', + 'alias' => + array ( + '@dmstr' => $vendorDir . '/dmstr/yii2-adminlte-asset', + ), + ), + 'nodge/yii2-eauth' => + array ( + 'name' => 'nodge/yii2-eauth', + 'version' => '2.3.0.0', + 'alias' => + array ( + '@nodge/eauth' => $vendorDir . '/nodge/yii2-eauth/src', + ), + 'bootstrap' => 'nodge\\eauth\\Bootstrap', + ), + 'kartik-v/yii2-krajee-base' => + array ( + 'name' => 'kartik-v/yii2-krajee-base', + 'version' => '1.7.8.0', + 'alias' => + array ( + '@kartik/base' => $vendorDir . '/kartik-v/yii2-krajee-base', + ), + ), + 'rmrevin/yii2-fontawesome' => + array ( + 'name' => 'rmrevin/yii2-fontawesome', + 'version' => '2.12.2.0', + 'alias' => + array ( + '@rmrevin/yii/fontawesome' => $vendorDir . '/rmrevin/yii2-fontawesome', + ), + ), ); -- libgit2 0.21.4