Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 52246980 8d48636e
Showing 341 changed files with 420 additions and 230 deletions Show diff stats
.gitignore
.htaccess
backend/controllers/CurrencyController.php
backend/views/currency/index.php
codeception.yml
common/behaviors/MapsBehavior.php
common/behaviors/ShowImage.php
common/behaviors/Slug.php
common/components/UserCheck.php
common/components/UserStore.php
common/components/Validator.php
common/components/rules/CommentOwnRule.php
common/config/bootstrap.php
common/models/Blog.php
common/models/BlogSearch.php
common/models/Bookmark.php
common/models/Chat.php
common/models/Cities.php
common/models/Country.php
common/models/Currency.php
@@ -5,4 +5,4 @@
     Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
     Yii::setAlias('saveImageDir', '@frontend/web/images/upload/');
     Yii::setAlias('storage', dirname(dirname(__DIR__)) . '/storage');
 -    Yii::setAlias('documentRoot', dirname(dirname(__DIR__)));
+    Yii::setAlias('documentRoot', dirname(dirname(__DIR__)));
 \ No newline at end of file
@@ -359,16 +359,16 @@
         },
         {
             "name": "bower-asset/yii2-pjax",
-            "version": "dev-master",
+            "version": "v2.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/jquery-pjax.git",
-                "reference": "3bceef03fa80ceee8da5854fa3249df1afc871cd"
+                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/3bceef03fa80ceee8da5854fa3249df1afc871cd",
-                "reference": "3bceef03fa80ceee8da5854fa3249df1afc871cd",
+                "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/60728da6ade5879e807a49ce59ef9a72039b8978",
+                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978",
                 "shasum": ""
             },
             "require": {
@@ -385,15 +385,11 @@
                     "vendor/",
                     "script/",
                     "test/"
-                ],
-                "branch-alias": {
-                    "dev-master": "2.0.3-dev"
-                }
+                ]
             },
             "license": [
                 "MIT"
-            ],
-            "time": "2015-12-31 08:33:51"
+            ]
         },
         {
             "name": "cebe/markdown",
@@ -504,12 +500,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2"
+                "reference": "ad6f975429a6742f1dc0f4a7aa22bfe2ceb750e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2",
-                "reference": "c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/ad6f975429a6742f1dc0f4a7aa22bfe2ceb750e2",
+                "reference": "ad6f975429a6742f1dc0f4a7aa22bfe2ceb750e2",
                 "shasum": ""
             },
             "require": {
@@ -520,20 +516,18 @@
                 "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/php-code-coverage": ">=2.1.3 <4.0",
                 "phpunit/phpunit": ">4.8.20 <6.0",
-                "predis/predis": "^1.0",
-                "symfony/browser-kit": ">=2.7 <3.1",
-                "symfony/console": ">=2.7 <3.1",
-                "symfony/css-selector": ">=2.7 <3.1",
-                "symfony/dom-crawler": ">=2.7 <3.1",
-                "symfony/event-dispatcher": ">=2.7 <3.1",
-                "symfony/finder": ">=2.7 <3.1",
-                "symfony/yaml": ">=2.7 <3.1"
+                "symfony/browser-kit": ">=2.7 <3.2",
+                "symfony/console": ">=2.7 <3.2",
+                "symfony/css-selector": ">=2.7 <3.2",
+                "symfony/dom-crawler": ">=2.7 <3.2",
+                "symfony/event-dispatcher": ">=2.7 <3.2",
+                "symfony/finder": ">=2.7 <3.2",
+                "symfony/yaml": ">=2.7 <3.2"
             },
             "require-dev": {
                 "codeception/specify": "~0.3",
-                "ext-mongodb": "*",
                 "facebook/php-sdk-v4": "~5.0",
                 "flow/jsonpath": "~0.2",
                 "league/factory-muffin": "^3.0",
@@ -541,7 +535,9 @@
                 "mongodb/mongodb": "^1.0",
                 "monolog/monolog": "~1.8",
                 "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "~2.4"
+                "php-amqplib/php-amqplib": "~2.4",
+                "predis/predis": "^1.0",
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
                 "codeception/specify": "BDD-style code blocks",
@@ -585,7 +581,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2016-05-30 00:01:09"
+            "time": "2016-06-05 23:39:50"
         },
         {
             "name": "developeruz/yii2-db-rbac",
@@ -593,12 +589,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/developeruz/yii2-db-rbac.git",
-                "reference": "28c1b0ebcc45b6365af6f1e9949b4d9cfeaebf1b"
+                "reference": "1d6ba7a2f41fd9abcd2f529d53841dd2385a81be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/developeruz/yii2-db-rbac/zipball/28c1b0ebcc45b6365af6f1e9949b4d9cfeaebf1b",
-                "reference": "28c1b0ebcc45b6365af6f1e9949b4d9cfeaebf1b",
+                "url": "https://api.github.com/repos/developeruz/yii2-db-rbac/zipball/1d6ba7a2f41fd9abcd2f529d53841dd2385a81be",
+                "reference": "1d6ba7a2f41fd9abcd2f529d53841dd2385a81be",
                 "shasum": ""
             },
             "require": {
@@ -626,20 +622,20 @@
                 "rbac",
                 "yii"
             ],
-            "time": "2015-10-03 05:56:47"
+            "time": "2016-06-04 18:07:38"
         },
         {
             "name": "dmstr/yii2-adminlte-asset",
-            "version": "2.3.0",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dmstr/yii2-adminlte-asset.git",
-                "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a"
+                "reference": "e9e5a843e47f47af61146524af99c0e98d8f5f90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/73eca05cf04d70f169a88b430d2c03c3b54d623a",
-                "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a",
+                "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/e9e5a843e47f47af61146524af99c0e98d8f5f90",
+                "reference": "e9e5a843e47f47af61146524af99c0e98d8f5f90",
                 "shasum": ""
             },
             "require": {
@@ -680,7 +676,7 @@
                 "extension",
                 "yii2"
             ],
-            "time": "2016-03-23 04:18:15"
+            "time": "2016-05-31 15:42:01"
         },
         {
             "name": "doctrine/instantiator",
@@ -829,12 +825,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b1a96f6134f69cb41f8538d3a6491f4bb1dbab78"
+                "reference": "6a37496c2b7855f5c88cac89c5f56a07e326d63c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b1a96f6134f69cb41f8538d3a6491f4bb1dbab78",
-                "reference": "b1a96f6134f69cb41f8538d3a6491f4bb1dbab78",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6a37496c2b7855f5c88cac89c5f56a07e326d63c",
+                "reference": "6a37496c2b7855f5c88cac89c5f56a07e326d63c",
                 "shasum": ""
             },
             "require": {
@@ -883,7 +879,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2016-05-08 19:39:56"
+            "time": "2016-06-04 22:16:20"
         },
         {
             "name": "guzzlehttp/promises",
@@ -938,16 +934,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.3.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "31382fef2889136415751badebbd1cb022a4ed72"
+                "reference": "7e9749008f75ab798168371cf3f6a2a36850576a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
-                "reference": "31382fef2889136415751badebbd1cb022a4ed72",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7e9749008f75ab798168371cf3f6a2a36850576a",
+                "reference": "7e9749008f75ab798168371cf3f6a2a36850576a",
                 "shasum": ""
             },
             "require": {
@@ -963,7 +959,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -992,7 +988,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-04-13 19:56:01"
+            "time": "2016-06-05 19:42:18"
         },
         {
             "name": "imagine/imagine",
@@ -1101,12 +1097,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-krajee-base.git",
-                "reference": "7f7a45ffe193fe673f72b9effc01b08499f2a454"
+                "reference": "473fb568ff1144dc49bdb74f40a5d7f025fc72e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/7f7a45ffe193fe673f72b9effc01b08499f2a454",
-                "reference": "7f7a45ffe193fe673f72b9effc01b08499f2a454",
+                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/473fb568ff1144dc49bdb74f40a5d7f025fc72e4",
+                "reference": "473fb568ff1144dc49bdb74f40a5d7f025fc72e4",
                 "shasum": ""
             },
             "require": {
@@ -1144,7 +1140,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2016-05-07 19:45:52"
+            "time": "2016-06-02 16:20:24"
         },
         {
             "name": "kartik-v/yii2-widget-colorinput",
@@ -1262,12 +1258,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-select2.git",
-                "reference": "6919d5096ca83ab4a1b163fcd09fb023814d1003"
+                "reference": "00c29bf2ea42df7be2ae6aa2b2be049807a8134b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/6919d5096ca83ab4a1b163fcd09fb023814d1003",
-                "reference": "6919d5096ca83ab4a1b163fcd09fb023814d1003",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/00c29bf2ea42df7be2ae6aa2b2be049807a8134b",
+                "reference": "00c29bf2ea42df7be2ae6aa2b2be049807a8134b",
                 "shasum": ""
             },
             "require": {
@@ -1307,7 +1303,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2016-04-19 13:22:56"
+            "time": "2016-06-03 10:10:39"
         },
         {
             "name": "lusitanian/oauth",
@@ -1615,38 +1611,135 @@
             "time": "2016-01-13 18:15:48"
         },
         {
+            "name": "phpdocumentor/reflection-common",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+                "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
+                "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.1.5",
+                "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
             },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "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-06 06:44:13"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.1.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9891754231e55d42f0d16988ffb799af39f31a12"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9891754231e55d42f0d16988ffb799af39f31a12",
+                "reference": "9891754231e55d42f0d16988ffb799af39f31a12",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
                         "src/"
                     ]
                 }
@@ -1658,10 +1751,10 @@
             "authors": [
                 {
                     "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
+                    "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "time": "2016-03-28 10:02:29"
         },
         {
             "name": "phpspec/prophecy",
@@ -1669,23 +1762,23 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "f9a8140d6cf86514a64fb3b637e716008e1885d0"
+                "reference": "eec64c9457ef6dff4c9eface0914ec1bc0048ba0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f9a8140d6cf86514a64fb3b637e716008e1885d0",
-                "reference": "f9a8140d6cf86514a64fb3b637e716008e1885d0",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/eec64c9457ef6dff4c9eface0914ec1bc0048ba0",
+                "reference": "eec64c9457ef6dff4c9eface0914ec1bc0048ba0",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1",
-                "sebastian/recursion-context": "~1.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "~2.0"
+                "phpspec/phpspec": "^2.0"
             },
             "type": "library",
             "extra": {
@@ -1723,20 +1816,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-05-27 08:33:35"
+            "time": "2016-06-06 10:57:18"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "dev-master",
+            "version": "3.3.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "844ec6eabee15768f1e34a8871f6fddfc3d5f602"
+                "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/844ec6eabee15768f1e34a8871f6fddfc3d5f602",
-                "reference": "844ec6eabee15768f1e34a8871f6fddfc3d5f602",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/44cd8e3930e431658d1a5de7d282d5cb37837fd5",
+                "reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5",
                 "shasum": ""
             },
             "require": {
@@ -1750,7 +1843,7 @@
             },
             "require-dev": {
                 "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
+                "phpunit/phpunit": "~5"
             },
             "suggest": {
                 "ext-dom": "*",
@@ -1760,7 +1853,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "3.3.x-dev"
                 }
             },
             "autoload": {
@@ -1786,7 +1879,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-05-27 16:21:40"
+            "time": "2016-05-27 16:24:29"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1971,16 +2064,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "dev-master",
+            "version": "5.3.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4789e42043079d81f2cb77ea859036689dbb91ee"
+                "reference": "9858a96dc3d0106419cbeb205c6ff44d3c4e8a17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4789e42043079d81f2cb77ea859036689dbb91ee",
-                "reference": "4789e42043079d81f2cb77ea859036689dbb91ee",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9858a96dc3d0106419cbeb205c6ff44d3c4e8a17",
+                "reference": "9858a96dc3d0106419cbeb205c6ff44d3c4e8a17",
                 "shasum": ""
             },
             "require": {
@@ -1992,11 +2085,11 @@
                 "myclabs/deep-copy": "~1.3",
                 "php": "^5.6 || ^7.0",
                 "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0",
+                "phpunit/php-code-coverage": ">=3.3.0,<4.0.0",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
+                "phpunit/phpunit-mock-objects": ">=3.1.0,<3.2.0",
                 "sebastian/comparator": "~1.1",
                 "sebastian/diff": "~1.2",
                 "sebastian/environment": "~1.3",
@@ -2016,7 +2109,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.4.x-dev"
+                    "dev-master": "5.3.x-dev"
                 }
             },
             "autoload": {
@@ -2042,20 +2135,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-05-29 16:55:46"
+            "time": "2016-06-05 07:13:15"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "dev-master",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "5bf0ba29dd683ec4f2e5d4fb212ad31827501012"
+                "reference": "5d89f807d9eb33fbafd0351c4fc459de8128e78b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5bf0ba29dd683ec4f2e5d4fb212ad31827501012",
-                "reference": "5bf0ba29dd683ec4f2e5d4fb212ad31827501012",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5d89f807d9eb33fbafd0351c4fc459de8128e78b",
+                "reference": "5d89f807d9eb33fbafd0351c4fc459de8128e78b",
                 "shasum": ""
             },
             "require": {
@@ -2065,7 +2158,7 @@
                 "sebastian/exporter": "^1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.4"
+                "phpunit/phpunit": "^5"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -2073,7 +2166,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "3.1.x-dev"
                 }
             },
             "autoload": {
@@ -2098,62 +2191,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2016-05-26 06:15:46"
-        },
-        {
-            "name": "predis/predis",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nrk/predis.git",
-                "reference": "5850029f893cefe9aeeeb046ea18a5866f890cc5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nrk/predis/zipball/5850029f893cefe9aeeeb046ea18a5866f890cc5",
-                "reference": "5850029f893cefe9aeeeb046ea18a5866f890cc5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "suggest": {
-                "ext-curl": "Allows access to Webdis when paired with phpiredis",
-                "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Predis\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniele Alessandri",
-                    "email": "suppakilla@gmail.com",
-                    "homepage": "http://clorophilla.net"
-                }
-            ],
-            "description": "Flexible and feature-complete Redis client for PHP and HHVM",
-            "homepage": "http://github.com/nrk/predis",
-            "keywords": [
-                "nosql",
-                "predis",
-                "redis"
-            ],
-            "time": "2016-05-28 18:28:18"
+            "time": "2016-05-26 06:15:11"
         },
         {
             "name": "psr/http-message",
@@ -2825,12 +2863,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Studio-42/elFinder.git",
-                "reference": "2ec345f7044052184a7d9faf1dc15ad82b503e9f"
+                "reference": "883e2ad70f1ae9483d939216ff9f9a67407d3f8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/2ec345f7044052184a7d9faf1dc15ad82b503e9f",
-                "reference": "2ec345f7044052184a7d9faf1dc15ad82b503e9f",
+                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/883e2ad70f1ae9483d939216ff9f9a67407d3f8d",
+                "reference": "883e2ad70f1ae9483d939216ff9f9a67407d3f8d",
                 "shasum": ""
             },
             "require": {
@@ -2875,7 +2913,7 @@
             ],
             "description": "File manager for web",
             "homepage": "http://elfinder.org",
-            "time": "2016-05-30 08:20:52"
+            "time": "2016-06-06 11:42:51"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -2932,16 +2970,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "e07127ac31230b30887c2dddf3708d883d239b14"
+                "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e07127ac31230b30887c2dddf3708d883d239b14",
-                "reference": "e07127ac31230b30887c2dddf3708d883d239b14",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b645a9b23d6c0eeba5ac823fa87bf010db9aff22",
+                "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22",
                 "shasum": ""
             },
             "require": {
@@ -2958,7 +2996,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2985,20 +3023,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-04 07:55:57"
+            "time": "2016-03-04 07:56:56"
         },
         {
             "name": "symfony/console",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "30beaa1b3ccdc0074baaf910a17cdae80df1e32d"
+                "reference": "31edc9ddad8b69da0e5b41fae0f19ab0612b8e8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/30beaa1b3ccdc0074baaf910a17cdae80df1e32d",
-                "reference": "30beaa1b3ccdc0074baaf910a17cdae80df1e32d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/31edc9ddad8b69da0e5b41fae0f19ab0612b8e8c",
+                "reference": "31edc9ddad8b69da0e5b41fae0f19ab0612b8e8c",
                 "shasum": ""
             },
             "require": {
@@ -3018,7 +3056,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3045,20 +3083,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-05-30 06:58:27"
+            "time": "2016-06-03 11:12:53"
         },
         {
             "name": "symfony/css-selector",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0"
+                "reference": "c526d7b3cb4fe1673c6a34e13be2ff63f519df99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0",
-                "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c526d7b3cb4fe1673c6a34e13be2ff63f519df99",
+                "reference": "c526d7b3cb4fe1673c6a34e13be2ff63f519df99",
                 "shasum": ""
             },
             "require": {
@@ -3067,7 +3105,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3098,20 +3136,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-04 07:55:57"
+            "time": "2016-06-06 11:42:41"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "49b588841225b205700e5122fa01911cabada857"
+                "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857",
-                "reference": "49b588841225b205700e5122fa01911cabada857",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/12aa63fd41b060d2bee9a34623d29eda70bc8fe3",
+                "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3",
                 "shasum": ""
             },
             "require": {
@@ -3127,7 +3165,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3154,20 +3192,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-04-12 18:09:53"
+            "time": "2016-05-13 15:49:09"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "807dde98589f9b2b00624dca326740380d78dbbc"
+                "reference": "f5b7563f67779c6d3d5370e23448e707c858df3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/807dde98589f9b2b00624dca326740380d78dbbc",
-                "reference": "807dde98589f9b2b00624dca326740380d78dbbc",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f5b7563f67779c6d3d5370e23448e707c858df3e",
+                "reference": "f5b7563f67779c6d3d5370e23448e707c858df3e",
                 "shasum": ""
             },
             "require": {
@@ -3187,7 +3225,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3214,20 +3252,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-05-05 06:56:13"
+            "time": "2016-06-06 11:42:41"
         },
         {
             "name": "symfony/finder",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811"
+                "reference": "40d17ed287bf51a2f884c4619ce8ff2a1c5cd219"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811",
-                "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/40d17ed287bf51a2f884c4619ce8ff2a1c5cd219",
+                "reference": "40d17ed287bf51a2f884c4619ce8ff2a1c5cd219",
                 "shasum": ""
             },
             "require": {
@@ -3236,7 +3274,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3263,7 +3301,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-05-13 18:03:36"
+            "time": "2016-05-13 18:06:41"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3326,16 +3364,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "3.0.x-dev",
+            "version": "3.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "06766b41126fbe4e4a24943cdd366eb24a1b6d17"
+                "reference": "56832b4b038a2dbda1af53771ebcc9ba05626078"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/06766b41126fbe4e4a24943cdd366eb24a1b6d17",
-                "reference": "06766b41126fbe4e4a24943cdd366eb24a1b6d17",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/56832b4b038a2dbda1af53771ebcc9ba05626078",
+                "reference": "56832b4b038a2dbda1af53771ebcc9ba05626078",
                 "shasum": ""
             },
             "require": {
@@ -3344,7 +3382,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -3371,7 +3409,57 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-05-24 10:03:10"
+            "time": "2016-06-06 11:42:41"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "3a8e045064f294992a13966b6c892fb9d64853a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/3a8e045064f294992a13966b6c892fb9d64853a3",
+                "reference": "3a8e045064f294992a13966b6c892fb9d64853a3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3|^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-03-04 13:27:44"
         },
         {
             "name": "yiisoft/yii2",
@@ -3379,12 +3467,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "e9cc989c9c3de3326892f9205bfc17e61347fcdc"
+                "reference": "d329c5089c8044ab9c1de6a6a68a3c9458e9881c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/e9cc989c9c3de3326892f9205bfc17e61347fcdc",
-                "reference": "e9cc989c9c3de3326892f9205bfc17e61347fcdc",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/d329c5089c8044ab9c1de6a6a68a3c9458e9881c",
+                "reference": "d329c5089c8044ab9c1de6a6a68a3c9458e9881c",
                 "shasum": ""
             },
             "require": {
@@ -3465,7 +3553,7 @@
                 "framework",
                 "yii2"
             ],
-            "time": "2016-05-26 21:41:47"
+            "time": "2016-06-04 19:57:15"
         },
         {
             "name": "yiisoft/yii2-bootstrap",
@@ -3568,12 +3656,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-composer.git",
-                "reference": "f5fe6ba58dbc92b37daed5d9bd94cda777852ee4"
+                "reference": "e882cc327a6935a41f2e8665b9ef0317f6852d4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/f5fe6ba58dbc92b37daed5d9bd94cda777852ee4",
-                "reference": "f5fe6ba58dbc92b37daed5d9bd94cda777852ee4",
+                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/e882cc327a6935a41f2e8665b9ef0317f6852d4d",
+                "reference": "e882cc327a6935a41f2e8665b9ef0317f6852d4d",
                 "shasum": ""
             },
             "require": {
@@ -3607,7 +3695,7 @@
                 "extension installer",
                 "yii2"
             ],
-            "time": "2016-04-14 08:46:37"
+            "time": "2016-06-05 20:34:32"
         },
         {
             "name": "yiisoft/yii2-imagine",
@@ -3792,12 +3880,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "df56110269ffaaea78295290c74d0bd1b3ac176f"
+                "reference": "c6533b0a70d2236cf1f7ce21bfaa3cd12e287019"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/df56110269ffaaea78295290c74d0bd1b3ac176f",
-                "reference": "df56110269ffaaea78295290c74d0bd1b3ac176f",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/c6533b0a70d2236cf1f7ce21bfaa3cd12e287019",
+                "reference": "c6533b0a70d2236cf1f7ce21bfaa3cd12e287019",
                 "shasum": ""
             },
             "require": {
@@ -3834,7 +3922,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2016-05-19 20:16:37"
+            "time": "2016-06-01 11:19:16"
         },
         {
             "name": "phpspec/php-diff",
@@ -516,7 +516,6 @@
             $user = \Yii::$app->user->identity;
             $user_info = $user->userInfo;
             $company_info = $user->companyInfo;
-            $user = \Yii::$app->user->identity;
             if(empty( $user_info )) {
                 //$user_info = new UserInfo([ 'user_id' => $user->id ]);
             }
@@ -1068,12 +1067,14 @@
             /**
              * @var User $user
              */
-            $user = \Yii::$app->user->identity;
+            $user = User::find()->where(['id' => \Yii::$app->user->id])->one();
+            $user->setSpecializationInput($user->getSpecializationInput());
             $user_info = $user->userInfo;
             if(empty( $user_info )) {
                 $user_info = new UserInfo([ 'user_id' => \Yii::$app->user->getId() ]);
             }
             $specializations = Specialization::find()
+                                             ->with('children')
                                              ->where([ 'specialization_pid' => 0 ])
                                              ->orderBy('specialization_id')
                                              ->all();
@@ -109,11 +109,18 @@ use frontend\models\Option;
         {
             $specialization = Specialization::specializationsList();
  
+            $specializations = Specialization::find()
+                                             ->with('children')
+                                             ->where([ 'specialization_pid' => 0 ])
+                                             ->orderBy('specialization_id')
+                                             ->all();
+
             $searchModel = new SearchPerformerForm();
  
             return $this->render('performer',[
                 'dataProvider' => $searchModel->search(Yii::$app->request->queryParams),
                 'specialization' => $specialization,
+                'specializations' => $specializations,
                 'model'=> $searchModel
             ]);
         }
@@ -31,6 +31,8 @@
  
         public $search;
  
+        public $portfolio;
+
         /**
          * @inheritdoc
          */
@@ -47,6 +49,7 @@
                         'rating',
                         'online',
                         'search',
+                        'portfolio',
                     ],
                     'safe',
                 ],
@@ -55,7 +58,11 @@
                     'default',
                     'value' => 0,
                 ],
-
+                [
+                    [ 'portfolio' ],
+                    'default',
+                    'value' => 1,
+                ],
             ];
         }
  
@@ -85,7 +92,6 @@
          */
         public function search($params)
         {
-
             $this->load($params);
  
             $query = User::find()
@@ -100,6 +106,7 @@
                              'specializations',
                              'companyInfo',
                          ])
+                         ->innerJoin('portfolio', '"portfolio"."user_id" = "user"."id"')
                          ->where([ 'user_info.is_freelancer' => 1 ]);
  
             $dataProvider = new ActiveDataProvider([
@@ -162,11 +169,14 @@
                           ->innerJoin([ 'spec' => 'user_specialization' ], 'spec.user_id = users.id')
                           ->asArray()
                           ->column();
-            if(empty($query2)) {
+            if(empty( $query2 )) {
                 $query->where('0=1');
                 return $dataProvider;
             }
  
+            // Clear array from empty strings
+            //$this->specialization = array_filter($this->specialization, 'strlen');
+
             $query->andFilterWhere([
                 'user_info.city'                   => $this->city,
                 'specialization.specialization_id' => $this->specialization,
@@ -46,13 +46,18 @@
             </div>
             <div class="general-check-right">
                 <div class="general-check-right-txt">
-                    Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей
+                    Обязательно должны быть указаны специализации услуг, а также добавлены проекты в портфолио, что бы вы попали в рейтинг исполнителей
                     <?php
                         if(!empty( $user->specializations )) {
                             echo "<p>В Вашем профиле указаны специализации: " . count($user->specializations) . "</p>";
                         } else {
                             echo "<p>В Вашем профиле не указаны специализации. Чтобы указать - перейдите по " . Html::a('ссылке', [ 'accounts/service' ], [ 'target' => '_blank' ]) . "</p>";
                         }
+                        if(!empty( $user->portfolios )) {
+                            echo "<p>В Вашем портфолио добавлено проектов: " . count($user->portfolios) . "</p>";
+                        } else {
+                            echo "<p>В Вашем портфолио не добавлены проекты. Чтобы добавить - перейдите по " . Html::a('ссылке', [ 'accounts/portfolio' ], [ 'target' => '_blank' ]) . "</p>";
+                        }
                     ?>
                 </div>
             </div>
@@ -51,7 +51,7 @@
             ?>
         </div>
     </div>
-
+    
     <div class="input-blocks-wrapper admin-menu-list">
         <div class="input-blocks" style="width: 100%; margin-bottom: 5px">
             <label>Специализации</label>
@@ -169,15 +169,15 @@
                         'items'       => [
                             [
                                 'url'      => [ '/projects' ],
-                                'template' => '<a href="{url}" class="main-menu-icons-home"><span>' . count(\Yii::$app->user->identity->commentProjectsActive) . '</span></a>',
+                                'template' => '<a href="{url}" class="main-menu-icons-home">'.((!empty(\Yii::$app->user->identity->commentProjectsActive))?('<span>' . count(\Yii::$app->user->identity->commentProjectsActive) . '</span>'):('')).'</a>',
                             ],
                             [
                                 'url'      => [ 'chat/list' ],
-                                'template' => '<a href="{url}" class="main-menu-icons-edit"><span>' . \Yii::$app->user->identity->newMessagesCount . '</span></a>',
+                                'template' => '<a href="{url}" class="main-menu-icons-edit">'.((!empty(\Yii::$app->user->identity->newMessagesCount))?('<span>' . \Yii::$app->user->identity->newMessagesCount . '</span>'):('')).'</a>',
                             ],
                             [
                                 'url'      => [ '/bookmarks' ],
-                                'template' => "<a href='{url}' class='main-menu-icons-copy'><span>" . count(\Yii::$app->user->identity->bookmarks) . "</span></a>",
+                                'template' => '<a href="{url}" class="main-menu-icons-copy">'.((!empty(\Yii::$app->user->identity->bookmarks))?('<span>' . count(\Yii::$app->user->identity->bookmarks) . '</span>'):('')).'</a>',
                             ],
                         ],
                     ]);
@@ -4,10 +4,9 @@
      * @var SearchPerformerForm $model
      */
  
-    use common\models\Vacancy;
+    use common\models\Specialization;
     use frontend\models\SearchPerformerForm;
     use kartik\select2\Select2;
-    use yii\helpers\ArrayHelper;
     use \yii\helpers\Html;
     use yii\helpers\Url;
     use yii\jui\SliderInput;
@@ -21,7 +20,6 @@
     $active_key = array_keys($sort_array)[ 0 ];
     $active_value = $sort_array[ $active_key ];
     $sort_name = ( ( $active_value == 4 ) ? '-' : '' ) . $active_key;
-
     $this->title = 'My Yii Application';
 ?>
  
@@ -54,10 +52,93 @@
                                  ],
                              ]); ?>
  
+                    <?php
+                        // New specialization chooser
+                    ?>
+                    <div class="input-blocks-wrapper admin-menu-list">
+                        <div class="input-blocks" style="width: 100%; margin-bottom: 5px">
+                            <label>Специализации</label>
+                            <div class="required"></div>
+                        </div>
+                        <div class="style">
+                            <ul class="content-menu-first">
+                                <?php foreach($specializations as $specialization): ?>
+                                    <li data-img="<?= $specialization->image ?>">
+                                        <span data-menu-bg="<?= $specialization->background ?>" style="background: <?= $specialization->background ?>"></span><a href="#"><?= $specialization->specialization_name ?></a>
+                                        <ul>
+                                            <?php foreach($specialization->children as $child_first): ?>
+
+                                                <?php if($child_first instanceof Specialization): ?>
+                                                    <li>
+                                                        <a href="#"><?= $child_first->specialization_name ?></a>
+                                                        <ul>
+                                                            <?php foreach($child_first->children as $child_second): ?>
+                                                                <?php if($child_first instanceof Specialization): ?>
+                                                                    <li>
+                                                                        <a href="#" title="<?= $child_second->specialization_name ?>">
+                                                                            <?= $form->field($model, "specialization[{$child_second->specialization_id}]", [
+                                                                                'template' => '{input}{label}{hint}{error}',
+                                                                            ])
+                                                                                     ->label('<span></span>' . $child_second->specialization_name)
+                                                                                     ->checkbox([
+                                                                                         'value'   => $child_second->specialization_id,
+                                                                                         'label'   => NULL,
+                                                                                         'uncheck' => NULL,
+                                                                                         'class'   => 'custom-check',
+                                                                                     ], false) ?>
+                                                                        </a>
+                                                                    </li>
+                                                                <?php endif; ?>
+                                                            <?php endforeach; ?>
+                                                        </ul>
+                                                    </li>
+                                                <?php endif; ?>
+                                            <?php endforeach; ?>
+
+                                        </ul>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                        <div class="style admn-menu-err">
+                            <div class="help-block">Необходимо выбрать хотя бы одну «специализацию».</div>
+                        </div>
+                    </div>
+
+                    <div class="admin-specialization-selected style">
+                        <ul></ul>
+                    </div>
+                    
+                    <?php
+                        // End of new specialization chooser
+                    ?>
+
+                    <?php
+                        /*
+                    ?>
  
-                    <?= $form->field($model, 'specialization')
+                    <?= $form->field($model, 'specialization[]')
                              ->dropDownList($specialization, [ 'prompt' => 'Любая' ]); ?>
+                        <?php
+                        */
+                    ?>
  
+                    <?= $form->field($model, 'portfolio', [
+                        'options'  => [
+                            'class' => 'blocks-check-list-wrapp',
+                        ],
+                        'template' => "<div class='blocks-check-title'>{label}</div>\n{input}\n{hint}\n{error}",
+                    ])
+                             ->label('Искать в')
+                             ->radioList([
+                                 1 => 'Портфолио',
+                                 0 => 'Услуги',
+                             ], [
+                                 'item'     => function($index, $label, $name, $checked, $value) use ($model) {
+                                     return "<div class='blocks-check-list'><input type='radio' id='{$model->formName()}-{$index}-portfolio' name='{$name}' class='check-search' value='{$value}' " . ( $checked ? 'checked' : '' ) . "><label for='{$model->formName()}-{$index}-portfolio'><span></span>{$label}</label></div>";
+                                 },
+                                 'unselect' => NULL,
+                             ]); ?>
  
                     <?= $form->field($model, 'type')
                              ->dropDownList([
@@ -128,8 +209,6 @@
                                  'unselect' => NULL,
                              ]); ?>
  
-
-
                     <?= $form->field($model, 'additional_parameters')
                              ->checkboxList([
                                  'with_portfolio' => 'Только с портфолио',
@@ -176,9 +255,9 @@
                         ?>
  
                         <?php
-                        if(empty(\Yii::$app->user->id) || empty(\Yii::$app->user->identity->specializations)) {
-                            echo Html::a('Добавить себя в каталог', Url::toRoute('accounts/service'), [ 'class' => 'add-to-catalog-search-worker' ]);
-                        }
+                            if(empty( \Yii::$app->user->id ) || empty( \Yii::$app->user->identity->specializations )) {
+                                echo Html::a('Добавить себя в каталог', Url::toRoute('accounts/service'), [ 'class' => 'add-to-catalog-search-worker' ]);
+                            }
                         ?>
  
                         <div class="search-worker-sort-wr style">
@@ -57,7 +57,7 @@
  
                                 <div class="register-val-company">
                                     <?php
-                                        $model->type = '1';
+                                        $model->type = '2';
                                         echo $form->field($model, 'type', [ 'options' => [ 'class' => 'check-radio-wr' ] ])
                                                   ->label(false)
                                                   ->radioList([