Commit 64b4d6dc by Alexander Mohorev

Correct order of property declaration

parent 329e6ee0
...@@ -15,6 +15,7 @@ class LoginForm extends Model ...@@ -15,6 +15,7 @@ class LoginForm extends Model
private $_user = false; private $_user = false;
/** /**
* @inheritdoc * @inheritdoc
*/ */
......
...@@ -18,6 +18,7 @@ class ResetPasswordForm extends Model ...@@ -18,6 +18,7 @@ class ResetPasswordForm extends Model
*/ */
private $_user; private $_user;
/** /**
* Creates a form model given a token. * Creates a form model given a token.
* *
......
...@@ -16,6 +16,7 @@ class LoginForm extends Model ...@@ -16,6 +16,7 @@ class LoginForm extends Model
private $_user = false; private $_user = false;
/** /**
* @return array the validation rules. * @return array the validation rules.
*/ */
......
...@@ -86,6 +86,12 @@ class AuthAction extends Action ...@@ -86,6 +86,12 @@ class AuthAction extends Action
*/ */
public $successCallback; public $successCallback;
/** /**
* @var string name or alias of the view file, which should be rendered in order to perform redirection.
* If not set default one will be used.
*/
public $redirectView;
/**
* @var string the redirect url after successful authorization. * @var string the redirect url after successful authorization.
*/ */
private $_successUrl = ''; private $_successUrl = '';
...@@ -96,12 +102,6 @@ class AuthAction extends Action ...@@ -96,12 +102,6 @@ class AuthAction extends Action
/** /**
* @var string name or alias of the view file, which should be rendered in order to perform redirection.
* If not set default one will be used.
*/
public $redirectView;
/**
* @param string $url successful URL. * @param string $url successful URL.
*/ */
public function setSuccessUrl($url) public function setSuccessUrl($url)
......
...@@ -35,6 +35,11 @@ class OAuthToken extends Object ...@@ -35,6 +35,11 @@ class OAuthToken extends Object
*/ */
public $tokenSecretParamKey = 'oauth_token_secret'; public $tokenSecretParamKey = 'oauth_token_secret';
/** /**
* @var integer object creation timestamp.
*/
public $createTimestamp;
/**
* @var string key in [[params]] array, which stores token expiration duration. * @var string key in [[params]] array, which stores token expiration duration.
* If not set will attempt to fetch its value automatically. * If not set will attempt to fetch its value automatically.
*/ */
...@@ -45,11 +50,6 @@ class OAuthToken extends Object ...@@ -45,11 +50,6 @@ class OAuthToken extends Object
private $_params = []; private $_params = [];
/**
* @var integer object creation timestamp.
*/
public $createTimestamp;
public function init() public function init()
{ {
if ($this->createTimestamp === null) { if ($this->createTimestamp === null) {
......
...@@ -82,20 +82,6 @@ class OpenId extends BaseClient implements ClientInterface ...@@ -82,20 +82,6 @@ class OpenId extends BaseClient implements ClientInterface
*/ */
public $cainfo; public $cainfo;
/** /**
* @var string authentication return URL.
*/
private $_returnUrl;
/**
* @var string claimed identifier (identity)
*/
private $_claimedId;
/**
* @var string client trust root (realm), by default [[\yii\web\Request::hostInfo]] value will be used.
*/
private $_trustRoot;
/**
* @var array data, which should be used to retrieve the OpenID response. * @var array data, which should be used to retrieve the OpenID response.
* If not set combination of GET and POST will be used. * If not set combination of GET and POST will be used.
*/ */
...@@ -116,6 +102,20 @@ class OpenId extends BaseClient implements ClientInterface ...@@ -116,6 +102,20 @@ class OpenId extends BaseClient implements ClientInterface
]; ];
/** /**
* @var string authentication return URL.
*/
private $_returnUrl;
/**
* @var string claimed identifier (identity)
*/
private $_claimedId;
/**
* @var string client trust root (realm), by default [[\yii\web\Request::hostInfo]] value will be used.
*/
private $_trustRoot;
/**
* @inheritdoc * @inheritdoc
*/ */
public function init() public function init()
......
...@@ -24,6 +24,15 @@ use yii\base\NotSupportedException; ...@@ -24,6 +24,15 @@ use yii\base\NotSupportedException;
class RsaSha1 extends BaseMethod class RsaSha1 extends BaseMethod
{ {
/** /**
* @var string path to the file, which holds private key certificate.
*/
public $privateCertificateFile = '';
/**
* @var string path to the file, which holds public key certificate.
*/
public $publicCertificateFile = '';
/**
* @var string OpenSSL private key certificate content. * @var string OpenSSL private key certificate content.
* This value can be fetched from file specified by [[privateCertificateFile]]. * This value can be fetched from file specified by [[privateCertificateFile]].
*/ */
...@@ -36,15 +45,6 @@ class RsaSha1 extends BaseMethod ...@@ -36,15 +45,6 @@ class RsaSha1 extends BaseMethod
/** /**
* @var string path to the file, which holds private key certificate.
*/
public $privateCertificateFile = '';
/**
* @var string path to the file, which holds public key certificate.
*/
public $publicCertificateFile = '';
/**
* @inheritdoc * @inheritdoc
*/ */
public function init() public function init()
......
...@@ -138,7 +138,6 @@ use yii\helpers\VarDumper; ...@@ -138,7 +138,6 @@ use yii\helpers\VarDumper;
*/ */
class FixtureController extends \yii\console\controllers\FixtureController class FixtureController extends \yii\console\controllers\FixtureController
{ {
/** /**
* @var string Alias to the template path, where all tables templates are stored. * @var string Alias to the template path, where all tables templates are stored.
*/ */
......
...@@ -26,7 +26,6 @@ class Extension ...@@ -26,7 +26,6 @@ class Extension
* @var ViewRenderer * @var ViewRenderer
*/ */
protected $viewRenderer; protected $viewRenderer;
/** /**
* @var Smarty * @var Smarty
*/ */
......
...@@ -32,7 +32,6 @@ class ViewRenderer extends BaseViewRenderer ...@@ -32,7 +32,6 @@ class ViewRenderer extends BaseViewRenderer
* @var string the directory or path alias pointing to where Smarty compiled templates will be stored. * @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
*/ */
public $compilePath = '@runtime/Smarty/compile'; public $compilePath = '@runtime/Smarty/compile';
/** /**
* @var array Add additional directories to Smarty's search path for plugins. * @var array Add additional directories to Smarty's search path for plugins.
*/ */
...@@ -46,21 +45,20 @@ class ViewRenderer extends BaseViewRenderer ...@@ -46,21 +45,20 @@ class ViewRenderer extends BaseViewRenderer
*/ */
public $widgets = ['functions' => [], 'blocks' => []]; public $widgets = ['functions' => [], 'blocks' => []];
/** /**
* @var Smarty The Smarty object used for rendering
*/
protected $smarty;
/**
* @var array additional Smarty options * @var array additional Smarty options
* @see http://www.smarty.net/docs/en/api.variables.tpl * @see http://www.smarty.net/docs/en/api.variables.tpl
*/ */
public $options = []; public $options = [];
/** /**
* @var string extension class name * @var string extension class name
*/ */
public $extensionClass = '\yii\smarty\Extension'; public $extensionClass = '\yii\smarty\Extension';
/**
* @var Smarty The Smarty object used for rendering
*/
protected $smarty;
/** /**
* Instantiates and configures the Smarty object. * Instantiates and configures the Smarty object.
......
...@@ -43,6 +43,7 @@ class Schema extends Object ...@@ -43,6 +43,7 @@ class Schema extends Object
* @var Connection the Sphinx connection * @var Connection the Sphinx connection
*/ */
public $db; public $db;
/** /**
* @var array list of ALL index names in the Sphinx * @var array list of ALL index names in the Sphinx
*/ */
......
...@@ -33,6 +33,7 @@ class BaseFileHelper ...@@ -33,6 +33,7 @@ class BaseFileHelper
*/ */
public static $mimeMagicFile = '@yii/helpers/mimeTypes.php'; public static $mimeMagicFile = '@yii/helpers/mimeTypes.php';
/** /**
* Normalizes a file/directory path. * Normalizes a file/directory path.
* The normalization does the following work: * The normalization does the following work:
......
...@@ -238,6 +238,7 @@ class BaseInflector ...@@ -238,6 +238,7 @@ class BaseInflector
*/ */
public static $transliterator = 'Any-Latin; NFKD'; public static $transliterator = 'Any-Latin; NFKD';
/** /**
* Converts a word to its plural form. * Converts a word to its plural form.
* Note that this is for English only! * Note that this is for English only!
......
...@@ -157,6 +157,7 @@ class ActiveForm extends Widget ...@@ -157,6 +157,7 @@ class ActiveForm extends Widget
* @internal * @internal
*/ */
public $attributes = []; public $attributes = [];
/** /**
* @var ActiveField[] the ActiveField objects that are currently active * @var ActiveField[] the ActiveField objects that are currently active
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment