diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index 03e0816..7417e08 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -278,7 +278,7 @@ class PhpDocController extends Controller
}
if (trim($line) === '') {
unset($lines[$i]);
- } elseif (ltrim($line)[0] !== '*' && strpos($line, 'function') !== false) {
+ } elseif (ltrim($line)[0] !== '*' && strpos($line, 'function ') !== false) {
break;
} elseif (trim($line) === '}') {
$propertiesOnly = true;
@@ -309,32 +309,33 @@ class PhpDocController extends Controller
${'endof'.$property} = $i;
}
- if (strncmp(trim($line), 'public $', 8) === 0 || strncmp(trim($line), 'public static $', 15) === 0) {
+ $line = trim($line);
+ if (strncmp($line, 'public $', 8) === 0 || strncmp($line, 'public static $', 15) === 0) {
$endofPublic = $i;
$property = 'Public';
$level = 0;
- } elseif (strncmp(trim($line), 'protected $', 11) === 0 || strncmp(trim($line), 'protected static $', 18) === 0) {
+ } elseif (strncmp($line, 'protected $', 11) === 0 || strncmp($line, 'protected static $', 18) === 0) {
$endofProtected = $i;
$property = 'Protected';
$level = 0;
- } elseif (strncmp(trim($line), 'private $', 9) === 0 || strncmp(trim($line), 'private static $', 16) === 0) {
+ } elseif (strncmp($line, 'private $', 9) === 0 || strncmp($line, 'private static $', 16) === 0) {
$endofPrivate = $i;
$property = 'Private';
$level = 0;
- } elseif (substr(trim($line),0 , 6) === 'const ') {
+ } elseif (substr($line,0 , 6) === 'const ') {
$endofConst = $i;
$property = false;
- } elseif (substr(trim($line),0 , 4) === 'use ') {
+ } elseif (substr($line,0 , 4) === 'use ') {
$endofUse = $i;
$property = false;
- } elseif (ltrim($line)[0] === '*') {
+ } elseif (!empty($line) && $line[0] === '*') {
$property = false;
- } elseif (ltrim($line)[0] !== '*' && strpos($line, 'function') !== false || trim($line) === '}') {
+ } elseif (!empty($line) && $line[0] !== '*' && strpos($line, 'function ') !== false || $line === '}') {
break;
}
// check for multi line array
- if ($property !== false && strncmp(trim($line), "'SQLSTATE[", 10) !== 0) {
+ if ($property !== false && strncmp($line, "'SQLSTATE[", 10) !== 0) {
$level += substr_count($line, '[') - substr_count($line, ']');
}
}
diff --git a/extensions/apidoc/commands/ApiController.php b/extensions/apidoc/commands/ApiController.php
index 927fbf2..17ce3fb 100644
--- a/extensions/apidoc/commands/ApiController.php
+++ b/extensions/apidoc/commands/ApiController.php
@@ -28,8 +28,8 @@ class ApiController extends BaseController
*/
public $guide;
- // TODO add force update option
+ // TODO add force update option
/**
* Renders API documentation files
* @param array $sourceDirs
diff --git a/extensions/apidoc/commands/GuideController.php b/extensions/apidoc/commands/GuideController.php
index e11ef60..c4f7495 100644
--- a/extensions/apidoc/commands/GuideController.php
+++ b/extensions/apidoc/commands/GuideController.php
@@ -28,6 +28,7 @@ class GuideController extends BaseController
*/
public $apiDocs;
+
/**
* Renders API documentation files
* @param array $sourceDirs
diff --git a/extensions/apidoc/components/BaseController.php b/extensions/apidoc/components/BaseController.php
index 23b9797..83521a1 100644
--- a/extensions/apidoc/components/BaseController.php
+++ b/extensions/apidoc/components/BaseController.php
@@ -30,6 +30,7 @@ abstract class BaseController extends Controller
*/
public $exclude;
+
protected function normalizeTargetDir($target)
{
$target = rtrim(Yii::getAlias($target), '\\/');
diff --git a/extensions/apidoc/helpers/ApiIndexer.php b/extensions/apidoc/helpers/ApiIndexer.php
index cab957b..75e27c1 100644
--- a/extensions/apidoc/helpers/ApiIndexer.php
+++ b/extensions/apidoc/helpers/ApiIndexer.php
@@ -1,13 +1,12 @@
<?php
/**
- *
- *
- * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
*/
namespace yii\apidoc\helpers;
-
use cebe\jssearch\Indexer;
use cebe\jssearch\tokenizer\StandardTokenizer;
use cebe\jssearch\TokenizerInterface;
diff --git a/extensions/apidoc/helpers/ApiMarkdown.php b/extensions/apidoc/helpers/ApiMarkdown.php
index 44c8ebe..6bf319d 100644
--- a/extensions/apidoc/helpers/ApiMarkdown.php
+++ b/extensions/apidoc/helpers/ApiMarkdown.php
@@ -31,6 +31,7 @@ class ApiMarkdown extends GithubMarkdown
protected $renderingContext;
+
/**
* Renders a code block
*/
diff --git a/extensions/apidoc/helpers/ApiMarkdownLaTeX.php b/extensions/apidoc/helpers/ApiMarkdownLaTeX.php
index e2358b9..d3001f8 100644
--- a/extensions/apidoc/helpers/ApiMarkdownLaTeX.php
+++ b/extensions/apidoc/helpers/ApiMarkdownLaTeX.php
@@ -29,6 +29,7 @@ class ApiMarkdownLaTeX extends GithubMarkdown
protected $renderingContext;
+
protected function inlineMarkers()
{
return array_merge(parent::inlineMarkers(), [
diff --git a/extensions/apidoc/helpers/IndexFileAnalyzer.php b/extensions/apidoc/helpers/IndexFileAnalyzer.php
index 1093813..bfa6e61 100644
--- a/extensions/apidoc/helpers/IndexFileAnalyzer.php
+++ b/extensions/apidoc/helpers/IndexFileAnalyzer.php
@@ -17,6 +17,7 @@ class IndexFileAnalyzer extends Markdown
private $_chapter = 0;
private $_chapters = [];
+
public function analyze($text)
{
$this->parse($text);
diff --git a/extensions/apidoc/models/BaseDoc.php b/extensions/apidoc/models/BaseDoc.php
index f64f475..bff39e5 100644
--- a/extensions/apidoc/models/BaseDoc.php
+++ b/extensions/apidoc/models/BaseDoc.php
@@ -24,24 +24,21 @@ class BaseDoc extends Object
* @var \phpDocumentor\Reflection\DocBlock\Context
*/
public $phpDocContext;
-
public $name;
-
public $sourceFile;
public $startLine;
public $endLine;
-
public $shortDescription;
public $description;
public $since;
public $deprecatedSince;
public $deprecatedReason;
-
/**
* @var \phpDocumentor\Reflection\DocBlock\Tag[]
*/
public $tags = [];
+
public function hasTag($name)
{
foreach ($this->tags as $tag) {
diff --git a/extensions/apidoc/models/ClassDoc.php b/extensions/apidoc/models/ClassDoc.php
index 60dabf5..338e128 100644
--- a/extensions/apidoc/models/ClassDoc.php
+++ b/extensions/apidoc/models/ClassDoc.php
@@ -18,10 +18,8 @@ namespace yii\apidoc\models;
class ClassDoc extends TypeDoc
{
public $parentClass;
-
public $isAbstract;
public $isFinal;
-
/**
* @var string[]
*/
@@ -29,7 +27,6 @@ class ClassDoc extends TypeDoc
public $traits = [];
// will be set by Context::updateReferences()
public $subclasses = [];
-
/**
* @var EventDoc[]
*/
@@ -39,6 +36,7 @@ class ClassDoc extends TypeDoc
*/
public $constants = [];
+
public function findSubject($subjectName)
{
if (($subject = parent::findSubject($subjectName)) !== null) {
diff --git a/extensions/apidoc/models/ConstDoc.php b/extensions/apidoc/models/ConstDoc.php
index 9ed9a03..2d83555 100644
--- a/extensions/apidoc/models/ConstDoc.php
+++ b/extensions/apidoc/models/ConstDoc.php
@@ -18,6 +18,7 @@ class ConstDoc extends BaseDoc
public $definedBy;
public $value;
+
/**
* @param \phpDocumentor\Reflection\ClassReflector\ConstantReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/Context.php b/extensions/apidoc/models/Context.php
index 7416996..326b24e 100644
--- a/extensions/apidoc/models/Context.php
+++ b/extensions/apidoc/models/Context.php
@@ -33,9 +33,9 @@ class Context extends Component
* @var TraitDoc[]
*/
public $traits = [];
-
public $errors = [];
+
public function getType($type)
{
$type = ltrim($type, '\\');
diff --git a/extensions/apidoc/models/EventDoc.php b/extensions/apidoc/models/EventDoc.php
index d699d67..7bb9991 100644
--- a/extensions/apidoc/models/EventDoc.php
+++ b/extensions/apidoc/models/EventDoc.php
@@ -20,6 +20,7 @@ class EventDoc extends ConstDoc
public $type;
public $types;
+
/**
* @param \phpDocumentor\Reflection\ClassReflector\ConstantReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/FunctionDoc.php b/extensions/apidoc/models/FunctionDoc.php
index c844e31..3a022d8 100644
--- a/extensions/apidoc/models/FunctionDoc.php
+++ b/extensions/apidoc/models/FunctionDoc.php
@@ -30,6 +30,7 @@ class FunctionDoc extends BaseDoc
public $returnTypes;
public $isReturnByReference;
+
/**
* @param \phpDocumentor\Reflection\FunctionReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/InterfaceDoc.php b/extensions/apidoc/models/InterfaceDoc.php
index 461302d..4426104 100644
--- a/extensions/apidoc/models/InterfaceDoc.php
+++ b/extensions/apidoc/models/InterfaceDoc.php
@@ -16,10 +16,10 @@ namespace yii\apidoc\models;
class InterfaceDoc extends TypeDoc
{
public $parentInterfaces = [];
-
// will be set by Context::updateReferences()
public $implementedBy = [];
+
/**
* @param \phpDocumentor\Reflection\InterfaceReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/MethodDoc.php b/extensions/apidoc/models/MethodDoc.php
index c420a54..6b0d329 100644
--- a/extensions/apidoc/models/MethodDoc.php
+++ b/extensions/apidoc/models/MethodDoc.php
@@ -17,14 +17,12 @@ class MethodDoc extends FunctionDoc
{
public $isAbstract;
public $isFinal;
-
public $isStatic;
-
public $visibility;
-
// will be set by creating class
public $definedBy;
+
/**
* @param \phpDocumentor\Reflection\ClassReflector\MethodReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/ParamDoc.php b/extensions/apidoc/models/ParamDoc.php
index 87b7f5f..d9f6552 100644
--- a/extensions/apidoc/models/ParamDoc.php
+++ b/extensions/apidoc/models/ParamDoc.php
@@ -23,13 +23,13 @@ class ParamDoc extends Object
public $isOptional;
public $defaultValue;
public $isPassedByReference;
-
// will be set by creating class
public $description;
public $type;
public $types;
public $sourceFile;
+
/**
* @param \phpDocumentor\Reflection\FunctionReflector\ArgumentReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/PropertyDoc.php b/extensions/apidoc/models/PropertyDoc.php
index 8a7c883..75f8015 100644
--- a/extensions/apidoc/models/PropertyDoc.php
+++ b/extensions/apidoc/models/PropertyDoc.php
@@ -20,18 +20,16 @@ class PropertyDoc extends BaseDoc
{
public $visibility;
public $isStatic;
-
public $type;
public $types;
public $defaultValue;
-
// will be set by creating class
public $getter;
public $setter;
-
// will be set by creating class
public $definedBy;
+
public function getIsReadOnly()
{
return $this->getter !== null && $this->setter === null;
diff --git a/extensions/apidoc/models/TraitDoc.php b/extensions/apidoc/models/TraitDoc.php
index 6dd6eb5..a49bc95 100644
--- a/extensions/apidoc/models/TraitDoc.php
+++ b/extensions/apidoc/models/TraitDoc.php
@@ -18,9 +18,9 @@ class TraitDoc extends TypeDoc
// classes using the trait
// will be set by Context::updateReferences()
public $usedBy = [];
-
public $traits = [];
+
/**
* @param \phpDocumentor\Reflection\TraitReflector $reflector
* @param Context $context
diff --git a/extensions/apidoc/models/TypeDoc.php b/extensions/apidoc/models/TypeDoc.php
index 439bc52..be24cef 100644
--- a/extensions/apidoc/models/TypeDoc.php
+++ b/extensions/apidoc/models/TypeDoc.php
@@ -34,9 +34,9 @@ class TypeDoc extends BaseDoc
* @var PropertyDoc[]
*/
public $properties = [];
-
public $namespace;
+
public function findSubject($subjectName)
{
if ($subjectName[0] != '$') {
diff --git a/extensions/apidoc/renderers/BaseRenderer.php b/extensions/apidoc/renderers/BaseRenderer.php
index 33aed9a..c7c1372 100644
--- a/extensions/apidoc/renderers/BaseRenderer.php
+++ b/extensions/apidoc/renderers/BaseRenderer.php
@@ -42,10 +42,10 @@ abstract class BaseRenderer extends Component
* @var Controller the apidoc controller instance. Can be used to control output.
*/
public $controller;
-
public $guideUrl;
public $guideReferences = [];
+
public function init()
{
ApiMarkdown::$renderer = $this;
diff --git a/extensions/apidoc/templates/bootstrap/ApiRenderer.php b/extensions/apidoc/templates/bootstrap/ApiRenderer.php
index 0caf2ca..a3852d7 100644
--- a/extensions/apidoc/templates/bootstrap/ApiRenderer.php
+++ b/extensions/apidoc/templates/bootstrap/ApiRenderer.php
@@ -24,6 +24,7 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer
public $layout = '@yii/apidoc/templates/bootstrap/layouts/api.php';
public $indexView = '@yii/apidoc/templates/bootstrap/views/index.php';
+
/**
* @inheritdoc
*/
diff --git a/extensions/apidoc/templates/bootstrap/GuideRenderer.php b/extensions/apidoc/templates/bootstrap/GuideRenderer.php
index f5fad98..21a2bb6 100644
--- a/extensions/apidoc/templates/bootstrap/GuideRenderer.php
+++ b/extensions/apidoc/templates/bootstrap/GuideRenderer.php
@@ -23,6 +23,7 @@ class GuideRenderer extends \yii\apidoc\templates\html\GuideRenderer
public $layout = '@yii/apidoc/templates/bootstrap/layouts/guide.php';
+
/**
* @inheritDoc
*/
diff --git a/extensions/apidoc/templates/bootstrap/SideNavWidget.php b/extensions/apidoc/templates/bootstrap/SideNavWidget.php
index 9baeb4c..dc89279 100644
--- a/extensions/apidoc/templates/bootstrap/SideNavWidget.php
+++ b/extensions/apidoc/templates/bootstrap/SideNavWidget.php
@@ -78,6 +78,7 @@ class SideNavWidget extends \yii\bootstrap\Widget
*/
public $activeUrl;
+
/**
* Initializes the widget.
*/
diff --git a/extensions/apidoc/templates/html/ApiRenderer.php b/extensions/apidoc/templates/html/ApiRenderer.php
index bc58866..474fa38 100644
--- a/extensions/apidoc/templates/html/ApiRenderer.php
+++ b/extensions/apidoc/templates/html/ApiRenderer.php
@@ -46,12 +46,14 @@ class ApiRenderer extends BaseApiRenderer implements ViewContextInterface
* @var string path or alias of the view file to use for rendering the index page.
*/
public $indexView = '@yii/apidoc/templates/html/views/index.php';
+
/**
* @var View
*/
private $_view;
private $_targetDir;
+
public function init()
{
parent::init();
diff --git a/extensions/apidoc/templates/html/GuideRenderer.php b/extensions/apidoc/templates/html/GuideRenderer.php
index fbab1b2..52e0d2e 100644
--- a/extensions/apidoc/templates/html/GuideRenderer.php
+++ b/extensions/apidoc/templates/html/GuideRenderer.php
@@ -34,6 +34,7 @@ abstract class GuideRenderer extends BaseGuideRenderer
private $_view;
private $_targetDir;
+
public function init()
{
parent::init();
diff --git a/extensions/apidoc/templates/online/ApiRenderer.php b/extensions/apidoc/templates/online/ApiRenderer.php
index 017f587..8d2394d 100644
--- a/extensions/apidoc/templates/online/ApiRenderer.php
+++ b/extensions/apidoc/templates/online/ApiRenderer.php
@@ -20,9 +20,9 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer
{
public $layout = false;
public $indexView = '@yii/apidoc/templates/online/views/index.php';
-
public $pageTitle = 'Yii Framework 2.0 API Documentation';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/AuthAction.php b/extensions/authclient/AuthAction.php
index 68c03fe..0d7245e 100644
--- a/extensions/authclient/AuthAction.php
+++ b/extensions/authclient/AuthAction.php
@@ -93,6 +93,8 @@ class AuthAction extends Action
* @var string the redirect url after unsuccessful authorization (e.g. user canceled).
*/
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.
diff --git a/extensions/authclient/BaseClient.php b/extensions/authclient/BaseClient.php
index e11c10d..95b0d30 100644
--- a/extensions/authclient/BaseClient.php
+++ b/extensions/authclient/BaseClient.php
@@ -58,6 +58,7 @@ abstract class BaseClient extends Component implements ClientInterface
*/
private $_viewOptions;
+
/**
* @param string $id service id.
*/
diff --git a/extensions/authclient/BaseOAuth.php b/extensions/authclient/BaseOAuth.php
index add9158..b798c8b 100644
--- a/extensions/authclient/BaseOAuth.php
+++ b/extensions/authclient/BaseOAuth.php
@@ -39,12 +39,6 @@ abstract class BaseOAuth extends BaseClient implements ClientInterface
*/
public $version = '1.0';
/**
- * @var string URL, which user will be redirected after authentication at the OAuth provider web site.
- * Note: this should be absolute URL (with http:// or https:// leading).
- * By default current URL will be used.
- */
- private $_returnUrl;
- /**
* @var string API base URL.
*/
public $apiBaseUrl;
@@ -56,6 +50,13 @@ abstract class BaseOAuth extends BaseClient implements ClientInterface
* @var string auth request scope.
*/
public $scope;
+
+ /**
+ * @var string URL, which user will be redirected after authentication at the OAuth provider web site.
+ * Note: this should be absolute URL (with http:// or https:// leading).
+ * By default current URL will be used.
+ */
+ private $_returnUrl;
/**
* @var array cURL request options. Option values from this field will overwrite corresponding
* values from [[defaultCurlOptions()]].
@@ -70,6 +71,7 @@ abstract class BaseOAuth extends BaseClient implements ClientInterface
*/
private $_signatureMethod = [];
+
/**
* @param string $returnUrl return URL
*/
diff --git a/extensions/authclient/Collection.php b/extensions/authclient/Collection.php
index d777dca..532264f 100644
--- a/extensions/authclient/Collection.php
+++ b/extensions/authclient/Collection.php
@@ -47,6 +47,7 @@ class Collection extends Component
*/
private $_clients = [];
+
/**
* @param array $clients list of auth clients
*/
diff --git a/extensions/authclient/InvalidResponseException.php b/extensions/authclient/InvalidResponseException.php
index 3baf08e..ef5871a 100644
--- a/extensions/authclient/InvalidResponseException.php
+++ b/extensions/authclient/InvalidResponseException.php
@@ -26,6 +26,7 @@ class InvalidResponseException extends Exception
*/
public $responseBody = '';
+
/**
* Constructor.
* @param array $responseHeaders response headers
diff --git a/extensions/authclient/OAuth1.php b/extensions/authclient/OAuth1.php
index 356a71b..5fdb286 100644
--- a/extensions/authclient/OAuth1.php
+++ b/extensions/authclient/OAuth1.php
@@ -62,6 +62,7 @@ class OAuth1 extends BaseOAuth
*/
public $accessTokenMethod = 'GET';
+
/**
* Fetches the OAuth request token.
* @param array $params additional request params.
diff --git a/extensions/authclient/OAuth2.php b/extensions/authclient/OAuth2.php
index 40b5192..cb3f1b3 100644
--- a/extensions/authclient/OAuth2.php
+++ b/extensions/authclient/OAuth2.php
@@ -50,6 +50,7 @@ class OAuth2 extends BaseOAuth
*/
public $tokenUrl;
+
/**
* Composes user authorization URL.
* @param array $params additional auth GET params.
diff --git a/extensions/authclient/OAuthToken.php b/extensions/authclient/OAuthToken.php
index 2c35225..f40ad27 100644
--- a/extensions/authclient/OAuthToken.php
+++ b/extensions/authclient/OAuthToken.php
@@ -43,6 +43,8 @@ class OAuthToken extends Object
* @var array token parameters.
*/
private $_params = [];
+
+
/**
* @var integer object creation timestamp.
*/
diff --git a/extensions/authclient/OpenId.php b/extensions/authclient/OpenId.php
index 4544f7a..3c06564 100644
--- a/extensions/authclient/OpenId.php
+++ b/extensions/authclient/OpenId.php
@@ -68,7 +68,6 @@ class OpenId extends BaseClient implements ClientInterface
* ~~~
*/
public $optionalAttributes = [];
-
/**
* @var boolean whether to verify the peer's certificate.
*/
@@ -83,7 +82,6 @@ class OpenId extends BaseClient implements ClientInterface
* This value will take effect only if [[verifyPeer]] is set.
*/
public $cainfo;
-
/**
* @var string authentication return URL.
*/
@@ -96,6 +94,8 @@ class OpenId extends BaseClient implements ClientInterface
* @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.
diff --git a/extensions/authclient/clients/Facebook.php b/extensions/authclient/clients/Facebook.php
index 649af8b..e257092 100644
--- a/extensions/authclient/clients/Facebook.php
+++ b/extensions/authclient/clients/Facebook.php
@@ -57,6 +57,7 @@ class Facebook extends OAuth2
*/
public $scope = 'email';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/GitHub.php b/extensions/authclient/clients/GitHub.php
index 0350738..2fbc123 100644
--- a/extensions/authclient/clients/GitHub.php
+++ b/extensions/authclient/clients/GitHub.php
@@ -53,6 +53,7 @@ class GitHub extends OAuth2
*/
public $apiBaseUrl = 'https://api.github.com';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/GoogleOAuth.php b/extensions/authclient/clients/GoogleOAuth.php
index 2504cb7..0a30e63 100644
--- a/extensions/authclient/clients/GoogleOAuth.php
+++ b/extensions/authclient/clients/GoogleOAuth.php
@@ -55,6 +55,7 @@ class GoogleOAuth extends OAuth2
*/
public $apiBaseUrl = 'https://www.googleapis.com/plus/v1';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/GoogleOpenId.php b/extensions/authclient/clients/GoogleOpenId.php
index 9bcc61c..3b7d113 100644
--- a/extensions/authclient/clients/GoogleOpenId.php
+++ b/extensions/authclient/clients/GoogleOpenId.php
@@ -48,6 +48,7 @@ class GoogleOpenId extends OpenId
'pref/language',
];
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/LinkedIn.php b/extensions/authclient/clients/LinkedIn.php
index 9b3b7e2..cbbdc18 100644
--- a/extensions/authclient/clients/LinkedIn.php
+++ b/extensions/authclient/clients/LinkedIn.php
@@ -56,6 +56,7 @@ class LinkedIn extends OAuth2
*/
public $apiBaseUrl = 'https://api.linkedin.com/v1';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/Live.php b/extensions/authclient/clients/Live.php
index f622430..472f47c 100644
--- a/extensions/authclient/clients/Live.php
+++ b/extensions/authclient/clients/Live.php
@@ -53,6 +53,7 @@ class Live extends OAuth2
*/
public $apiBaseUrl = 'https://apis.live.net/v5.0';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/Twitter.php b/extensions/authclient/clients/Twitter.php
index c5e4d34..3cee9b4 100644
--- a/extensions/authclient/clients/Twitter.php
+++ b/extensions/authclient/clients/Twitter.php
@@ -65,6 +65,7 @@ class Twitter extends OAuth1
*/
public $apiBaseUrl = 'https://api.twitter.com/1.1';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/VKontakte.php b/extensions/authclient/clients/VKontakte.php
index 062623b..23edfb6 100644
--- a/extensions/authclient/clients/VKontakte.php
+++ b/extensions/authclient/clients/VKontakte.php
@@ -53,6 +53,7 @@ class VKontakte extends OAuth2
*/
public $apiBaseUrl = 'https://api.vk.com/method';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/YandexOAuth.php b/extensions/authclient/clients/YandexOAuth.php
index 7a2197c..f449f74 100644
--- a/extensions/authclient/clients/YandexOAuth.php
+++ b/extensions/authclient/clients/YandexOAuth.php
@@ -53,6 +53,7 @@ class YandexOAuth extends OAuth2
*/
public $apiBaseUrl = 'https://login.yandex.ru';
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/clients/YandexOpenId.php b/extensions/authclient/clients/YandexOpenId.php
index 0d1c62d..58ddcfa 100644
--- a/extensions/authclient/clients/YandexOpenId.php
+++ b/extensions/authclient/clients/YandexOpenId.php
@@ -46,6 +46,7 @@ class YandexOpenId extends OpenId
'contact/email',
];
+
/**
* @inheritdoc
*/
diff --git a/extensions/authclient/signature/RsaSha1.php b/extensions/authclient/signature/RsaSha1.php
index b17af0f..ae75af9 100644
--- a/extensions/authclient/signature/RsaSha1.php
+++ b/extensions/authclient/signature/RsaSha1.php
@@ -33,6 +33,8 @@ class RsaSha1 extends BaseMethod
* This value can be fetched from file specified by [[publicCertificateFile]].
*/
protected $_publicCertificate;
+
+
/**
* @var string path to the file, which holds private key certificate.
*/
diff --git a/extensions/authclient/widgets/AuthChoice.php b/extensions/authclient/widgets/AuthChoice.php
index 0f26f88..163a071 100644
--- a/extensions/authclient/widgets/AuthChoice.php
+++ b/extensions/authclient/widgets/AuthChoice.php
@@ -96,6 +96,7 @@ class AuthChoice extends Widget
*/
private $_clients;
+
/**
* @param ClientInterface[] $clients auth providers
*/
diff --git a/extensions/bootstrap/ActiveField.php b/extensions/bootstrap/ActiveField.php
index b892fdb..75890b2 100644
--- a/extensions/bootstrap/ActiveField.php
+++ b/extensions/bootstrap/ActiveField.php
@@ -95,17 +95,14 @@ class ActiveField extends \yii\widgets\ActiveField
* @var bool whether to render [[checkboxList()]] and [[radioList()]] inline.
*/
public $inline = false;
-
/**
* @var string|null optional template to render the `{input}` placeholder content
*/
public $inputTemplate;
-
/**
* @var array options for the wrapper tag, used in the `{beginWrapper}` placeholder
*/
public $wrapperOptions = [];
-
/**
* @var null|array CSS grid classes for horizontal layout. This must be an array with these keys:
* - 'offset' the offset grid class to append to the wrapper if no label is rendered
@@ -115,47 +112,40 @@ class ActiveField extends \yii\widgets\ActiveField
* - 'hint' the hint grid class
*/
public $horizontalCssClasses;
-
/**
* @var string the template for checkboxes in default layout
*/
public $checkboxTemplate = "<div class=\"checkbox\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n</div>";
-
/**
* @var string the template for radios in default layout
*/
public $radioTemplate = "<div class=\"radio\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n</div>";
-
/**
* @var string the template for checkboxes in horizontal layout
*/
public $horizontalCheckboxTemplate = "{beginWrapper}\n<div class=\"checkbox\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n</div>\n{error}\n{endWrapper}\n{hint}";
-
/**
* @var string the template for radio buttons in horizontal layout
*/
public $horizontalRadioTemplate = "{beginWrapper}\n<div class=\"radio\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n</div>\n{error}\n{endWrapper}\n{hint}";
-
/**
* @var string the template for inline checkboxLists
*/
public $inlineCheckboxListTemplate = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}";
-
/**
* @var string the template for inline radioLists
*/
public $inlineRadioListTemplate = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}";
-
/**
* @var bool whether to render the error. Default is `true` except for layout `inline`.
*/
public $enableError = true;
-
/**
* @var bool whether to render the label. Default is `true`.
*/
public $enableLabel = true;
+
/**
* @inheritdoc
*/
diff --git a/extensions/bootstrap/ActiveForm.php b/extensions/bootstrap/ActiveForm.php
index 0a3b821..b034a00 100644
--- a/extensions/bootstrap/ActiveForm.php
+++ b/extensions/bootstrap/ActiveForm.php
@@ -69,7 +69,6 @@ class ActiveForm extends \yii\widgets\ActiveForm
* @var array HTML attributes for the form tag. Default is `['role' => 'form']`.
*/
public $options = ['role' => 'form'];
-
/**
* @var string the form layout. Either 'default', 'horizontal' or 'inline'.
* By choosing a layout, an appropriate default field configuration is applied. This will
@@ -79,6 +78,7 @@ class ActiveForm extends \yii\widgets\ActiveForm
*/
public $layout = 'default';
+
/**
* @inheritdoc
*/
diff --git a/extensions/bootstrap/Alert.php b/extensions/bootstrap/Alert.php
index 60c34c8..91e8d9b 100644
--- a/extensions/bootstrap/Alert.php
+++ b/extensions/bootstrap/Alert.php
@@ -68,6 +68,7 @@ class Alert extends Widget
*/
public $closeButton = [];
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Button.php b/extensions/bootstrap/Button.php
index d13c9e9..0c21a3e 100644
--- a/extensions/bootstrap/Button.php
+++ b/extensions/bootstrap/Button.php
@@ -39,6 +39,7 @@ class Button extends Widget
*/
public $encodeLabel = true;
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/bootstrap/ButtonDropdown.php b/extensions/bootstrap/ButtonDropdown.php
index 2324312..5fc6f62 100644
--- a/extensions/bootstrap/ButtonDropdown.php
+++ b/extensions/bootstrap/ButtonDropdown.php
@@ -59,6 +59,7 @@ class ButtonDropdown extends Widget
*/
public $encodeLabel = true;
+
/**
* Renders the widget.
*/
diff --git a/extensions/bootstrap/ButtonGroup.php b/extensions/bootstrap/ButtonGroup.php
index bbf54b4..7066b96 100644
--- a/extensions/bootstrap/ButtonGroup.php
+++ b/extensions/bootstrap/ButtonGroup.php
@@ -52,6 +52,7 @@ class ButtonGroup extends Widget
*/
public $encodeLabels = true;
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/bootstrap/Carousel.php b/extensions/bootstrap/Carousel.php
index 25027f2..68c3def 100644
--- a/extensions/bootstrap/Carousel.php
+++ b/extensions/bootstrap/Carousel.php
@@ -66,6 +66,7 @@ class Carousel extends Widget
*/
public $items = [];
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Collapse.php b/extensions/bootstrap/Collapse.php
index c4f42ca..0a48448 100644
--- a/extensions/bootstrap/Collapse.php
+++ b/extensions/bootstrap/Collapse.php
@@ -59,6 +59,7 @@ class Collapse extends Widget
*/
public $items = [];
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Dropdown.php b/extensions/bootstrap/Dropdown.php
index fab353b..5fe406c 100644
--- a/extensions/bootstrap/Dropdown.php
+++ b/extensions/bootstrap/Dropdown.php
@@ -45,7 +45,8 @@ class Dropdown extends Widget
* @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
*/
protected $_containerOptions = [];
-
+
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/bootstrap/Modal.php b/extensions/bootstrap/Modal.php
index 6235278..62e8221 100644
--- a/extensions/bootstrap/Modal.php
+++ b/extensions/bootstrap/Modal.php
@@ -82,6 +82,7 @@ class Modal extends Widget
*/
public $toggleButton;
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Nav.php b/extensions/bootstrap/Nav.php
index 3a5791f..29641a9 100644
--- a/extensions/bootstrap/Nav.php
+++ b/extensions/bootstrap/Nav.php
@@ -93,6 +93,7 @@ class Nav extends Widget
*/
public $params;
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/NavBar.php b/extensions/bootstrap/NavBar.php
index af41725..4a9f587 100644
--- a/extensions/bootstrap/NavBar.php
+++ b/extensions/bootstrap/NavBar.php
@@ -85,6 +85,7 @@ class NavBar extends Widget
*/
public $innerContainerOptions = [];
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Progress.php b/extensions/bootstrap/Progress.php
index 1c466f6..dbeed97 100644
--- a/extensions/bootstrap/Progress.php
+++ b/extensions/bootstrap/Progress.php
@@ -89,6 +89,7 @@ class Progress extends Widget
*/
public $bars;
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/bootstrap/Tabs.php b/extensions/bootstrap/Tabs.php
index a618df5..87407b7 100644
--- a/extensions/bootstrap/Tabs.php
+++ b/extensions/bootstrap/Tabs.php
@@ -102,6 +102,7 @@ class Tabs extends Widget
*/
public $navType = 'nav-tabs';
+
/**
* Initializes the widget.
*/
diff --git a/extensions/bootstrap/Widget.php b/extensions/bootstrap/Widget.php
index 2984e7a..6e6bc85 100644
--- a/extensions/bootstrap/Widget.php
+++ b/extensions/bootstrap/Widget.php
@@ -39,6 +39,7 @@ class Widget extends \yii\base\Widget
*/
public $clientEvents = [];
+
/**
* Initializes the widget.
* This method will register the bootstrap asset bundle. If you override this method,
diff --git a/extensions/codeception/BasePage.php b/extensions/codeception/BasePage.php
index 8f4d129..f3a8ae1 100644
--- a/extensions/codeception/BasePage.php
+++ b/extensions/codeception/BasePage.php
@@ -27,11 +27,13 @@ abstract class BasePage extends Component
* the route and the rest of the name-value pairs are treated as GET parameters, e.g. `array('site/page', 'name' => 'about')`.
*/
public $route;
+
/**
* @var \Codeception\AbstractGuy the testing guy object
*/
protected $guy;
+
/**
* Constructor.
*
diff --git a/extensions/codeception/TestCase.php b/extensions/codeception/TestCase.php
index c1b6952..e889249 100644
--- a/extensions/codeception/TestCase.php
+++ b/extensions/codeception/TestCase.php
@@ -33,6 +33,7 @@ class TestCase extends Test
*/
public $appConfig = '@tests/unit/_config.php';
+
/**
* Returns the value of an object property.
*
diff --git a/extensions/composer/Installer.php b/extensions/composer/Installer.php
index 44c91ff..b4b6ad8 100644
--- a/extensions/composer/Installer.php
+++ b/extensions/composer/Installer.php
@@ -23,9 +23,9 @@ class Installer extends LibraryInstaller
const EXTRA_WRITABLE = 'writable';
const EXTRA_EXECUTABLE = 'executable';
const EXTRA_CONFIG = 'config';
-
const EXTENSION_FILE = 'yiisoft/extensions.php';
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/LogTarget.php b/extensions/debug/LogTarget.php
index 3a402f5..043df3a 100644
--- a/extensions/debug/LogTarget.php
+++ b/extensions/debug/LogTarget.php
@@ -25,6 +25,7 @@ class LogTarget extends Target
public $module;
public $tag;
+
/**
* @param \yii\debug\Module $module
* @param array $config
diff --git a/extensions/debug/Panel.php b/extensions/debug/Panel.php
index 3e1bbe3..80cf845 100644
--- a/extensions/debug/Panel.php
+++ b/extensions/debug/Panel.php
@@ -49,6 +49,7 @@ class Panel extends Component
*/
public $actions = [];
+
/**
* @return string name of the panel
*/
diff --git a/extensions/debug/components/search/Filter.php b/extensions/debug/components/search/Filter.php
index 0048ed5..c30779e 100644
--- a/extensions/debug/components/search/Filter.php
+++ b/extensions/debug/components/search/Filter.php
@@ -23,6 +23,7 @@ class Filter extends Component
*/
protected $rules = [];
+
/**
* Adds data filtering rule.
*
diff --git a/extensions/debug/components/search/matchers/Base.php b/extensions/debug/components/search/matchers/Base.php
index e98a724..4fa4b9b 100644
--- a/extensions/debug/components/search/matchers/Base.php
+++ b/extensions/debug/components/search/matchers/Base.php
@@ -22,6 +22,7 @@ abstract class Base extends Component implements MatcherInterface
*/
protected $baseValue;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/components/search/matchers/SameAs.php b/extensions/debug/components/search/matchers/SameAs.php
index bb3088d..65bdadc 100644
--- a/extensions/debug/components/search/matchers/SameAs.php
+++ b/extensions/debug/components/search/matchers/SameAs.php
@@ -20,6 +20,7 @@ class SameAs extends Base
*/
public $partial = false;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/controllers/DefaultController.php b/extensions/debug/controllers/DefaultController.php
index 0c36aa4..dbb42d3 100644
--- a/extensions/debug/controllers/DefaultController.php
+++ b/extensions/debug/controllers/DefaultController.php
@@ -33,6 +33,7 @@ class DefaultController extends Controller
*/
public $summary;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/models/search/Db.php b/extensions/debug/models/search/Db.php
index da1d6fb..771fb9f 100644
--- a/extensions/debug/models/search/Db.php
+++ b/extensions/debug/models/search/Db.php
@@ -23,12 +23,12 @@ class Db extends Base
* @var string type of the input search value
*/
public $type;
-
/**
* @var integer query attribute input search value
*/
public $query;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/models/search/Debug.php b/extensions/debug/models/search/Debug.php
index 48863ea..1f496c8 100644
--- a/extensions/debug/models/search/Debug.php
+++ b/extensions/debug/models/search/Debug.php
@@ -23,47 +23,40 @@ class Debug extends Base
* @var string tag attribute input search value
*/
public $tag;
-
/**
* @var string ip attribute input search value
*/
public $ip;
-
/**
* @var string method attribute input search value
*/
public $method;
-
/**
* @var integer ajax attribute input search value
*/
public $ajax;
-
/**
* @var string url attribute input search value
*/
public $url;
-
/**
* @var string status code attribute input search value
*/
public $statusCode;
-
/**
* @var integer sql count attribute input search value
*/
public $sqlCount;
-
/**
* @var integer total mail count attribute input search value
*/
public $mailCount;
-
/**
* @var array critical codes, used to determine grid row options.
*/
public $criticalCodes = [400, 404, 500];
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/models/search/Log.php b/extensions/debug/models/search/Log.php
index 9d8814d..fe9dcf4 100644
--- a/extensions/debug/models/search/Log.php
+++ b/extensions/debug/models/search/Log.php
@@ -23,17 +23,16 @@ class Log extends Base
* @var string ip attribute input search value
*/
public $level;
-
/**
* @var string method attribute input search value
*/
public $category;
-
/**
* @var integer message attribute input search value
*/
public $message;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/models/search/Mail.php b/extensions/debug/models/search/Mail.php
index c1fac4c..50d2c2c 100644
--- a/extensions/debug/models/search/Mail.php
+++ b/extensions/debug/models/search/Mail.php
@@ -22,52 +22,44 @@ class Mail extends Base
* @var string from attribute input search value
*/
public $from;
-
/**
* @var string to attribute input search value
*/
public $to;
-
/**
* @var string reply attribute input search value
*/
public $reply;
-
/**
* @var string cc attribute input search value
*/
public $cc;
-
/**
* @var string bcc attribute input search value
*/
public $bcc;
-
/**
* @var string subject attribute input search value
*/
public $subject;
-
/**
* @var string body attribute input search value
*/
public $body;
-
/**
* @var string charset attribute input search value
*/
public $charset;
-
/**
* @var string headers attribute input search value
*/
public $headers;
-
/**
* @var string file attribute input search value
*/
public $file;
+
public function rules()
{
return [
diff --git a/extensions/debug/models/search/Profile.php b/extensions/debug/models/search/Profile.php
index d62df7b..85f713c 100644
--- a/extensions/debug/models/search/Profile.php
+++ b/extensions/debug/models/search/Profile.php
@@ -23,12 +23,12 @@ class Profile extends Base
* @var string method attribute input search value
*/
public $category;
-
/**
* @var integer info attribute input search value
*/
public $info;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/panels/DbPanel.php b/extensions/debug/panels/DbPanel.php
index 763e3f9..37bde4e 100644
--- a/extensions/debug/panels/DbPanel.php
+++ b/extensions/debug/panels/DbPanel.php
@@ -28,16 +28,17 @@ class DbPanel extends Panel
* the execution is considered taking critical number of DB queries.
*/
public $criticalQueryThreshold;
+
/**
* @var array db queries info extracted to array as models, to use with data provider.
*/
private $_models;
-
/**
* @var array current database request timings
*/
private $_timings;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/panels/LogPanel.php b/extensions/debug/panels/LogPanel.php
index 35b07ce..f7e5bb1 100644
--- a/extensions/debug/panels/LogPanel.php
+++ b/extensions/debug/panels/LogPanel.php
@@ -25,6 +25,7 @@ class LogPanel extends Panel
*/
private $_models;
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/panels/MailPanel.php b/extensions/debug/panels/MailPanel.php
index e16612d..1b6090b 100644
--- a/extensions/debug/panels/MailPanel.php
+++ b/extensions/debug/panels/MailPanel.php
@@ -29,11 +29,13 @@ class MailPanel extends Panel
* @var string path where all emails will be saved. should be an alias.
*/
public $mailPath = '@runtime/debug/mail';
+
/**
* @var array current request sent messages
*/
private $_messages = [];
+
/**
* @inheritdoc
*/
diff --git a/extensions/debug/panels/ProfilingPanel.php b/extensions/debug/panels/ProfilingPanel.php
index 9f08fdc..16f1c9a 100644
--- a/extensions/debug/panels/ProfilingPanel.php
+++ b/extensions/debug/panels/ProfilingPanel.php
@@ -25,6 +25,7 @@ class ProfilingPanel extends Panel
*/
private $_models;
+
/**
* @inheritdoc
*/
diff --git a/extensions/elasticsearch/ActiveRecord.php b/extensions/elasticsearch/ActiveRecord.php
index f11d986..4f2497f 100644
--- a/extensions/elasticsearch/ActiveRecord.php
+++ b/extensions/elasticsearch/ActiveRecord.php
@@ -56,6 +56,7 @@ class ActiveRecord extends BaseActiveRecord
private $_version;
private $_highlight;
+
/**
* Returns the database connection used by this AR class.
* By default, the "elasticsearch" application component is used as the database connection.
diff --git a/extensions/elasticsearch/Command.php b/extensions/elasticsearch/Command.php
index 6654efd..413c31c 100644
--- a/extensions/elasticsearch/Command.php
+++ b/extensions/elasticsearch/Command.php
@@ -43,9 +43,9 @@ class Command extends Component
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-highlighting.html
*/
public $highlight;
-
public $options = [];
+
/**
* @param array $options
* @return mixed
diff --git a/extensions/elasticsearch/Connection.php b/extensions/elasticsearch/Connection.php
index 4801ed6..2e96486 100644
--- a/extensions/elasticsearch/Connection.php
+++ b/extensions/elasticsearch/Connection.php
@@ -46,7 +46,6 @@ class Connection extends Component
* @var array the active node. key of [[nodes]]. Will be randomly selected on [[open()]].
*/
public $activeNode;
-
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/_configuration.html#_example_configuring_http_basic_auth
public $auth = [];
/**
@@ -62,6 +61,7 @@ class Connection extends Component
*/
public $dataTimeout = null;
+
public function init()
{
foreach ($this->nodes as $node) {
diff --git a/extensions/elasticsearch/DebugAction.php b/extensions/elasticsearch/DebugAction.php
index 233f73f..57af795 100644
--- a/extensions/elasticsearch/DebugAction.php
+++ b/extensions/elasticsearch/DebugAction.php
@@ -36,6 +36,7 @@ class DebugAction extends Action
*/
public $controller;
+
public function run($logId, $tag)
{
$this->controller->loadData($tag);
diff --git a/extensions/elasticsearch/DebugPanel.php b/extensions/elasticsearch/DebugPanel.php
index 2813753..039a049 100644
--- a/extensions/elasticsearch/DebugPanel.php
+++ b/extensions/elasticsearch/DebugPanel.php
@@ -24,6 +24,7 @@ class DebugPanel extends Panel
{
public $db = 'elasticsearch';
+
public function init()
{
$this->actions['elasticsearch-query'] = [
diff --git a/extensions/elasticsearch/Query.php b/extensions/elasticsearch/Query.php
index de95ba3..ab0eeb1 100644
--- a/extensions/elasticsearch/Query.php
+++ b/extensions/elasticsearch/Query.php
@@ -137,7 +137,6 @@ class Query extends Component implements QueryInterface
* on one or more fields.
*/
public $highlight;
-
public $facets = [];
diff --git a/extensions/elasticsearch/QueryBuilder.php b/extensions/elasticsearch/QueryBuilder.php
index e992dde..ed5bf3c 100644
--- a/extensions/elasticsearch/QueryBuilder.php
+++ b/extensions/elasticsearch/QueryBuilder.php
@@ -24,6 +24,7 @@ class QueryBuilder extends \yii\base\Object
*/
public $db;
+
/**
* Constructor.
* @param Connection $connection the database connection.
diff --git a/extensions/faker/FixtureController.php b/extensions/faker/FixtureController.php
index 7cc38b7..a0bc164 100644
--- a/extensions/faker/FixtureController.php
+++ b/extensions/faker/FixtureController.php
@@ -164,6 +164,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
* More info in [Faker](https://github.com/fzaninotto/Faker.) library docs.
*/
public $providers = [];
+
/**
* @var \Faker\Generator Faker generator instance
*/
diff --git a/extensions/gii/CodeFile.php b/extensions/gii/CodeFile.php
index f64872a..aa7ebb7 100644
--- a/extensions/gii/CodeFile.php
+++ b/extensions/gii/CodeFile.php
@@ -54,6 +54,7 @@ class CodeFile extends Object
*/
public $operation;
+
/**
* Constructor.
* @param string $path the file path that the new code should be saved to.
diff --git a/extensions/gii/Generator.php b/extensions/gii/Generator.php
index 8f2d972..4620524 100644
--- a/extensions/gii/Generator.php
+++ b/extensions/gii/Generator.php
@@ -58,6 +58,7 @@ abstract class Generator extends Model
*/
public $messageCategory = 'app';
+
/**
* @return string name of the code generator
*/
diff --git a/extensions/gii/components/ActiveField.php b/extensions/gii/components/ActiveField.php
index c444b7b..d8d899d 100644
--- a/extensions/gii/components/ActiveField.php
+++ b/extensions/gii/components/ActiveField.php
@@ -21,6 +21,7 @@ class ActiveField extends \yii\widgets\ActiveField
*/
public $model;
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/controllers/DefaultController.php b/extensions/gii/controllers/DefaultController.php
index 438fc3b..752bfab 100644
--- a/extensions/gii/controllers/DefaultController.php
+++ b/extensions/gii/controllers/DefaultController.php
@@ -27,6 +27,7 @@ class DefaultController extends Controller
*/
public $generator;
+
public function actionIndex()
{
$this->layout = 'main';
diff --git a/extensions/gii/generators/controller/Generator.php b/extensions/gii/generators/controller/Generator.php
index 40cbaa4..ffd5914 100644
--- a/extensions/gii/generators/controller/Generator.php
+++ b/extensions/gii/generators/controller/Generator.php
@@ -46,6 +46,7 @@ class Generator extends \yii\gii\Generator
*/
public $actions = 'index';
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/generators/crud/Generator.php b/extensions/gii/generators/crud/Generator.php
index 3be482f..bb056ba 100644
--- a/extensions/gii/generators/crud/Generator.php
+++ b/extensions/gii/generators/crud/Generator.php
@@ -38,6 +38,7 @@ class Generator extends \yii\gii\Generator
public $indexWidgetType = 'grid';
public $searchModelClass = '';
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/generators/extension/Generator.php b/extensions/gii/generators/extension/Generator.php
index 33ce047..7c719a6 100644
--- a/extensions/gii/generators/extension/Generator.php
+++ b/extensions/gii/generators/extension/Generator.php
@@ -34,6 +34,7 @@ class Generator extends \yii\gii\Generator
public $authorName;
public $authorEmail;
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/generators/extension/default/AutoloadExample.php b/extensions/gii/generators/extension/default/AutoloadExample.php
index 24c789b..694f0ab 100644
--- a/extensions/gii/generators/extension/default/AutoloadExample.php
+++ b/extensions/gii/generators/extension/default/AutoloadExample.php
@@ -1,12 +1,10 @@
-<?php
-/**
- * This is just an example.
- */
-echo "<?php\n";
-?>
+<?= "<?php\n" ?>
namespace <?= substr($generator->namespace, 0, -1) ?>;
+/**
+ * This is just an example.
+ */
class AutoloadExample extends \yii\base\Widget
{
public function run()
diff --git a/extensions/gii/generators/form/Generator.php b/extensions/gii/generators/form/Generator.php
index 7dc36c0..f1304f9 100644
--- a/extensions/gii/generators/form/Generator.php
+++ b/extensions/gii/generators/form/Generator.php
@@ -26,6 +26,7 @@ class Generator extends \yii\gii\Generator
public $viewName;
public $scenarioName;
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/generators/model/Generator.php b/extensions/gii/generators/model/Generator.php
index d6ac4d4..9a8e414 100644
--- a/extensions/gii/generators/model/Generator.php
+++ b/extensions/gii/generators/model/Generator.php
@@ -32,6 +32,7 @@ class Generator extends \yii\gii\Generator
public $generateLabelsFromComments = false;
public $useTablePrefix = false;
+
/**
* @inheritdoc
*/
diff --git a/extensions/gii/generators/module/Generator.php b/extensions/gii/generators/module/Generator.php
index 04cefbf..6b139ff 100644
--- a/extensions/gii/generators/module/Generator.php
+++ b/extensions/gii/generators/module/Generator.php
@@ -26,6 +26,7 @@ class Generator extends \yii\gii\Generator
public $moduleClass;
public $moduleID;
+
/**
* @inheritdoc
*/
diff --git a/extensions/imagine/BaseImage.php b/extensions/imagine/BaseImage.php
index 1cd51c0..ac166e6 100644
--- a/extensions/imagine/BaseImage.php
+++ b/extensions/imagine/BaseImage.php
@@ -41,6 +41,7 @@ class BaseImage
* gmagick driver definition.
*/
const DRIVER_GMAGICK = 'gmagick';
+
/**
* @var array|string the driver to use. This can be either a single driver name or an array of driver names.
* If the latter, the first available driver will be used.
@@ -52,6 +53,7 @@ class BaseImage
*/
private static $_imagine;
+
/**
* Returns the `Imagine` object that supports various image manipulations.
* @return ImagineInterface the `Imagine` object
diff --git a/extensions/jui/Accordion.php b/extensions/jui/Accordion.php
index 7847e78..b7c7c1e 100644
--- a/extensions/jui/Accordion.php
+++ b/extensions/jui/Accordion.php
@@ -85,6 +85,7 @@ class Accordion extends Widget
*/
public $headerOptions = [];
+
/**
* Renders the widget.
*/
diff --git a/extensions/jui/DatePicker.php b/extensions/jui/DatePicker.php
index 6eb865f..dafd3fa 100644
--- a/extensions/jui/DatePicker.php
+++ b/extensions/jui/DatePicker.php
@@ -60,6 +60,7 @@ class DatePicker extends InputWidget
*/
public $containerOptions = [];
+
/**
* @inheritdoc
*/
diff --git a/extensions/jui/InputWidget.php b/extensions/jui/InputWidget.php
index b668ca4..9631518 100644
--- a/extensions/jui/InputWidget.php
+++ b/extensions/jui/InputWidget.php
@@ -36,6 +36,7 @@ class InputWidget extends Widget
*/
public $value;
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/jui/Menu.php b/extensions/jui/Menu.php
index 5a6c829..140906f 100644
--- a/extensions/jui/Menu.php
+++ b/extensions/jui/Menu.php
@@ -33,6 +33,7 @@ class Menu extends \yii\widgets\Menu
*/
public $clientEvents = [];
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/jui/Selectable.php b/extensions/jui/Selectable.php
index a8302b5..1cf9aec 100644
--- a/extensions/jui/Selectable.php
+++ b/extensions/jui/Selectable.php
@@ -79,6 +79,7 @@ class Selectable extends Widget
*/
public $itemOptions = [];
+
/**
* Renders the widget.
*/
diff --git a/extensions/jui/Slider.php b/extensions/jui/Slider.php
index 64c79e5..740a85f 100644
--- a/extensions/jui/Slider.php
+++ b/extensions/jui/Slider.php
@@ -37,6 +37,7 @@ class Slider extends Widget
'stop' => 'slidestop',
];
+
/**
* Executes the widget.
*/
diff --git a/extensions/jui/SliderInput.php b/extensions/jui/SliderInput.php
index 967a91e..760dfb3 100644
--- a/extensions/jui/SliderInput.php
+++ b/extensions/jui/SliderInput.php
@@ -44,6 +44,12 @@ use yii\helpers\Html;
class SliderInput extends InputWidget
{
/**
+ * @var array the HTML attributes for the container tag.
+ * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
+ */
+ public $containerOptions = [];
+
+ /**
* @inheritDoc
*/
protected $clientEventMap = [
@@ -53,11 +59,7 @@ class SliderInput extends InputWidget
'start' => 'slidestart',
'stop' => 'slidestop',
];
- /**
- * @var array the HTML attributes for the container tag.
- * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
- */
- public $containerOptions = [];
+
/**
* @inheritdoc
diff --git a/extensions/jui/Sortable.php b/extensions/jui/Sortable.php
index b974d5a..97a7691 100644
--- a/extensions/jui/Sortable.php
+++ b/extensions/jui/Sortable.php
@@ -88,6 +88,7 @@ class Sortable extends Widget
'update' => 'sortupdate',
];
+
/**
* Renders the widget.
*/
diff --git a/extensions/jui/Spinner.php b/extensions/jui/Spinner.php
index 2daa866..eb6ad04 100644
--- a/extensions/jui/Spinner.php
+++ b/extensions/jui/Spinner.php
@@ -44,6 +44,7 @@ class Spinner extends InputWidget
'spin' => 'spin',
];
+
/**
* Renders the widget.
*/
diff --git a/extensions/jui/Tabs.php b/extensions/jui/Tabs.php
index 52d70dc..017d028 100644
--- a/extensions/jui/Tabs.php
+++ b/extensions/jui/Tabs.php
@@ -98,6 +98,7 @@ class Tabs extends Widget
*/
public $encodeLabels = true;
+
/**
* Renders the widget.
*/
diff --git a/extensions/jui/Widget.php b/extensions/jui/Widget.php
index 975aab4..a99bd8c 100644
--- a/extensions/jui/Widget.php
+++ b/extensions/jui/Widget.php
@@ -58,6 +58,7 @@ class Widget extends \yii\base\Widget
*/
protected $clientEventMap = [];
+
/**
* Initializes the widget.
* If you override this method, make sure you call the parent implementation first.
diff --git a/extensions/mongodb/ActiveFixture.php b/extensions/mongodb/ActiveFixture.php
index 7934023..7c83096 100644
--- a/extensions/mongodb/ActiveFixture.php
+++ b/extensions/mongodb/ActiveFixture.php
@@ -39,6 +39,7 @@ class ActiveFixture extends BaseActiveFixture
*/
public $collectionName;
+
/**
* @inheritdoc
*/
diff --git a/extensions/mongodb/Cache.php b/extensions/mongodb/Cache.php
index a1e3c4c..62593d2 100644
--- a/extensions/mongodb/Cache.php
+++ b/extensions/mongodb/Cache.php
@@ -54,6 +54,7 @@ class Cache extends \yii\caching\Cache
*/
public $gcProbability = 100;
+
/**
* Initializes the Cache component.
* This method will initialize the [[db]] property to make sure it refers to a valid MongoDB connection.
diff --git a/extensions/mongodb/Collection.php b/extensions/mongodb/Collection.php
index d79311c..9f236cc 100644
--- a/extensions/mongodb/Collection.php
+++ b/extensions/mongodb/Collection.php
@@ -72,6 +72,7 @@ class Collection extends Object
*/
public $mongoCollection;
+
/**
* @return string name of this collection.
*/
diff --git a/extensions/mongodb/Connection.php b/extensions/mongodb/Connection.php
index 50ff815..d97ce67 100644
--- a/extensions/mongodb/Connection.php
+++ b/extensions/mongodb/Connection.php
@@ -112,11 +112,13 @@ class Connection extends Component
* @var \MongoClient Mongo client instance.
*/
public $mongoClient;
+
/**
* @var Database[] list of Mongo databases
*/
private $_databases = [];
+
/**
* Returns the Mongo collection with the given name.
* @param string|null $name collection name, if null default one will be used.
diff --git a/extensions/mongodb/Database.php b/extensions/mongodb/Database.php
index 3027349..33ed6f7 100644
--- a/extensions/mongodb/Database.php
+++ b/extensions/mongodb/Database.php
@@ -26,6 +26,7 @@ class Database extends Object
* @var \MongoDB Mongo database instance.
*/
public $mongoDb;
+
/**
* @var Collection[] list of collections.
*/
@@ -35,6 +36,7 @@ class Database extends Object
*/
private $_fileCollections = [];
+
/**
* @return string name of this database.
*/
diff --git a/extensions/mongodb/Migration.php b/extensions/mongodb/Migration.php
index e92e2be..265f2fa 100644
--- a/extensions/mongodb/Migration.php
+++ b/extensions/mongodb/Migration.php
@@ -39,6 +39,7 @@ abstract class Migration extends Component implements MigrationInterface
*/
public $db = 'mongodb';
+
/**
* Initializes the migration.
* This method will set [[db]] to be the 'db' application component, if it is null.
diff --git a/extensions/mongodb/Query.php b/extensions/mongodb/Query.php
index 8a5681b..32cb2f9 100644
--- a/extensions/mongodb/Query.php
+++ b/extensions/mongodb/Query.php
@@ -54,6 +54,7 @@ class Query extends Component implements QueryInterface
*/
public $from;
+
/**
* Returns the Mongo collection for this query.
* @param Connection $db Mongo connection.
diff --git a/extensions/mongodb/console/controllers/MigrateController.php b/extensions/mongodb/console/controllers/MigrateController.php
index b6b5b9a..e6b05a1 100644
--- a/extensions/mongodb/console/controllers/MigrateController.php
+++ b/extensions/mongodb/console/controllers/MigrateController.php
@@ -69,6 +69,7 @@ class MigrateController extends BaseMigrateController
*/
public $db = 'mongodb';
+
/**
* @inheritdoc
*/
diff --git a/extensions/mongodb/file/Collection.php b/extensions/mongodb/file/Collection.php
index d0d609f..bb37a02 100644
--- a/extensions/mongodb/file/Collection.php
+++ b/extensions/mongodb/file/Collection.php
@@ -28,11 +28,13 @@ class Collection extends \yii\mongodb\Collection
* @var \MongoGridFS Mongo GridFS collection instance.
*/
public $mongoCollection;
+
/**
* @var \yii\mongodb\Collection file chunks Mongo collection.
*/
private $_chunkCollection;
+
/**
* Returns the Mongo collection for the file chunks.
* @param boolean $refresh whether to reload the collection instance even if it is found in the cache.
diff --git a/extensions/mongodb/gii/model/Generator.php b/extensions/mongodb/gii/model/Generator.php
index 0c67175..88848d5 100644
--- a/extensions/mongodb/gii/model/Generator.php
+++ b/extensions/mongodb/gii/model/Generator.php
@@ -29,6 +29,7 @@ class Generator extends \yii\gii\Generator
public $modelClass;
public $baseClass = 'yii\mongodb\ActiveRecord';
+
/**
* @inheritdoc
*/
diff --git a/extensions/mongodb/log/MongoDbTarget.php b/extensions/mongodb/log/MongoDbTarget.php
index 2998e43..e227820 100644
--- a/extensions/mongodb/log/MongoDbTarget.php
+++ b/extensions/mongodb/log/MongoDbTarget.php
@@ -37,6 +37,7 @@ class MongoDbTarget extends Target
*/
public $logCollection = 'log';
+
/**
* Initializes the MongoDbTarget component.
* This method will initialize the [[db]] property to make sure it refers to a valid MongoDB connection.
diff --git a/extensions/redis/ActiveQuery.php b/extensions/redis/ActiveQuery.php
index 5c0b921..65da8b3 100644
--- a/extensions/redis/ActiveQuery.php
+++ b/extensions/redis/ActiveQuery.php
@@ -82,6 +82,7 @@ class ActiveQuery extends Component implements ActiveQueryInterface
*/
const EVENT_INIT = 'init';
+
/**
* Constructor.
* @param array $modelClass the model class associated with this query
diff --git a/extensions/redis/Cache.php b/extensions/redis/Cache.php
index 5b880b3..995a0d7 100644
--- a/extensions/redis/Cache.php
+++ b/extensions/redis/Cache.php
@@ -67,6 +67,7 @@ class Cache extends \yii\caching\Cache
*/
public $redis = 'redis';
+
/**
* Initializes the redis Cache component.
* This method will initialize the [[redis]] property to make sure it refers to a valid redis connection.
diff --git a/extensions/redis/Connection.php b/extensions/redis/Connection.php
index 0d00b7b..6b5b700 100644
--- a/extensions/redis/Connection.php
+++ b/extensions/redis/Connection.php
@@ -209,6 +209,7 @@ class Connection extends Component
'ZSCORE', // key member Get the score associated with the given member in a sorted set
'ZUNIONSTORE', // destination numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX] Add multiple sorted sets and store the resulting sorted set in a new key
];
+
/**
* @var resource redis socket connection
*/
diff --git a/extensions/smarty/ViewRenderer.php b/extensions/smarty/ViewRenderer.php
index eb9a7f0..7b70963 100644
--- a/extensions/smarty/ViewRenderer.php
+++ b/extensions/smarty/ViewRenderer.php
@@ -25,17 +25,16 @@ class ViewRenderer extends BaseViewRenderer
* @var string the directory or path alias pointing to where Smarty cache will be stored.
*/
public $cachePath = '@runtime/Smarty/cache';
-
/**
* @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
*/
public $compilePath = '@runtime/Smarty/compile';
-
/**
* @var Smarty
*/
public $smarty;
+
public function init()
{
$this->smarty = new Smarty();
diff --git a/extensions/sphinx/ActiveRecord.php b/extensions/sphinx/ActiveRecord.php
index 7020f99..ce8a9de 100644
--- a/extensions/sphinx/ActiveRecord.php
+++ b/extensions/sphinx/ActiveRecord.php
@@ -54,6 +54,7 @@ abstract class ActiveRecord extends BaseActiveRecord
*/
private $_snippet;
+
/**
* Returns the Sphinx connection used by this AR class.
* By default, the "sphinx" application component is used as the Sphinx connection.
diff --git a/extensions/sphinx/ColumnSchema.php b/extensions/sphinx/ColumnSchema.php
index 240d41f..3c7632c 100644
--- a/extensions/sphinx/ColumnSchema.php
+++ b/extensions/sphinx/ColumnSchema.php
@@ -54,6 +54,7 @@ class ColumnSchema extends Object
*/
public $isMva;
+
/**
* Converts the input value according to [[phpType]] after retrieval from the database.
* If the value is null or an [[Expression]], it will not be converted.
diff --git a/extensions/sphinx/Command.php b/extensions/sphinx/Command.php
index 7318bba..44fa322 100644
--- a/extensions/sphinx/Command.php
+++ b/extensions/sphinx/Command.php
@@ -49,6 +49,7 @@ class Command extends \yii\db\Command
*/
public $db;
+
/**
* Creates a batch INSERT command.
* For example,
diff --git a/extensions/sphinx/Connection.php b/extensions/sphinx/Connection.php
index 9ba141b..32ba492 100644
--- a/extensions/sphinx/Connection.php
+++ b/extensions/sphinx/Connection.php
@@ -67,6 +67,7 @@ class Connection extends \yii\db\Connection
'mysql' => 'yii\sphinx\Schema', // MySQL
];
+
/**
* Obtains the schema information for the named index.
* @param string $name index name.
diff --git a/extensions/sphinx/IndexSchema.php b/extensions/sphinx/IndexSchema.php
index 3ce18a6..21ede67 100644
--- a/extensions/sphinx/IndexSchema.php
+++ b/extensions/sphinx/IndexSchema.php
@@ -40,6 +40,7 @@ class IndexSchema extends Object
*/
public $columns = [];
+
/**
* Gets the named column metadata.
* This is a convenient method for retrieving a named column even if it does not exist.
diff --git a/extensions/sphinx/Query.php b/extensions/sphinx/Query.php
index 8a63fa3..397bb02 100644
--- a/extensions/sphinx/Query.php
+++ b/extensions/sphinx/Query.php
@@ -125,11 +125,13 @@ class Query extends Component implements QueryInterface
* @var array query options for the call snippet.
*/
public $snippetOptions;
+
/**
* @var Connection the Sphinx connection used to generate the SQL statements.
*/
private $_connection;
+
/**
* @param Connection $connection Sphinx connection instance
* @return static the query object itself
diff --git a/extensions/sphinx/QueryBuilder.php b/extensions/sphinx/QueryBuilder.php
index 48c7d55..f1b434a 100644
--- a/extensions/sphinx/QueryBuilder.php
+++ b/extensions/sphinx/QueryBuilder.php
@@ -38,6 +38,7 @@ class QueryBuilder extends Object
*/
public $separator = " ";
+
/**
* Constructor.
* @param Connection $connection the Sphinx connection.
diff --git a/extensions/sphinx/Schema.php b/extensions/sphinx/Schema.php
index d0cf965..83fbb96 100644
--- a/extensions/sphinx/Schema.php
+++ b/extensions/sphinx/Schema.php
@@ -60,6 +60,7 @@ class Schema extends Object
*/
private $_builder;
+
/**
* @var array mapping from physical column types (keys) to abstract column types (values)
*/
diff --git a/extensions/sphinx/gii/model/Generator.php b/extensions/sphinx/gii/model/Generator.php
index d33a017..019b411 100644
--- a/extensions/sphinx/gii/model/Generator.php
+++ b/extensions/sphinx/gii/model/Generator.php
@@ -29,6 +29,7 @@ class Generator extends \yii\gii\Generator
public $baseClass = 'yii\sphinx\ActiveRecord';
public $useIndexPrefix = false;
+
/**
* @inheritdoc
*/
diff --git a/extensions/swiftmailer/Mailer.php b/extensions/swiftmailer/Mailer.php
index 3368971..179365c 100644
--- a/extensions/swiftmailer/Mailer.php
+++ b/extensions/swiftmailer/Mailer.php
@@ -79,6 +79,7 @@ class Mailer extends BaseMailer
* @var string message default class name.
*/
public $messageClass = 'yii\swiftmailer\Message';
+
/**
* @var \Swift_Mailer Swift mailer instance.
*/
@@ -88,6 +89,7 @@ class Mailer extends BaseMailer
*/
private $_transport = [];
+
/**
* @return array|\Swift_Mailer Swift mailer instance or array configuration.
*/
diff --git a/extensions/swiftmailer/Message.php b/extensions/swiftmailer/Message.php
index 0c2a208..5ca0cca 100644
--- a/extensions/swiftmailer/Message.php
+++ b/extensions/swiftmailer/Message.php
@@ -29,6 +29,7 @@ class Message extends BaseMessage
*/
private $_swiftMessage;
+
/**
* @return \Swift_Message Swift message instance.
*/
diff --git a/extensions/twig/Extension.php b/extensions/twig/Extension.php
index dbeb425..840ede5 100644
--- a/extensions/twig/Extension.php
+++ b/extensions/twig/Extension.php
@@ -24,17 +24,16 @@ class Extension extends \Twig_Extension
* @var array used namespaces
*/
protected $namespaces = [];
-
/**
* @var array used class aliases
*/
protected $aliases = [];
-
/**
* @var array used widgets
*/
protected $widgets = [];
+
/**
* Creates new instance
*
diff --git a/extensions/twig/FileLoader.php b/extensions/twig/FileLoader.php
index ed6ac82..17e3d22 100644
--- a/extensions/twig/FileLoader.php
+++ b/extensions/twig/FileLoader.php
@@ -19,6 +19,7 @@ class FileLoader implements \Twig_LoaderInterface
*/
private $_dir;
+
/**
* @param string $dir path to directory
*/
diff --git a/extensions/twig/ViewRenderer.php b/extensions/twig/ViewRenderer.php
index c897292..6a78e15 100644
--- a/extensions/twig/ViewRenderer.php
+++ b/extensions/twig/ViewRenderer.php
@@ -26,13 +26,11 @@ class ViewRenderer extends BaseViewRenderer
* templates cache.
*/
public $cachePath = '@runtime/Twig/cache';
-
/**
* @var array Twig options.
* @see http://twig.sensiolabs.org/doc/api.html#environment-options
*/
public $options = [];
-
/**
* @var array Objects or static classes.
* Keys of the array are names to call in template, values are objects or names of static classes.
@@ -40,7 +38,6 @@ class ViewRenderer extends BaseViewRenderer
* In the template you can use it like this: `{{ html.a('Login', 'site/login') | raw }}`.
*/
public $globals = [];
-
/**
* @var array Custom functions.
* Keys of the array are names to call in template, values are names of functions or static methods of some class.
@@ -48,7 +45,6 @@ class ViewRenderer extends BaseViewRenderer
* In the template you can use it like this: `{{ rot13('test') }}` or `{{ a('Login', 'site/login') | raw }}`.
*/
public $functions = [];
-
/**
* @var array Custom filters.
* Keys of the array are names to call in template, values are names of functions or static methods of some class.
@@ -56,13 +52,11 @@ class ViewRenderer extends BaseViewRenderer
* In the template you can use it like this: `{{ 'test'|rot13 }}` or `{{ model|jsonEncode }}`.
*/
public $filters = [];
-
/**
* @var array Custom extensions.
* Example: `['Twig_Extension_Sandbox', new \Twig_Extension_Text()]`
*/
public $extensions = [];
-
/**
* @var array Twig lexer options.
*
@@ -77,7 +71,6 @@ class ViewRenderer extends BaseViewRenderer
* @see http://twig.sensiolabs.org/doc/recipes.html#customizing-the-syntax
*/
public $lexerOptions = [];
-
/**
* @var array namespaces and classes to import.
*
@@ -92,12 +85,12 @@ class ViewRenderer extends BaseViewRenderer
* ```
*/
public $uses = [];
-
/**
* @var \Twig_Environment twig environment object that renders twig templates
*/
public $twig;
+
public function init()
{
$this->twig = new \Twig_Environment(null, array_merge([
diff --git a/extensions/twig/ViewRendererStaticClassProxy.php b/extensions/twig/ViewRendererStaticClassProxy.php
index 343417d..6ec612e 100644
--- a/extensions/twig/ViewRendererStaticClassProxy.php
+++ b/extensions/twig/ViewRendererStaticClassProxy.php
@@ -17,6 +17,7 @@ class ViewRendererStaticClassProxy
{
private $_staticClassName;
+
public function __construct($staticClassName)
{
$this->_staticClassName = $staticClassName;