mirror of
https://github.com/yiisoft/yii2.git
synced 2025-08-26 06:15:19 +08:00
Correct order of property declaration
This commit is contained in:
@ -15,6 +15,7 @@ class LoginForm extends Model
|
||||
|
||||
private $_user = false;
|
||||
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
|
@ -18,6 +18,7 @@ class ResetPasswordForm extends Model
|
||||
*/
|
||||
private $_user;
|
||||
|
||||
|
||||
/**
|
||||
* Creates a form model given a token.
|
||||
*
|
||||
|
@ -16,6 +16,7 @@ class LoginForm extends Model
|
||||
|
||||
private $_user = false;
|
||||
|
||||
|
||||
/**
|
||||
* @return array the validation rules.
|
||||
*/
|
||||
|
@ -85,6 +85,12 @@ class AuthAction extends Action
|
||||
*
|
||||
*/
|
||||
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.
|
||||
*/
|
||||
@ -95,12 +101,6 @@ class AuthAction extends Action
|
||||
private $_cancelUrl = '';
|
||||
|
||||
|
||||
/**
|
||||
* @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.
|
||||
*/
|
||||
|
@ -34,6 +34,11 @@ class OAuthToken extends Object
|
||||
* @var string key in [[params]] array, which stores token secret key.
|
||||
*/
|
||||
public $tokenSecretParamKey = 'oauth_token_secret';
|
||||
/**
|
||||
* @var integer object creation timestamp.
|
||||
*/
|
||||
public $createTimestamp;
|
||||
|
||||
/**
|
||||
* @var string key in [[params]] array, which stores token expiration duration.
|
||||
* If not set will attempt to fetch its value automatically.
|
||||
@ -45,11 +50,6 @@ class OAuthToken extends Object
|
||||
private $_params = [];
|
||||
|
||||
|
||||
/**
|
||||
* @var integer object creation timestamp.
|
||||
*/
|
||||
public $createTimestamp;
|
||||
|
||||
public function init()
|
||||
{
|
||||
if ($this->createTimestamp === null) {
|
||||
|
@ -81,20 +81,6 @@ class OpenId extends BaseClient implements ClientInterface
|
||||
* This value will take effect only if [[verifyPeer]] is set.
|
||||
*/
|
||||
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.
|
||||
* If not set combination of GET and POST will be used.
|
||||
@ -115,6 +101,20 @@ class OpenId extends BaseClient implements ClientInterface
|
||||
'pref/timezone' => 'timezone',
|
||||
];
|
||||
|
||||
/**
|
||||
* @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
|
||||
*/
|
||||
|
@ -23,6 +23,15 @@ use yii\base\NotSupportedException;
|
||||
*/
|
||||
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.
|
||||
* This value can be fetched from file specified by [[privateCertificateFile]].
|
||||
@ -35,15 +44,6 @@ class RsaSha1 extends BaseMethod
|
||||
protected $_publicCertificate;
|
||||
|
||||
|
||||
/**
|
||||
* @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
|
||||
*/
|
||||
|
@ -138,7 +138,6 @@ use yii\helpers\VarDumper;
|
||||
*/
|
||||
class FixtureController extends \yii\console\controllers\FixtureController
|
||||
{
|
||||
|
||||
/**
|
||||
* @var string Alias to the template path, where all tables templates are stored.
|
||||
*/
|
||||
|
@ -26,7 +26,6 @@ class Extension
|
||||
* @var ViewRenderer
|
||||
*/
|
||||
protected $viewRenderer;
|
||||
|
||||
/**
|
||||
* @var Smarty
|
||||
*/
|
||||
|
@ -32,7 +32,6 @@ class ViewRenderer extends BaseViewRenderer
|
||||
* @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
|
||||
*/
|
||||
public $compilePath = '@runtime/Smarty/compile';
|
||||
|
||||
/**
|
||||
* @var array Add additional directories to Smarty's search path for plugins.
|
||||
*/
|
||||
@ -45,22 +44,21 @@ class ViewRenderer extends BaseViewRenderer
|
||||
* @var array Widget declarations
|
||||
*/
|
||||
public $widgets = ['functions' => [], 'blocks' => []];
|
||||
/**
|
||||
* @var Smarty The Smarty object used for rendering
|
||||
*/
|
||||
protected $smarty;
|
||||
|
||||
/**
|
||||
* @var array additional Smarty options
|
||||
* @see http://www.smarty.net/docs/en/api.variables.tpl
|
||||
*/
|
||||
public $options = [];
|
||||
|
||||
/**
|
||||
* @var string extension class name
|
||||
*/
|
||||
public $extensionClass = '\yii\smarty\Extension';
|
||||
|
||||
/**
|
||||
* @var Smarty The Smarty object used for rendering
|
||||
*/
|
||||
protected $smarty;
|
||||
|
||||
|
||||
/**
|
||||
* Instantiates and configures the Smarty object.
|
||||
|
@ -43,6 +43,7 @@ class Schema extends Object
|
||||
* @var Connection the Sphinx connection
|
||||
*/
|
||||
public $db;
|
||||
|
||||
/**
|
||||
* @var array list of ALL index names in the Sphinx
|
||||
*/
|
||||
|
@ -33,6 +33,7 @@ class BaseFileHelper
|
||||
*/
|
||||
public static $mimeMagicFile = '@yii/helpers/mimeTypes.php';
|
||||
|
||||
|
||||
/**
|
||||
* Normalizes a file/directory path.
|
||||
* The normalization does the following work:
|
||||
|
@ -238,6 +238,7 @@ class BaseInflector
|
||||
*/
|
||||
public static $transliterator = 'Any-Latin; NFKD';
|
||||
|
||||
|
||||
/**
|
||||
* Converts a word to its plural form.
|
||||
* Note that this is for English only!
|
||||
|
@ -157,6 +157,7 @@ class ActiveForm extends Widget
|
||||
* @internal
|
||||
*/
|
||||
public $attributes = [];
|
||||
|
||||
/**
|
||||
* @var ActiveField[] the ActiveField objects that are currently active
|
||||
*/
|
||||
|
Reference in New Issue
Block a user