diff --git a/backend/views/event/index.php b/backend/views/event/index.php
index a227ed0..396fb27 100644
--- a/backend/views/event/index.php
+++ b/backend/views/event/index.php
@@ -2,13 +2,14 @@
use yii\helpers\Html;
use yii\grid\GridView;
-
- /* @var $this yii\web\View */
- /* @var $searchModel common\models\EventSearch */
- /* @var $dataProvider yii\data\ActiveDataProvider */
-
+ /**
+ * @var yii\web\View $this
+ * @var common\models\EventSearch $searchModel
+ * @var yii\data\ActiveDataProvider $dataProvider
+ */
$this->title = Yii::t('app', 'Events');
$this->params[ 'breadcrumbs' ][] = $this->title;
+
?>
diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php
index 57222f1..e85a258 100644
--- a/common/translation/ru/app.php
+++ b/common/translation/ru/app.php
@@ -3,8 +3,8 @@ return [
'id' => 'ID',
'username' => 'Имя',
'surname' => 'Фамилия',
- 'auth_key' => 'Auth Key',
- 'password_hash' => 'Password Hash',
+ 'auth_key' => 'Ключ аутентификации',
+ 'password_hash' => 'Хэш пароля',
'password_reset_token' => 'Password Reset Token',
'email' => 'Логин (e-mail)',
'phone' => 'Телефон',
@@ -77,6 +77,7 @@ return [
'duration' => 'Продолжительность',
'slider_image_id' => 'Slider Image ID',
'sort' => 'Сортировка',
+
'меню' => 'меню',
'контрактный отдел' => 'контрактный отдел',
'отдел по работе с дизайнерами и архитекторами' => 'отдел по работе с дизайнерами и архитекторами',
diff --git a/common/translation/ua/app.php b/common/translation/ua/app.php
index f070683..069d457 100644
--- a/common/translation/ua/app.php
+++ b/common/translation/ua/app.php
@@ -1,65 +1,65 @@
'ID',
- 'username' => "ім'я",
+ 'username' => "Ім'я",
'surname' => 'Фамилия',
- 'auth_key' => 'Auth Key',
- 'password_hash' => 'Password Hash',
+ 'auth_key' => 'Ключ аутентифікації',
+ 'password_hash' => 'Хеш паролю',
'password_reset_token' => 'Password Reset Token',
- 'email' => 'Логин (e-mail)',
+ 'email' => 'Логін (e-mail)',
'phone' => 'Телефон',
'status' => 'Статус',
- 'created_at' => 'Created At',
- 'updated_at' => 'Updated At',
- 'verifyCode' => 'Код проверки',
+ 'created_at' => 'Створено',
+ 'updated_at' => 'Оновлено',
+ 'verifyCode' => 'Код перевірки',
'password' => 'Пароль',
- 'password_repeat' => 'Повторить пароль',
- 'registration' => 'Регистрация',
- 'message' => 'Этот {field} уже занят',
+ 'password_repeat' => 'Повторити пароль',
+ 'registration' => 'Реєстрація',
+ 'message' => 'Цей {field} вже зайнято',
'message_match_password' => 'Пароли не совпадают',
- 'exit' => 'Выход',
- 'enter' => 'Войти',
- 'your_personal_area' => 'Вход в личный кабинет',
- 'forgot_password' => 'Забыли пароль?',
- 'rememberMe' => 'Запомнить меня',
- 'articles' => 'Всего товаров',
+ 'exit' => 'Вихід',
+ 'enter' => 'Війти',
+ 'your_personal_area' => 'Вхід в особистий кабінет',
+ 'forgot_password' => 'Забули пароль?',
+ 'rememberMe' => 'Запам\'ятати мене',
+ 'articles' => 'Всього товарів',
'code' => 'Код: {0}',
- 'checkout' => 'оформить заказ',
- 'sum' => 'Сумма',
- 'continue_shopping' => 'продолжить покупки',
- 'edit_personal_data' => 'Редактировать личные данные',
- 'personal_data' => 'Личные данные',
- 'my_orders' => 'Мои заказы',
+ 'checkout' => 'оформити замовлення',
+ 'sum' => 'Сума',
+ 'continue_shopping' => 'продовжити покупки',
+ 'edit_personal_data' => 'Редагувати особисті дані',
+ 'personal_data' => 'Особисті дані',
+ 'my_orders' => 'Мої замовлення',
'bookmarks' => 'Закладки',
- 'basket' => 'Корзина',
+ 'basket' => 'Кошик',
'banner_id' => 'Banner ID',
- 'image' => 'Изображение',
- 'alt' => 'Описание',
+ 'image' => 'Зображення',
+ 'alt' => 'Опис',
'title' => 'Заголовок',
- 'url' => 'Ссылка',
+ 'url' => 'Посилання',
'width' => 'Ширина',
- 'height' => 'Высота',
+ 'height' => 'Висота',
'blog_id' => 'Blog ID',
'user_id' => 'User ID',
- 'name' => 'Название',
- 'link' => 'Ссылка',
- 'date_add' => 'Дата добавления',
+ 'name' => 'Назва',
+ 'link' => 'Посилання',
+ 'date_add' => 'Дата додавання',
'user_add_id' => 'User Add ID',
- 'view_count' => 'Количество просмотров',
- 'description' => 'Описание',
- 'cover' => 'Фото главное',
+ 'view_count' => 'Кількість переглядів',
+ 'description' => 'Опис',
+ 'cover' => 'Фото головне',
'event_id' => 'Event ID',
- 'alias' => 'Ссылка',
- 'body' => 'Тело',
+ 'alias' => 'Посилання',
+ 'body' => 'Тіло',
'meta_title' => 'Мета заголовок',
'h1' => 'H1',
'seo_text' => 'Сео Текст',
- 'end_at' => 'Срок действия по',
+ 'end_at' => 'Термін дії до',
'order_items_id' => 'Order Items ID',
'order_id' => 'Order ID',
'item_id' => 'Item ID',
- 'item_count' => 'Количество',
- 'price' => 'Цена',
+ 'item_count' => 'Кількість',
+ 'price' => 'Ціна',
'customer_id' => 'Customer ID',
'delivery' => 'Доставка',
'payment' => 'Оплата',
@@ -69,14 +69,15 @@ return [
'seo_dynamic_id' => 'Seo Dynamic ID',
'action' => 'Action',
'fields' => 'Поля',
- 'param' => 'Параметры',
+ 'param' => 'Параметри',
'key' => 'Ключ',
'service_id' => 'Service ID',
'slider_id' => 'Slider ID',
- 'speed' => 'Скорость',
- 'duration' => 'Продолжительность',
+ 'speed' => 'Швидкість',
+ 'duration' => 'Тривалість',
'slider_image_id' => 'Slider Image ID',
- 'sort' => 'Сортировка',
+ 'sort' => 'Сортування',
+
'меню' => 'меню',
'контрактный отдел' => 'контрактне відділення',
'отдел по работе с дизайнерами и архитекторами' => 'відділення по роботі з дизайнерами та архітекторами',
diff --git a/composer.lock b/composer.lock
index 8c4c74d..aeb1472 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +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": "5f58e70ea55c0794f619cb324903b390",
- "content-hash": "1937006ee873a711b351ddfb40709247",
+ "hash": "f93b2af40fdef0649dd243a46d036b5d",
+ "content-hash": "5aa237fc8d5946f64672aa2ee7b43c4c",
"packages": [
{
"name": "2amigos/yii2-transliterator-helper",
@@ -91,6 +91,65 @@
"time": "2016-08-04 23:22:06"
},
{
+ "name": "behat/gherkin",
+ "version": "v4.4.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Behat/Gherkin.git",
+ "reference": "cf8cc94647101e02a33d690245896d83d880aea1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cf8cc94647101e02a33d690245896d83d880aea1",
+ "reference": "cf8cc94647101e02a33d690245896d83d880aea1",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.5|~5",
+ "symfony/phpunit-bridge": "~2.7|~3",
+ "symfony/yaml": "~2.3|~3"
+ },
+ "suggest": {
+ "symfony/yaml": "If you want to parse features, represented in YAML files"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Behat\\Gherkin": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
+ }
+ ],
+ "description": "Gherkin DSL parser for PHP 5.3",
+ "homepage": "http://behat.org/",
+ "keywords": [
+ "BDD",
+ "Behat",
+ "Cucumber",
+ "DSL",
+ "gherkin",
+ "parser"
+ ],
+ "time": "2016-09-18 12:16:14"
+ },
+ {
"name": "bower-asset/admin-lte",
"version": "v2.3.6",
"source": {
@@ -151,7 +210,7 @@
"shasum": ""
},
"require": {
- "bower-asset/jquery": ">=1.9.1,<=3"
+ "bower-asset/jquery": ">=1.9.1,<4.0"
},
"type": "bower-asset-library",
"extra": {
@@ -445,16 +504,16 @@
},
{
"name": "cebe/markdown",
- "version": "1.1.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/cebe/markdown.git",
- "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2"
+ "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cebe/markdown/zipball/54a2c49de31cc44e864ebf0500a35ef21d0010b2",
- "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2",
+ "url": "https://api.github.com/repos/cebe/markdown/zipball/c30eb5e01fe021cc5bba2f9ee0eeef96d4931166",
+ "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166",
"shasum": ""
},
"require": {
@@ -501,7 +560,7 @@
"markdown",
"markdown-extra"
],
- "time": "2015-03-06 05:28:07"
+ "time": "2016-09-14 20:40:20"
},
{
"name": "cebe/yii2-gravatar",
@@ -548,51 +607,58 @@
},
{
"name": "codeception/codeception",
- "version": "2.1.11",
+ "version": "2.2.5",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Codeception.git",
- "reference": "d451dbe35e23da1cde5c367130d22f843981aafc"
+ "reference": "b4729341e469d0f174f3cade85718ff5bf8dd751"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/Codeception/zipball/d451dbe35e23da1cde5c367130d22f843981aafc",
- "reference": "d451dbe35e23da1cde5c367130d22f843981aafc",
+ "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b4729341e469d0f174f3cade85718ff5bf8dd751",
+ "reference": "b4729341e469d0f174f3cade85718ff5bf8dd751",
"shasum": ""
},
"require": {
- "ext-curl": "*",
+ "behat/gherkin": "~4.4.0",
"ext-json": "*",
"ext-mbstring": "*",
"facebook/webdriver": ">=1.0.1 <2.0",
"guzzlehttp/guzzle": ">=4.1.4 <7.0",
"guzzlehttp/psr7": "~1.0",
"php": ">=5.4.0 <8.0",
- "phpunit/php-code-coverage": ">=2.1.3",
- "phpunit/phpunit": ">4.8.20 <5.4",
- "symfony/browser-kit": ">=2.5 <3.2",
- "symfony/console": ">=2.5 <3.2",
- "symfony/css-selector": ">=2.5 <3.2",
- "symfony/dom-crawler": ">=2.5 <3.2",
- "symfony/event-dispatcher": ">=2.5 <3.2",
- "symfony/finder": ">=2.5 <3.2",
- "symfony/yaml": ">=2.5 <3.2"
+ "phpunit/php-code-coverage": ">=2.1.3 <5.0",
+ "phpunit/phpunit": ">4.8.20 <6.0",
+ "sebastian/comparator": "~1.1",
+ "sebastian/diff": "^1.4",
+ "symfony/browser-kit": ">=2.7 <4.0",
+ "symfony/console": ">=2.7 <4.0",
+ "symfony/css-selector": ">=2.7 <4.0",
+ "symfony/dom-crawler": ">=2.7 <4.0",
+ "symfony/event-dispatcher": ">=2.7 <4.0",
+ "symfony/finder": ">=2.7 <4.0",
+ "symfony/yaml": ">=2.7 <4.0"
},
"require-dev": {
"codeception/specify": "~0.3",
- "facebook/php-sdk-v4": "~5.0",
+ "facebook/graph-sdk": "~5.3",
"flow/jsonpath": "~0.2",
+ "league/factory-muffin": "^3.0",
+ "league/factory-muffin-faker": "^1.0",
+ "mongodb/mongodb": "^1.0",
"monolog/monolog": "~1.8",
- "pda/pheanstalk": "~2.0",
+ "pda/pheanstalk": "~3.0",
"php-amqplib/php-amqplib": "~2.4",
+ "predis/predis": "^1.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
- "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests",
"codeception/specify": "BDD-style code blocks",
"codeception/verify": "BDD-style assertions",
- "monolog/monolog": "Log test steps",
- "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module.",
+ "flow/jsonpath": "For using JSONPath in REST module",
+ "league/factory-muffin": "For DataFactory module",
+ "league/factory-muffin-faker": "For Faker support in DataFactory module",
+ "phpseclib/phpseclib": "for SFTP option in FTP Module",
"symfony/phpunit-bridge": "For phpunit-bridge support"
},
"bin": [
@@ -628,7 +694,7 @@
"functional testing",
"unit testing"
],
- "time": "2016-06-28 23:57:41"
+ "time": "2016-09-29 01:29:59"
},
{
"name": "developeruz/yii2-db-rbac",
@@ -1189,16 +1255,16 @@
},
{
"name": "kartik-v/bootstrap-fileinput",
- "version": "v4.3.4",
+ "version": "v4.3.5",
"source": {
"type": "git",
"url": "https://github.com/kartik-v/bootstrap-fileinput.git",
- "reference": "abde5a9611d4939b951fdd00f70a9fec935c7b6b"
+ "reference": "6e1a8ca5ca04d4927540ccf18bbfc3253286bd0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/abde5a9611d4939b951fdd00f70a9fec935c7b6b",
- "reference": "abde5a9611d4939b951fdd00f70a9fec935c7b6b",
+ "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/6e1a8ca5ca04d4927540ccf18bbfc3253286bd0c",
+ "reference": "6e1a8ca5ca04d4927540ccf18bbfc3253286bd0c",
"shasum": ""
},
"type": "library",
@@ -1238,7 +1304,7 @@
"progress",
"upload"
],
- "time": "2016-08-07 07:50:42"
+ "time": "2016-09-20 05:47:41"
},
{
"name": "kartik-v/bootstrap-star-rating",
@@ -1286,16 +1352,16 @@
},
{
"name": "kartik-v/yii2-dialog",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/kartik-v/yii2-dialog.git",
- "reference": "c0f83291c050fb05a1dc66a90ad6151de2d1e982"
+ "reference": "4aaf8918c6dbd90218b6ad9036b1aae211480716"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kartik-v/yii2-dialog/zipball/c0f83291c050fb05a1dc66a90ad6151de2d1e982",
- "reference": "c0f83291c050fb05a1dc66a90ad6151de2d1e982",
+ "url": "https://api.github.com/repos/kartik-v/yii2-dialog/zipball/4aaf8918c6dbd90218b6ad9036b1aae211480716",
+ "reference": "4aaf8918c6dbd90218b6ad9036b1aae211480716",
"shasum": ""
},
"require": {
@@ -1334,7 +1400,7 @@
"modal",
"yii2"
],
- "time": "2016-02-22 10:58:46"
+ "time": "2016-09-13 18:15:26"
},
{
"name": "kartik-v/yii2-grid",
@@ -1443,12 +1509,12 @@
"source": {
"type": "git",
"url": "https://github.com/kartik-v/yii2-mpdf.git",
- "reference": "d2513eb34e507097ceafc1125164c50aeb905547"
+ "reference": "c9a888f5755d09bb10a9e5c0675e13565262a1bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kartik-v/yii2-mpdf/zipball/d2513eb34e507097ceafc1125164c50aeb905547",
- "reference": "d2513eb34e507097ceafc1125164c50aeb905547",
+ "url": "https://api.github.com/repos/kartik-v/yii2-mpdf/zipball/c9a888f5755d09bb10a9e5c0675e13565262a1bb",
+ "reference": "c9a888f5755d09bb10a9e5c0675e13565262a1bb",
"shasum": ""
},
"require": {
@@ -1487,7 +1553,7 @@
"utf8",
"yii2"
],
- "time": "2016-04-09 18:17:46"
+ "time": "2016-09-11 05:41:04"
},
{
"name": "kartik-v/yii2-widget-colorinput",
@@ -2033,16 +2099,16 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.5.2",
+ "version": "1.5.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc"
+ "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc",
- "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
+ "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
"shasum": ""
},
"require": {
@@ -2071,7 +2137,7 @@
"object",
"object graph"
],
- "time": "2016-09-06 16:07:05"
+ "time": "2016-09-16 13:37:59"
},
{
"name": "nodge/lightopenid",
@@ -2228,16 +2294,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
+ "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+ "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"shasum": ""
},
"require": {
@@ -2269,7 +2335,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2016-06-10 09:48:41"
+ "time": "2016-09-30 07:12:33"
},
{
"name": "phpdocumentor/type-resolver",
@@ -2442,16 +2508,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "3.3.3",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5"
+ "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/44cd8e3930e431658d1a5de7d282d5cb37837fd5",
- "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5f3f7e736d6319d5f1fc402aff8b026da26709a3",
+ "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3",
"shasum": ""
},
"require": {
@@ -2460,12 +2526,12 @@
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "^1.4.2",
"sebastian/code-unit-reverse-lookup": "~1.0",
- "sebastian/environment": "^1.3.2",
+ "sebastian/environment": "^1.3.2 || ^2.0",
"sebastian/version": "~1.0|~2.0"
},
"require-dev": {
"ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~5"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-dom": "*",
@@ -2475,7 +2541,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -2501,7 +2567,7 @@
"testing",
"xunit"
],
- "time": "2016-05-27 16:24:29"
+ "time": "2016-07-26 14:39:29"
},
{
"name": "phpunit/php-file-iterator",
@@ -2686,35 +2752,35 @@
},
{
"name": "phpunit/phpunit",
- "version": "5.3.5",
+ "version": "5.6.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "08c513bfcab57f3dd72f5214c1c3940439fae7fe"
+ "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08c513bfcab57f3dd72f5214c1c3940439fae7fe",
- "reference": "08c513bfcab57f3dd72f5214c1c3940439fae7fe",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60c32c5b5e79c2248001efa2560f831da11cc2d7",
+ "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-json": "*",
- "ext-pcre": "*",
- "ext-reflection": "*",
- "ext-spl": "*",
+ "ext-libxml": "*",
+ "ext-mbstring": "*",
+ "ext-xml": "*",
"myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": ">=3.3.0,<4.0.0",
+ "phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
- "phpunit/phpunit-mock-objects": ">=3.1.0,<3.2.0",
+ "phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
+ "sebastian/environment": "^1.3 || ^2.0",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
"sebastian/object-enumerator": "~1.0",
@@ -2722,7 +2788,14 @@
"sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2"
+ },
+ "require-dev": {
+ "ext-pdo": "*"
+ },
"suggest": {
+ "ext-xdebug": "*",
"phpunit/php-invoker": "~1.1"
},
"bin": [
@@ -2731,7 +2804,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.3.x-dev"
+ "dev-master": "5.6.x-dev"
}
},
"autoload": {
@@ -2757,30 +2830,33 @@
"testing",
"xunit"
],
- "time": "2016-06-03 09:42:56"
+ "time": "2016-10-07 13:03:26"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "3.1.3",
+ "version": "3.3.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "151c96874bff6fe61a25039df60e776613a61489"
+ "reference": "03500345483e1e17b52e2e4d34a89c9408ab2902"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/151c96874bff6fe61a25039df60e776613a61489",
- "reference": "151c96874bff6fe61a25039df60e776613a61489",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/03500345483e1e17b52e2e4d34a89c9408ab2902",
+ "reference": "03500345483e1e17b52e2e4d34a89c9408ab2902",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
- "php": ">=5.6",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
+ "sebastian/exporter": "^1.2"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~5"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@@ -2788,7 +2864,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "3.2.x-dev"
}
},
"autoload": {
@@ -2813,7 +2889,7 @@
"mock",
"xunit"
],
- "time": "2016-04-20 14:39:26"
+ "time": "2016-10-04 11:03:26"
},
{
"name": "psr/http-message",
@@ -2866,34 +2942,31 @@
"time": "2016-08-06 14:39:51"
},
{
- "name": "rmrevin/yii2-comments",
- "version": "1.4.4",
+ "name": "psr/log",
+ "version": "1.0.1",
"source": {
"type": "git",
- "url": "https://github.com/rmrevin/yii2-comments.git",
- "reference": "dfc463a37336a3fc7c39698b4b41b2c79f2fb56a"
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "5277094ed527a1c4477177d102fe4c53551953e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/dfc463a37336a3fc7c39698b4b41b2c79f2fb56a",
- "reference": "dfc463a37336a3fc7c39698b4b41b2c79f2fb56a",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0",
+ "reference": "5277094ed527a1c4477177d102fe4c53551953e0",
"shasum": ""
},
"require": {
- "php": ">=5.4.0",
- "rmrevin/yii2-fontawesome": "~2.10",
- "yiisoft/yii2": "2.0.*"
+ "php": ">=5.3.0"
},
- "type": "yii2-extension",
+ "type": "library",
"extra": {
- "asset-installer-paths": {
- "npm-asset-library": "vendor/npm",
- "bower-asset-library": "vendor/bower"
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "rmrevin\\yii\\module\\Comments\\": ""
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2902,19 +2975,18 @@
],
"authors": [
{
- "name": "Roman Revin",
- "email": "xgismox@gmail.com",
- "homepage": "http://rmrevin.ru/"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "Comments module for Yii2",
+ "description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
"keywords": [
- "comment",
- "module",
- "widget",
- "yii"
+ "log",
+ "psr",
+ "psr-3"
],
- "time": "2016-06-27 10:30:28"
+ "time": "2016-09-19 16:02:08"
},
{
"name": "rmrevin/yii2-fontawesome",
@@ -3531,16 +3603,16 @@
},
{
"name": "studio-42/elfinder",
- "version": "2.1.14",
+ "version": "2.1.15",
"source": {
"type": "git",
"url": "https://github.com/Studio-42/elFinder.git",
- "reference": "02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9"
+ "reference": "2370a0af78b4ca0f028bacb3fb9c3d092ff0ae81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9",
- "reference": "02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9",
+ "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/2370a0af78b4ca0f028bacb3fb9c3d092ff0ae81",
+ "reference": "2370a0af78b4ca0f028bacb3fb9c3d092ff0ae81",
"shasum": ""
},
"require": {
@@ -3585,7 +3657,7 @@
],
"description": "File manager for web",
"homepage": "http://elfinder.org",
- "time": "2016-07-25 00:34:19"
+ "time": "2016-09-12 01:53:22"
},
{
"name": "swiftmailer/swiftmailer",
@@ -3642,25 +3714,25 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.8.11",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744"
+ "reference": "901319a31c9b3cee7857b4aeeb81b5d64dfa34fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
- "reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/901319a31c9b3cee7857b4aeeb81b5d64dfa34fc",
+ "reference": "901319a31c9b3cee7857b4aeeb81b5d64dfa34fc",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "symfony/dom-crawler": "~2.1|~3.0.0"
+ "php": ">=5.5.9",
+ "symfony/dom-crawler": "~2.8|~3.0"
},
"require-dev": {
- "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
- "symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0"
+ "symfony/css-selector": "~2.8|~3.0",
+ "symfony/process": "~2.8|~3.0"
},
"suggest": {
"symfony/process": ""
@@ -3668,7 +3740,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.1-dev"
}
},
"autoload": {
@@ -3695,24 +3767,25 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-09-06 11:02:40"
},
{
"name": "symfony/console",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563"
+ "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/8ea494c34f0f772c3954b5fbe00bffc5a435e563",
- "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563",
+ "url": "https://api.github.com/repos/symfony/console/zipball/6cb0872fb57b38b3b09ff213c21ed693956b9eb0",
+ "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0",
"shasum": ""
},
"require": {
"php": ">=5.5.9",
+ "symfony/debug": "~2.8|~3.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@@ -3755,39 +3828,38 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-08-19 06:48:39"
+ "time": "2016-09-28 00:11:12"
},
{
"name": "symfony/css-selector",
- "version": "v2.6.13",
- "target-dir": "Symfony/Component/CssSelector",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "560e446b93883050a5874908652e8e912e8cbe44"
+ "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/560e446b93883050a5874908652e8e912e8cbe44",
- "reference": "560e446b93883050a5874908652e8e912e8cbe44",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
+ "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "php": ">=5.5.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "3.1-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\CssSelector\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3809,29 +3881,85 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2015-05-15 13:32:45"
+ "time": "2016-09-06 11:02:40"
+ },
+ {
+ "name": "symfony/debug",
+ "version": "v3.1.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
+ "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.9",
+ "psr/log": "~1.0"
+ },
+ "conflict": {
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+ },
+ "require-dev": {
+ "symfony/class-loader": "~2.8|~3.0",
+ "symfony/http-kernel": "~2.8|~3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Debug\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Debug Component",
+ "homepage": "https://symfony.com",
+ "time": "2016-09-06 11:02:40"
},
{
"name": "symfony/dom-crawler",
- "version": "v2.6.13",
- "target-dir": "Symfony/Component/DomCrawler",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "301fca88f26fb57f5ea4020d3abf78d046e5c0ee"
+ "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/301fca88f26fb57f5ea4020d3abf78d046e5c0ee",
- "reference": "301fca88f26fb57f5ea4020d3abf78d046e5c0ee",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb7395e8b1db3654de82b9f35d019958276de4d7",
+ "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.5.9",
+ "symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
- "symfony/css-selector": "~2.3",
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/css-selector": "~2.8|~3.0"
},
"suggest": {
"symfony/css-selector": ""
@@ -3839,13 +3967,16 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "3.1-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\DomCrawler\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3863,11 +3994,11 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2015-07-09 16:02:48"
+ "time": "2016-08-05 08:37:39"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -3927,16 +4058,16 @@
},
{
"name": "symfony/finder",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577"
+ "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/e568ef1784f447a0e54dcb6f6de30b9747b0f577",
- "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
+ "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
"shasum": ""
},
"require": {
@@ -3972,7 +4103,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-08-26 12:04:02"
+ "time": "2016-09-28 00:11:12"
},
{
"name": "symfony/polyfill-mbstring",
@@ -4035,16 +4166,16 @@
},
{
"name": "symfony/yaml",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d"
+ "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/f291ed25eb1435bddbe8a96caaef16469c2a092d",
- "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/368b9738d4033c8b93454cb0dbd45d305135a6d3",
+ "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3",
"shasum": ""
},
"require": {
@@ -4080,20 +4211,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-09-02 02:12:52"
+ "time": "2016-09-25 08:27:07"
},
{
"name": "unclead/yii2-multiple-input",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/unclead/yii2-multiple-input.git",
- "reference": "7f3d8e9d75b62d6c23b762424308e311a19bf77d"
+ "reference": "157a7ddd8ae4f89cb632f6e0366f9a1df22d276c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/unclead/yii2-multiple-input/zipball/7f3d8e9d75b62d6c23b762424308e311a19bf77d",
- "reference": "7f3d8e9d75b62d6c23b762424308e311a19bf77d",
+ "url": "https://api.github.com/repos/unclead/yii2-multiple-input/zipball/157a7ddd8ae4f89cb632f6e0366f9a1df22d276c",
+ "reference": "157a7ddd8ae4f89cb632f6e0366f9a1df22d276c",
"shasum": ""
},
"require": {
@@ -4125,7 +4256,7 @@
"yii2 multiple input",
"yii2 tabular input"
],
- "time": "2016-09-04 19:18:59"
+ "time": "2016-09-16 06:07:41"
},
{
"name": "wbraganca/yii2-dynamicform",
@@ -4133,21 +4264,18 @@
"source": {
"type": "git",
"url": "https://github.com/wbraganca/yii2-dynamicform.git",
- "reference": "049770e48bff426fb7aeb0e86690ee689c514c70"
+ "reference": "fa1fec069ce8262dcb359db8d3b849235ddf7781"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wbraganca/yii2-dynamicform/zipball/049770e48bff426fb7aeb0e86690ee689c514c70",
- "reference": "049770e48bff426fb7aeb0e86690ee689c514c70",
+ "url": "https://api.github.com/repos/wbraganca/yii2-dynamicform/zipball/fa1fec069ce8262dcb359db8d3b849235ddf7781",
+ "reference": "fa1fec069ce8262dcb359db8d3b849235ddf7781",
"shasum": ""
},
"require": {
- "symfony/css-selector": "~2.6.6",
- "symfony/dom-crawler": "~2.6.6",
- "yiisoft/yii2": "~2.0.0"
- },
- "require-dev": {
- "yiisoft/yii2-codeception": "*"
+ "symfony/css-selector": "~2.8|~3.0",
+ "symfony/dom-crawler": "~2.8|~3.0",
+ "yiisoft/yii2": "~2.0.5"
},
"type": "yii2-extension",
"autoload": {
@@ -4176,7 +4304,7 @@
"yii2 dynamic form",
"yii2-dynamicform"
],
- "time": "2015-05-26 12:06:27"
+ "time": "2016-09-29 16:38:47"
},
{
"name": "webmozart/assert",
@@ -4519,21 +4647,21 @@
},
{
"name": "yiisoft/yii2-swiftmailer",
- "version": "2.0.5",
+ "version": "2.0.6",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-swiftmailer.git",
- "reference": "e2c6315caff30a9271a7afad4d684627721dc69a"
+ "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/e2c6315caff30a9271a7afad4d684627721dc69a",
- "reference": "e2c6315caff30a9271a7afad4d684627721dc69a",
+ "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/26b900767f1031ff3a4668dfa36c10595875f0a5",
+ "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5",
"shasum": ""
},
"require": {
"swiftmailer/swiftmailer": "~5.0",
- "yiisoft/yii2": ">=2.0.4"
+ "yiisoft/yii2": "~2.0.4"
},
"type": "yii2-extension",
"extra": {
@@ -4565,7 +4693,7 @@
"swiftmailer",
"yii2"
],
- "time": "2016-03-17 03:58:49"
+ "time": "2016-09-09 11:48:11"
},
{
"name": "yurkinx/yii2-image",
--
libgit2 0.21.4