diff --git a/.php_cs.dist b/.php_cs.dist index 81611cc..cf0a9f1 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -1,4 +1,12 @@ + +For the full copyright and license information, please view +the LICENSE file that was distributed with this source code. +EOF; $finder = PhpCsFixer\Finder::create() ->exclude([ @@ -14,6 +22,7 @@ $finder = PhpCsFixer\Finder::create() ->setRules(array( '@PSR1' => true, '@PSR2' => true, + 'header_comment' => ['header' => $header], 'array_syntax' => array('syntax' => 'short'), 'combine_consecutive_unsets' => true, 'no_extra_consecutive_blank_lines' => array( @@ -31,6 +40,9 @@ $finder = PhpCsFixer\Finder::create() 'no_useless_return' => true, 'ordered_class_elements' => true, 'ordered_imports' => true, - 'phpdoc_add_missing_param_annotation' => true - )) + 'phpdoc_add_missing_param_annotation' => true, + 'phpdoc_order' => true, + 'phpdoc_align' => true + + )) ->setFinder($finder); diff --git a/README.md b/README.md index 1d8efc9..4c7f83a 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,7 @@ This module is highly inspired by the excellent work of [Dektrium](https://dektr In fact, we have used some of its processes, commands, views, and some of its attribute names to somehow standardize the modules and make it easier for our developers to swap from [Dektrium's](https://dektrium.com) modules to our own. -[![2amigOS!](https://s.gravatar.com/avatar/55363394d72945ff7ed312556ec041e0?s=80)](http://www.2amigos.us) +> [![2amigOS!](https://s.gravatar.com/avatar/55363394d72945ff7ed312556ec041e0?s=80)](http://www.2amigos.us) +Custom Software | Web & Mobile Software Development +[www.2amigos.us](http://www.2amigos.us) + diff --git a/composer.json b/composer.json index 2376bba..10084b7 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ }, "require-dev": { "cebe/assetfree-yii2": "~2.0.0", - "friendsofphp/php-cs-fixer": "^2.0", + "friendsofphp/php-cs-fixer": "^2.3", "squizlabs/php_codesniffer": "*", "phpmd/phpmd": "@stable", "yiisoft/yii2-codeception": "^2.0.0", diff --git a/composer.lock b/composer.lock index 0f2f32a..b685088 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "be6349bedeb687dd3dfde5aef1b0a773", + "content-hash": "f56bcec678e47fb82f7e5bf0e54b7ce0", "packages": [ { "name": "2amigos/yii2-selectize-widget", @@ -1008,16 +1008,16 @@ }, { "name": "codeception/codeception", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "67cd520b4f20cdfc3a52d1a0022924125822a8e6" + "reference": "b5391497f9a3c9d0a9c02ae39b53441e413e35a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/67cd520b4f20cdfc3a52d1a0022924125822a8e6", - "reference": "67cd520b4f20cdfc3a52d1a0022924125822a8e6", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b5391497f9a3c9d0a9c02ae39b53441e413e35a8", + "reference": "b5391497f9a3c9d0a9c02ae39b53441e413e35a8", "shasum": "" }, "require": { @@ -1054,6 +1054,7 @@ "php-amqplib/php-amqplib": "~2.4", "predis/predis": "^1.0", "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <4.0", "vlucas/phpdotenv": "^2.4.0" }, "suggest": { @@ -1098,7 +1099,7 @@ "functional testing", "unit testing" ], - "time": "2017-06-02T00:22:30+00:00" + "time": "2017-07-10T19:45:09+00:00" }, { "name": "codeception/specify", @@ -1889,22 +1890,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/46f7e8bb075036c92695b15a1ddb6971c751e585", + "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -1930,24 +1931,24 @@ } ], "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-09-30T07:12:33+00:00" + "time": "2017-07-15T11:38:20+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -1977,7 +1978,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpmd/phpmd", @@ -2441,16 +2442,16 @@ }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", "shasum": "" }, "require": { @@ -2496,7 +2497,7 @@ "mock", "xunit" ], - "time": "2016-12-08T20:27:08+00:00" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "psr/container", @@ -3255,16 +3256,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "c2c8ceb1aa9dab9eae54e9150e6a588ce3e53be1" + "reference": "3a4435e79a8401746e8525e98039199d0924b4e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c2c8ceb1aa9dab9eae54e9150e6a588ce3e53be1", - "reference": "c2c8ceb1aa9dab9eae54e9150e6a588ce3e53be1", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3a4435e79a8401746e8525e98039199d0924b4e5", + "reference": "3a4435e79a8401746e8525e98039199d0924b4e5", "shasum": "" }, "require": { @@ -3308,20 +3309,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:14:56+00:00" + "time": "2017-06-24T09:29:48+00:00" }, { "name": "symfony/config", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "35716d4904e0506a7a5a9bcf23f854aeb5719bca" + "reference": "a094618deb9a3fe1c3cf500a796e167d0495a274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/35716d4904e0506a7a5a9bcf23f854aeb5719bca", - "reference": "35716d4904e0506a7a5a9bcf23f854aeb5719bca", + "url": "https://api.github.com/repos/symfony/config/zipball/a094618deb9a3fe1c3cf500a796e167d0495a274", + "reference": "a094618deb9a3fe1c3cf500a796e167d0495a274", "shasum": "" }, "require": { @@ -3329,10 +3330,12 @@ "symfony/filesystem": "~2.8|~3.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.3", + "symfony/finder": "<3.3" }, "require-dev": { "symfony/dependency-injection": "~3.3", + "symfony/finder": "~3.3", "symfony/yaml": "~3.0" }, "suggest": { @@ -3368,20 +3371,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-06-02T18:07:20+00:00" + "time": "2017-06-16T12:40:34+00:00" }, { "name": "symfony/console", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e" + "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/70d2a29b2911cbdc91a7e268046c395278238b2e", - "reference": "70d2a29b2911cbdc91a7e268046c395278238b2e", + "url": "https://api.github.com/repos/symfony/console/zipball/a97e45d98c59510f085fa05225a1acb74dfe0546", + "reference": "a97e45d98c59510f085fa05225a1acb74dfe0546", "shasum": "" }, "require": { @@ -3437,11 +3440,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-06-02T19:24:58+00:00" + "time": "2017-07-03T13:19:36+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3494,16 +3497,16 @@ }, { "name": "symfony/debug", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d" + "reference": "63b85a968486d95ff9542228dc2e4247f16f9743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e9c50482841ef696e8fa1470d950a79c8921f45d", - "reference": "e9c50482841ef696e8fa1470d950a79c8921f45d", + "url": "https://api.github.com/repos/symfony/debug/zipball/63b85a968486d95ff9542228dc2e4247f16f9743", + "reference": "63b85a968486d95ff9542228dc2e4247f16f9743", "shasum": "" }, "require": { @@ -3546,20 +3549,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-06-01T21:01:25+00:00" + "time": "2017-07-05T13:02:37+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "4cec19ec1d25f22e1ec8ab14635d3879a1287053" + "reference": "986a633c92220ecb22ad06820a1df126c7a4f9eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4cec19ec1d25f22e1ec8ab14635d3879a1287053", - "reference": "4cec19ec1d25f22e1ec8ab14635d3879a1287053", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/986a633c92220ecb22ad06820a1df126c7a4f9eb", + "reference": "986a633c92220ecb22ad06820a1df126c7a4f9eb", "shasum": "" }, "require": { @@ -3616,11 +3619,11 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-06-06T03:13:52+00:00" + "time": "2017-06-20T14:01:46+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -3676,16 +3679,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4054a102470665451108f9b59305c79176ef98f0" + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4054a102470665451108f9b59305c79176ef98f0", - "reference": "4054a102470665451108f9b59305c79176ef98f0", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", "shasum": "" }, "require": { @@ -3735,20 +3738,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-04T18:15:29+00:00" + "time": "2017-06-09T14:53:08+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c709670bf64721202ddbe4162846f250735842c0" + "reference": "311fa718389efbd8b627c272b9324a62437018cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c709670bf64721202ddbe4162846f250735842c0", - "reference": "c709670bf64721202ddbe4162846f250735842c0", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/311fa718389efbd8b627c272b9324a62437018cc", + "reference": "311fa718389efbd8b627c272b9324a62437018cc", "shasum": "" }, "require": { @@ -3784,11 +3787,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-05-28T14:08:56+00:00" + "time": "2017-06-24T09:29:48+00:00" }, { "name": "symfony/finder", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3837,7 +3840,7 @@ }, { "name": "symfony/options-resolver", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -4112,16 +4115,16 @@ }, { "name": "symfony/process", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf" + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8e30690c67aafb6c7992d6d8eb0d707807dd3eaf", - "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf", + "url": "https://api.github.com/repos/symfony/process/zipball/5ab8949b682b1bf9d4511a228b5e045c96758c30", + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30", "shasum": "" }, "require": { @@ -4157,11 +4160,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-05-22T12:32:03+00:00" + "time": "2017-07-03T08:12:02+00:00" }, { "name": "symfony/stopwatch", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -4210,16 +4213,16 @@ }, { "name": "symfony/yaml", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063" + "reference": "1f93a8d19b8241617f5074a123e282575b821df8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063", - "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8", + "reference": "1f93a8d19b8241617f5074a123e282575b821df8", "shasum": "" }, "require": { @@ -4261,7 +4264,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-02T22:05:06+00:00" + "time": "2017-06-15T12:58:50+00:00" }, { "name": "webmozart/assert", diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php index 45d86d4..76d6e42 100644 --- a/src/User/Bootstrap.php +++ b/src/User/Bootstrap.php @@ -59,7 +59,7 @@ class Bootstrap implements BootstrapInterface * Initialize container with module classes. * * @param \yii\base\Application $app - * @param array $map the previously built class map list + * @param array $map the previously built class map list */ protected function initContainer($app, $map) { @@ -214,7 +214,7 @@ class Bootstrap implements BootstrapInterface /** * Ensures required mail parameters needed for the mail service. * - * @param Application $app + * @param Application $app * @param Module|\yii\base\Module $module */ protected function initMailServiceConfiguration(Application $app, Module $module) @@ -331,12 +331,12 @@ class Bootstrap implements BootstrapInterface /** * Returns the parent class name route of a short class name. * - * @param array $routes class name routes + * @param array $routes class name routes * @param string $name * + * @throws Exception * @return int|string * - * @throws Exception */ protected function getRoute(array $routes, $name) { diff --git a/src/User/Component/AuthDbManagerComponent.php b/src/User/Component/AuthDbManagerComponent.php index b951cd2..7422e58 100644 --- a/src/User/Component/AuthDbManagerComponent.php +++ b/src/User/Component/AuthDbManagerComponent.php @@ -18,8 +18,8 @@ use yii\rbac\DbManager; class AuthDbManagerComponent extends DbManager implements AuthManagerInterface { /** - * @param int|null $type If null will return all auth items - * @param array $excludeItems Items that should be excluded from result array + * @param int|null $type If null will return all auth items + * @param array $excludeItems Items that should be excluded from result array * * @return array */ diff --git a/src/User/Contracts/AuthManagerInterface.php b/src/User/Contracts/AuthManagerInterface.php index 302469f..915d911 100644 --- a/src/User/Contracts/AuthManagerInterface.php +++ b/src/User/Contracts/AuthManagerInterface.php @@ -17,7 +17,7 @@ interface AuthManagerInterface extends ManagerInterface { /** * @param int|null $type - * @param array $excludeItems + * @param array $excludeItems * * @return mixed */ diff --git a/src/User/Controller/AbstractAuthItemController.php b/src/User/Controller/AbstractAuthItemController.php index 2eca800..65d0f3f 100644 --- a/src/User/Controller/AbstractAuthItemController.php +++ b/src/User/Controller/AbstractAuthItemController.php @@ -33,10 +33,10 @@ abstract class AbstractAuthItemController extends Controller /** * AbstractAuthItemController constructor. * - * @param string $id - * @param Module $module + * @param string $id + * @param Module $module * @param AuthHelper $authHelper - * @param array $config + * @param array $config */ public function __construct($id, Module $module, AuthHelper $authHelper, array $config = []) { diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php index 2a42ebd..0cd1013 100644 --- a/src/User/Controller/AdminController.php +++ b/src/User/Controller/AdminController.php @@ -43,10 +43,10 @@ class AdminController extends Controller /** * AdminController constructor. * - * @param string $id - * @param Module $module + * @param string $id + * @param Module $module * @param UserQuery $userQuery - * @param array $config + * @param array $config */ public function __construct($id, Module $module, UserQuery $userQuery, array $config = []) { @@ -282,7 +282,6 @@ class AdminController extends Controller Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'User block status has been updated.')); } else { Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Unable to update block status.')); - } } diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index 4e9ac79..e540eac 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -38,11 +38,11 @@ class RecoveryController extends Controller /** * RecoveryController constructor. * - * @param string $id - * @param Module $module - * @param UserQuery $userQuery + * @param string $id + * @param Module $module + * @param UserQuery $userQuery * @param TokenQuery $tokenQuery - * @param array $config + * @param array $config */ public function __construct($id, Module $module, UserQuery $userQuery, TokenQuery $tokenQuery, array $config = []) { @@ -73,9 +73,9 @@ class RecoveryController extends Controller /** * Displays / handles user password recovery request. * + * @throws NotFoundHttpException * @return string * - * @throws NotFoundHttpException */ public function actionRequest() { @@ -117,9 +117,9 @@ class RecoveryController extends Controller * @param $id * @param $code * + * @throws NotFoundHttpException * @return string * - * @throws NotFoundHttpException */ public function actionReset($id, $code) { diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php index c16fa4b..49b0071 100644 --- a/src/User/Controller/RegistrationController.php +++ b/src/User/Controller/RegistrationController.php @@ -44,11 +44,11 @@ class RegistrationController extends Controller /** * RegistrationController constructor. * - * @param string $id - * @param Module $module - * @param UserQuery $userQuery + * @param string $id + * @param Module $module + * @param UserQuery $userQuery * @param SocialNetworkAccountQuery $socialNetworkAccountQuery - * @param array $config + * @param array $config */ public function __construct( $id, @@ -106,7 +106,6 @@ class RegistrationController extends Controller $mailService = MailFactory::makeWelcomeMailerService($user); if ($this->make(UserRegisterService::class, [$user, $mailService])->run()) { - Yii::$app->session->setFlash( 'info', Yii::t( diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php index 06e0fbc..a150d43 100644 --- a/src/User/Controller/SecurityController.php +++ b/src/User/Controller/SecurityController.php @@ -37,10 +37,10 @@ class SecurityController extends Controller /** * SecurityController constructor. * - * @param string $id - * @param Module $module + * @param string $id + * @param Module $module * @param SocialNetworkAccountQuery $socialNetworkAccountQuery - * @param array $config + * @param array $config */ public function __construct( $id, diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php index f1b0858..5c2678c 100644 --- a/src/User/Controller/SettingsController.php +++ b/src/User/Controller/SettingsController.php @@ -50,12 +50,12 @@ class SettingsController extends Controller /** * SettingsController constructor. * - * @param string $id - * @param Module $module - * @param ProfileQuery $profileQuery - * @param UserQuery $userQuery + * @param string $id + * @param Module $module + * @param ProfileQuery $profileQuery + * @param UserQuery $userQuery * @param SocialNetworkAccountQuery $socialNetworkAccountQuery - * @param array $config + * @param array $config */ public function __construct( $id, diff --git a/src/User/Factory/AuthItemFactory.php b/src/User/Factory/AuthItemFactory.php index 59809c4..e46a7f3 100644 --- a/src/User/Factory/AuthItemFactory.php +++ b/src/User/Factory/AuthItemFactory.php @@ -46,9 +46,9 @@ class AuthItemFactory * @param $type * @param $name * + * @throws Exception * @return \yii\rbac\Role|\yii\rbac\Permission * - * @throws Exception */ public static function makeByType($type, $name) { diff --git a/src/User/Factory/EmailChangeStrategyFactory.php b/src/User/Factory/EmailChangeStrategyFactory.php index 3207bad..15e929e 100644 --- a/src/User/Factory/EmailChangeStrategyFactory.php +++ b/src/User/Factory/EmailChangeStrategyFactory.php @@ -31,9 +31,9 @@ class EmailChangeStrategyFactory * @param $strategy * @param SettingsForm $form * + * @throws Exception * @return MailChangeStrategyInterface * - * @throws Exception */ public static function makeByStrategyType($strategy, SettingsForm $form) { diff --git a/src/User/Factory/MailFactory.php b/src/User/Factory/MailFactory.php index d5361b9..6f16a37 100644 --- a/src/User/Factory/MailFactory.php +++ b/src/User/Factory/MailFactory.php @@ -43,7 +43,7 @@ class MailFactory /** * @param string $email - * @param Token $token + * @param Token $token * * @return MailService */ @@ -63,7 +63,7 @@ class MailFactory } /** - * @param User $user + * @param User $user * @param Token|null $token * * @return MailService @@ -84,7 +84,7 @@ class MailFactory } /** - * @param User $user + * @param User $user * @param Token $token * * @return MailService @@ -114,7 +114,7 @@ class MailFactory * @param string $to * @param string $subject * @param string $view - * @param array $params + * @param array $params * * @return MailService */ diff --git a/src/User/Form/LoginForm.php b/src/User/Form/LoginForm.php index 639cae2..c0f5f45 100644 --- a/src/User/Form/LoginForm.php +++ b/src/User/Form/LoginForm.php @@ -48,9 +48,9 @@ class LoginForm extends Model protected $securityHelper; /** - * @param UserQuery $query + * @param UserQuery $query * @param SecurityHelper $securityHelper - * @param array $config + * @param array $config */ public function __construct(UserQuery $query, SecurityHelper $securityHelper, $config = []) { diff --git a/src/User/Form/RecoveryForm.php b/src/User/Form/RecoveryForm.php index 50bb647..6264d38 100644 --- a/src/User/Form/RecoveryForm.php +++ b/src/User/Form/RecoveryForm.php @@ -38,7 +38,7 @@ class RecoveryForm extends Model /** * @param UserQuery $query - * @param array $config + * @param array $config */ public function __construct(UserQuery $query, array $config = []) { diff --git a/src/User/Form/ResendForm.php b/src/User/Form/ResendForm.php index 3406bc2..601b080 100644 --- a/src/User/Form/ResendForm.php +++ b/src/User/Form/ResendForm.php @@ -28,7 +28,7 @@ class ResendForm extends Model /** * @param UserQuery $userQuery - * @param array $config + * @param array $config */ public function __construct(UserQuery $userQuery, $config = []) { diff --git a/src/User/Helper/ClassMapHelper.php b/src/User/Helper/ClassMapHelper.php index a3d86bb..fac9a3d 100644 --- a/src/User/Helper/ClassMapHelper.php +++ b/src/User/Helper/ClassMapHelper.php @@ -45,9 +45,9 @@ class ClassMapHelper /** * @param $key * + * @throws \Exception * @return mixed * - * @throws \Exception */ public function get($key) { diff --git a/src/User/Helper/SecurityHelper.php b/src/User/Helper/SecurityHelper.php index a8a03e4..babff35 100644 --- a/src/User/Helper/SecurityHelper.php +++ b/src/User/Helper/SecurityHelper.php @@ -28,7 +28,7 @@ class SecurityHelper /** * Generates a secure hash from a password and a random salt. * - * @param string $password + * @param string $password * @param null|int $cost * * @return string diff --git a/src/User/Search/UserSearch.php b/src/User/Search/UserSearch.php index f9189af..f04856d 100644 --- a/src/User/Search/UserSearch.php +++ b/src/User/Search/UserSearch.php @@ -43,7 +43,7 @@ class UserSearch extends Model * UserSearch constructor. * * @param UserQuery $query - * @param array $config + * @param array $config */ public function __construct(UserQuery $query, $config = []) { diff --git a/src/User/Service/AccountConfirmationService.php b/src/User/Service/AccountConfirmationService.php index 6973c6b..0764a14 100644 --- a/src/User/Service/AccountConfirmationService.php +++ b/src/User/Service/AccountConfirmationService.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Da\User\Service; use Da\User\Contracts\ServiceInterface; diff --git a/src/User/Service/AuthItemEditionService.php b/src/User/Service/AuthItemEditionService.php index 650e1b6..fe6a20e 100644 --- a/src/User/Service/AuthItemEditionService.php +++ b/src/User/Service/AuthItemEditionService.php @@ -65,7 +65,6 @@ class AuthItemEditionService implements ServiceInterface $this->model->item = $item; $this->updateChildren(); - } catch (Exception $e) { return false; } diff --git a/src/User/Service/EmailChangeService.php b/src/User/Service/EmailChangeService.php index 0203144..a71f829 100644 --- a/src/User/Service/EmailChangeService.php +++ b/src/User/Service/EmailChangeService.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Da\User\Service; use Da\User\Contracts\MailChangeStrategyInterface; @@ -80,7 +89,6 @@ class EmailChangeService implements ServiceInterface return $this->model->save(false); } - return false; } } diff --git a/src/User/Service/MailService.php b/src/User/Service/MailService.php index 10655bf..a3c2414 100644 --- a/src/User/Service/MailService.php +++ b/src/User/Service/MailService.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Da\User\Service; use Da\User\Contracts\ServiceInterface; @@ -21,11 +30,11 @@ class MailService implements ServiceInterface /** * MailService constructor. * - * @param string $from - * @param string $to - * @param string $subject - * @param string $view - * @param array $params + * @param string $from + * @param string $to + * @param string $subject + * @param string $view + * @param array $params * @param BaseMailer|MailerInterface $mailer */ public function __construct($from, $to, $subject, $view, array $params, MailerInterface $mailer) diff --git a/src/User/Service/PasswordRecoveryService.php b/src/User/Service/PasswordRecoveryService.php index fc74a05..ec0733b 100644 --- a/src/User/Service/PasswordRecoveryService.php +++ b/src/User/Service/PasswordRecoveryService.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Da\User\Service; use Da\User\Contracts\ServiceInterface; diff --git a/src/User/Service/SocialNetworkAccountConnectService.php b/src/User/Service/SocialNetworkAccountConnectService.php index 1d2747d..fbf9cc7 100644 --- a/src/User/Service/SocialNetworkAccountConnectService.php +++ b/src/User/Service/SocialNetworkAccountConnectService.php @@ -32,8 +32,8 @@ class SocialNetworkAccountConnectService implements ServiceInterface /** * SocialNetworkAccountUserLinkService constructor. * - * @param SecurityController $controller - * @param AuthClientInterface $client + * @param SecurityController $controller + * @param AuthClientInterface $client * @param SocialNetworkAccountQuery $socialNetworkAccountQuery */ public function __construct( @@ -68,7 +68,6 @@ class SocialNetworkAccountConnectService implements ServiceInterface Yii::t('usuario', 'This account has already been connected to another user') ); - return false; } diff --git a/src/User/Traits/ContainerAwareTrait.php b/src/User/Traits/ContainerAwareTrait.php index 4a0d8e8..8bac337 100644 --- a/src/User/Traits/ContainerAwareTrait.php +++ b/src/User/Traits/ContainerAwareTrait.php @@ -34,10 +34,10 @@ trait ContainerAwareTrait /** * Gets a class from the container. * - * @param string $class he class name or an alias name (e.g. `foo`) that was previously registered via [[set()]] - * or [[setSingleton()]] - * @param array $params constructor parameters - * @param array $config attributes + * @param string $class he class name or an alias name (e.g. `foo`) that was previously registered via [[set()]] + * or [[setSingleton()]] + * @param array $params constructor parameters + * @param array $config attributes * * @return object */ diff --git a/src/User/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/ca/usuario.php +++ b/src/User/resources/i18n/ca/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/da/usuario.php +++ b/src/User/resources/i18n/da/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/de-DU/usuario.php +++ b/src/User/resources/i18n/de-DU/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index 055eb25..e617c98 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '(nicht gesetzt)', 'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', diff --git a/src/User/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php index b53005d..6a5fb6b 100644 --- a/src/User/resources/i18n/es/usuario.php +++ b/src/User/resources/i18n/es/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '(sin establecer)', 'A confirmation message has been sent to your new email address' => 'Se ha enviado un mensaje de confirmación a tu nueva dirección de correo electrónico', diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/fa-IR/usuario.php +++ b/src/User/resources/i18n/fa-IR/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/fi/usuario.php +++ b/src/User/resources/i18n/fi/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/fr/usuario.php +++ b/src/User/resources/i18n/fr/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/hr/usuario.php +++ b/src/User/resources/i18n/hr/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/hu/usuario.php +++ b/src/User/resources/i18n/hu/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php index e4ec464..3ced4b1 100644 --- a/src/User/resources/i18n/it/usuario.php +++ b/src/User/resources/i18n/it/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '(non impostato)', 'A confirmation message has been sent to your new email address' => 'È stato inviato un messaggio di conferma al tuo nuovo indirizzo email', diff --git a/src/User/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/kk/usuario.php +++ b/src/User/resources/i18n/kk/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/lt/usuario.php +++ b/src/User/resources/i18n/lt/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/nl/usuario.php +++ b/src/User/resources/i18n/nl/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/pl/usuario.php +++ b/src/User/resources/i18n/pl/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/pt-BR/usuario.php +++ b/src/User/resources/i18n/pt-BR/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/pt-PT/usuario.php +++ b/src/User/resources/i18n/pt-PT/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/ro/usuario.php +++ b/src/User/resources/i18n/ro/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php index 472a270..5d104fe 100644 --- a/src/User/resources/i18n/ru/usuario.php +++ b/src/User/resources/i18n/ru/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '(неустановлено)', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/th/usuario.php +++ b/src/User/resources/i18n/th/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/tr_TR/usuario.php b/src/User/resources/i18n/tr_TR/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/tr_TR/usuario.php +++ b/src/User/resources/i18n/tr_TR/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/uk/usuario.php +++ b/src/User/resources/i18n/uk/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/vi/usuario.php +++ b/src/User/resources/i18n/vi/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php index 6385210..081cc8f 100644 --- a/src/User/resources/i18n/zh-CN/usuario.php +++ b/src/User/resources/i18n/zh-CN/usuario.php @@ -1,21 +1,14 @@ * - * Each array element represents the translation (value) of a message (key). - * If the value is empty, the message is considered as not translated. - * Messages that no longer need translation will have their translations - * enclosed between a pair of '@@' marks. - * - * Message string can be used with plural forms format. Check i18n section - * of the guide for details. - * - * NOTE: this file must be saved in UTF-8 encoding. + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. */ + return [ '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', diff --git a/src/User/resources/views/admin/_profile.php b/src/User/resources/views/admin/_profile.php index 39e434c..e9c96e9 100644 --- a/src/User/resources/views/admin/_profile.php +++ b/src/User/resources/views/admin/_profile.php @@ -13,8 +13,8 @@ use yii\bootstrap\ActiveForm; use yii\helpers\Html; /** - * @var yii\web\View $this - * @var \Da\User\Model\User $user + * @var yii\web\View $this + * @var \Da\User\Model\User $user * @var \Da\User\Model\Profile $profile */ diff --git a/src/User/resources/views/admin/_user.php b/src/User/resources/views/admin/_user.php index dca3963..4dbf4d9 100644 --- a/src/User/resources/views/admin/_user.php +++ b/src/User/resources/views/admin/_user.php @@ -11,7 +11,7 @@ /** * @var yii\widgets\ActiveForm - * @var \Da\User\Model\User $user + * @var \Da\User\Model\User $user */ ?> diff --git a/src/User/resources/views/admin/create.php b/src/User/resources/views/admin/create.php index b67d457..db9040c 100644 --- a/src/User/resources/views/admin/create.php +++ b/src/User/resources/views/admin/create.php @@ -14,7 +14,7 @@ use yii\bootstrap\Nav; use yii\helpers\Html; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var \Da\User\Model\User $user */ diff --git a/src/User/resources/views/admin/update.php b/src/User/resources/views/admin/update.php index 413c2f5..c598588 100644 --- a/src/User/resources/views/admin/update.php +++ b/src/User/resources/views/admin/update.php @@ -15,8 +15,8 @@ use yii\helpers\Html; use yii\web\View; /** - * @var View $this - * @var User $user + * @var View $this + * @var User $user * @var string $content */ diff --git a/src/User/resources/views/mail/confirmation.php b/src/User/resources/views/mail/confirmation.php index 1dadf4b..613cbde 100644 --- a/src/User/resources/views/mail/confirmation.php +++ b/src/User/resources/views/mail/confirmation.php @@ -12,7 +12,7 @@ use yii\helpers\Html; /** - * @var \Da\User\Model\User $user + * @var \Da\User\Model\User $user * @var \Da\User\Model\Token $token */ ?> diff --git a/src/User/resources/views/mail/text/welcome.php b/src/User/resources/views/mail/text/welcome.php index c5bbba0..535562e 100644 --- a/src/User/resources/views/mail/text/welcome.php +++ b/src/User/resources/views/mail/text/welcome.php @@ -12,7 +12,7 @@ /** * @var \Da\User\Model\User * @var \Da\User\Model\Token $token - * @var \Da\User\Module $module + * @var \Da\User\Module $module */ ?> , diff --git a/src/User/resources/views/mail/welcome.php b/src/User/resources/views/mail/welcome.php index 3d7c810..38f2dee 100644 --- a/src/User/resources/views/mail/welcome.php +++ b/src/User/resources/views/mail/welcome.php @@ -12,10 +12,10 @@ use yii\helpers\Html; /** - * @var \Da\User\Module $module - * @var \Da\User\Model\User $user + * @var \Da\User\Module $module + * @var \Da\User\Model\User $user * @var \Da\User\Model\Token $token - * @var bool $showPassword + * @var bool $showPassword */ ?> diff --git a/src/User/resources/views/permission/index.php b/src/User/resources/views/permission/index.php index 169c7ca..fd3ba56 100644 --- a/src/User/resources/views/permission/index.php +++ b/src/User/resources/views/permission/index.php @@ -11,8 +11,8 @@ /** * @var $dataProvider \yii\data\ActiveDataProvider - * @var $this yii\web\View - * @var $searchModel \Da\User\Search\PermissionSearch + * @var $this yii\web\View + * @var $searchModel \Da\User\Search\PermissionSearch */ use yii\grid\ActionColumn; use yii\grid\GridView; diff --git a/src/User/resources/views/profile/show.php b/src/User/resources/views/profile/show.php index f842ad1..a101a97 100644 --- a/src/User/resources/views/profile/show.php +++ b/src/User/resources/views/profile/show.php @@ -12,7 +12,7 @@ use yii\helpers\Html; /** - * @var \yii\web\View $this + * @var \yii\web\View $this * @var \Da\User\Model\Profile $profile */ diff --git a/src/User/resources/views/recovery/request.php b/src/User/resources/views/recovery/request.php index fbfcdf1..6b0b6d7 100644 --- a/src/User/resources/views/recovery/request.php +++ b/src/User/resources/views/recovery/request.php @@ -13,8 +13,8 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this - * @var yii\widgets\ActiveForm $form + * @var yii\web\View $this + * @var yii\widgets\ActiveForm $form * @var \Da\User\Form\RecoveryForm $model */ diff --git a/src/User/resources/views/recovery/reset.php b/src/User/resources/views/recovery/reset.php index 978d6c3..8f225f1 100644 --- a/src/User/resources/views/recovery/reset.php +++ b/src/User/resources/views/recovery/reset.php @@ -13,8 +13,8 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this - * @var yii\widgets\ActiveForm $form + * @var yii\web\View $this + * @var yii\widgets\ActiveForm $form * @var \Da\User\Form\RecoveryForm $model */ diff --git a/src/User/resources/views/registration/connect.php b/src/User/resources/views/registration/connect.php index 33d221d..e6e8a50 100644 --- a/src/User/resources/views/registration/connect.php +++ b/src/User/resources/views/registration/connect.php @@ -13,9 +13,9 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this - * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\User $model + * @var yii\web\View $this + * @var yii\widgets\ActiveForm $form + * @var \Da\User\Model\User $model * @var \Da\User\Model\SocialNetworkAccount $account */ diff --git a/src/User/resources/views/registration/register.php b/src/User/resources/views/registration/register.php index beab8ac..1cc3577 100644 --- a/src/User/resources/views/registration/register.php +++ b/src/User/resources/views/registration/register.php @@ -13,10 +13,10 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var \Da\User\Form\RegistrationForm $model - * @var \Da\User\Model\User $user - * @var \Da\User\Module $module + * @var \Da\User\Model\User $user + * @var \Da\User\Module $module */ $this->title = Yii::t('usuario', 'Sign up'); diff --git a/src/User/resources/views/registration/resend.php b/src/User/resources/views/registration/resend.php index 6a941cc..b687a1e 100644 --- a/src/User/resources/views/registration/resend.php +++ b/src/User/resources/views/registration/resend.php @@ -13,7 +13,7 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var \Da\User\Form\ResendForm $model */ diff --git a/src/User/resources/views/security/login.php b/src/User/resources/views/security/login.php index d1e5897..8bbc5ce 100644 --- a/src/User/resources/views/security/login.php +++ b/src/User/resources/views/security/login.php @@ -14,9 +14,9 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var \Da\User\Form\LoginForm $model - * @var \Da\User\Module $module + * @var \Da\User\Module $module */ $this->title = Yii::t('usuario', 'Sign in'); diff --git a/src/User/resources/views/settings/account.php b/src/User/resources/views/settings/account.php index 5e1a8ec..ed3b81d 100644 --- a/src/User/resources/views/settings/account.php +++ b/src/User/resources/views/settings/account.php @@ -13,8 +13,8 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this - * @var yii\widgets\ActiveForm $form + * @var yii\web\View $this + * @var yii\widgets\ActiveForm $form * @var \Da\User\Form\SettingsForm $model */ diff --git a/src/User/resources/views/settings/networks.php b/src/User/resources/views/settings/networks.php index a166ab0..f7c6883 100644 --- a/src/User/resources/views/settings/networks.php +++ b/src/User/resources/views/settings/networks.php @@ -13,9 +13,9 @@ use Da\User\Widget\ConnectWidget; use yii\helpers\Html; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\User $user + * @var \Da\User\Model\User $user */ $this->title = Yii::t('usuario', 'Networks'); diff --git a/src/User/resources/views/settings/profile.php b/src/User/resources/views/settings/profile.php index 6d39257..9cfaf8e 100644 --- a/src/User/resources/views/settings/profile.php +++ b/src/User/resources/views/settings/profile.php @@ -15,10 +15,10 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /** - * @var yii\web\View $this + * @var yii\web\View $this * @var yii\widgets\ActiveForm $form * @var \Da\User\Model\Profile $model - * @var TimezoneHelper $timezoneHelper + * @var TimezoneHelper $timezoneHelper */ $this->title = Yii::t('usuario', 'Profile settings'); diff --git a/src/User/resources/views/shared/message.php b/src/User/resources/views/shared/message.php index 3d606e9..a35d8f6 100644 --- a/src/User/resources/views/shared/message.php +++ b/src/User/resources/views/shared/message.php @@ -12,7 +12,7 @@ /** * @var yii\web\View * @var \Da\User\Module $module - * @var string $title + * @var string $title */ $this->title = $title;