various code style and whitespace adjustments

This commit is contained in:
Carsten Brandt
2015-08-02 00:27:19 +02:00
parent 8b951796ac
commit 6d9fe671de
27 changed files with 42 additions and 37 deletions

View File

@ -29,3 +29,4 @@ namespace yii\base;
interface Configurable
{
}

View File

@ -17,7 +17,6 @@ use Yii;
*/
class ErrorException extends \ErrorException
{
/**
* Zend runtime won't call the error handler on fatals, HHVM will, with an error code of 16777217
* We will handle fatal error a bit different on HHVM.
@ -25,6 +24,7 @@ class ErrorException extends \ErrorException
*/
const E_HHVM_FATAL_ERROR = 16777217; // E_ERROR | (1 << 24)
/**
* Constructs the exception.
* @link http://php.net/manual/en/errorexception.construct.php

View File

@ -44,12 +44,12 @@ abstract class ErrorHandler extends Component
* @var string Used to reserve memory for fatal error handler.
*/
private $_memoryReserve;
/**
* @var \Exception from HHVM error that stores backtrace
*/
private $_hhvmException;
/**
* Register this error handler
*/

View File

@ -16,10 +16,10 @@ namespace yii\base;
class InvalidValueException extends \UnexpectedValueException
{
/**
* @return string the user-friendly name of this exception
*/
public function getName()
{
return 'Invalid Return Value';
}
* @return string the user-friendly name of this exception
*/
public function getName()
{
return 'Invalid Return Value';
}
}

View File

@ -87,6 +87,7 @@ class Security extends Component
*/
public $passwordHashCost = 13;
/**
* Encrypts data using a password.
* Derives keys for encryption and authentication from the password using PBKDF2 and a random salt,

View File

@ -81,6 +81,7 @@ class Theme extends Component
private $_baseUrl;
/**
* @return string the base URL (without ending slash) for this theme. All resources of this theme are considered
* to be under this base URL.

View File

@ -75,6 +75,7 @@ class Application extends \yii\base\Application
*/
public $controller;
/**
* @inheritdoc
*/

View File

@ -24,7 +24,7 @@ use yii\base\Object;
* 'data' => Schema::text(),
* 'created_at' => Schema::integer(),
* 'updated_at' => Schema::integer(),
*]);
* ]);
* ```
*
* @method SchemaBuilder default($default = null) see [[SchemaBuilder::_default()]] for more info
@ -38,32 +38,28 @@ abstract class SchemaBuilder extends Object
* @var string column type
*/
protected $type;
/**
* @var integer column size
*/
protected $length;
/**
* @var boolean whether value is not nullable
*/
protected $isNotNull = false;
/**
* @var boolean whether value should be unique
*/
protected $isUnique = false;
/**
* @var string check value of column
*/
protected $check;
/**
* @var mixed default value of column
*/
protected $default;
/**
* Makes column a primary key
*

View File

@ -59,6 +59,7 @@ trait SchemaBuilderTrait
'cubrid' => 'yii\db\cubrid\SchemaBuilder', // CUBRID
];
/**
* Set the database connection used by this class
*

View File

@ -32,6 +32,7 @@ class Schema extends \yii\db\Schema
'ORA-00001: unique constraint' => 'yii\db\IntegrityException',
];
/**
* @inheritdoc
*/

View File

@ -85,6 +85,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
'NOT EXISTS' => 'buildExistsCondition',
];
/**
* Builds a SQL statement for creating a new index.
* @param string $name the name of the index. The name will be properly quoted by the method.

View File

@ -80,7 +80,6 @@ class BaseHtml
'rel',
'media',
];
/**
* @var array list of tag attributes that should be specially handled when their values are of array type.
* In particular, if the value of the `data` attribute is `['name' => 'xyz', 'age' => 13]`, two attributes

View File

@ -1079,7 +1079,7 @@ class Formatter extends Component
* @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
* @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
* @return string the formatted result.
* @throws InvalidParamException if the input value is not numeric or the formatting failed.
* @throws InvalidParamException if the input value is not numeric or the formatting failed.
* @see sizeFormat
* @see asShortSize
*/
@ -1198,7 +1198,7 @@ class Formatter extends Component
*
* @param integer $style the type of the number formatter.
* Values: NumberFormatter::DECIMAL, ::CURRENCY, ::PERCENT, ::SCIENTIFIC, ::SPELLOUT, ::ORDINAL
* ::DURATION, ::PATTERN_RULEBASED, ::DEFAULT_STYLE, ::IGNORE
* ::DURATION, ::PATTERN_RULEBASED, ::DEFAULT_STYLE, ::IGNORE
* @param integer $decimals the number of digits after the decimal point.
* @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
* @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].

View File

@ -85,6 +85,7 @@ class DbManager extends BaseManager
* @since 2.0.3
*/
public $cacheKey = 'rbac';
/**
* @var Item[] all auth items (name => Item)
*/
@ -98,6 +99,7 @@ class DbManager extends BaseManager
*/
protected $parents;
/**
* Initializes the application component.
* This method overrides the parent implementation by establishing the database connection.

View File

@ -31,6 +31,7 @@ class ArrayFixture extends Fixture implements \IteratorAggregate, \ArrayAccess,
*/
public $dataFile;
/**
* Loads the fixture.
*

View File

@ -50,6 +50,7 @@ class Application extends \yii\base\Application
*/
public $controller;
/**
* @inheritdoc
*/

View File

@ -72,7 +72,6 @@ class Response extends \yii\base\Response
* You may respond to this event to filter the response content before it is sent to the client.
*/
const EVENT_AFTER_PREPARE = 'afterPrepare';
const FORMAT_RAW = 'raw';
const FORMAT_HTML = 'html';
const FORMAT_JSON = 'json';
@ -426,7 +425,7 @@ class Response extends \yii\base\Response
*
* - `mimeType`: the MIME type of the content. If not set, it will be guessed based on `$filePath`
* - `inline`: boolean, whether the browser should open the file within the browser window. Defaults to false,
* meaning a download dialog will pop up.
* meaning a download dialog will pop up.
*
* @return $this the response object itself
*/
@ -456,7 +455,7 @@ class Response extends \yii\base\Response
*
* - `mimeType`: the MIME type of the content. Defaults to 'application/octet-stream'.
* - `inline`: boolean, whether the browser should open the file within the browser window. Defaults to false,
* meaning a download dialog will pop up.
* meaning a download dialog will pop up.
*
* @return $this the response object itself
* @throws HttpException if the requested range is not satisfiable
@ -503,10 +502,10 @@ class Response extends \yii\base\Response
*
* - `mimeType`: the MIME type of the content. Defaults to 'application/octet-stream'.
* - `inline`: boolean, whether the browser should open the file within the browser window. Defaults to false,
* meaning a download dialog will pop up.
* meaning a download dialog will pop up.
* - `fileSize`: the size of the content to stream this is useful when size of the content is known
* and the content is not seekable. Defaults to content size using `ftell()`.
* This option is available since version 2.0.4.
* and the content is not seekable. Defaults to content size using `ftell()`.
* This option is available since version 2.0.4.
*
* @return $this the response object itself
* @throws HttpException if the requested range cannot be satisfied.
@ -660,7 +659,7 @@ class Response extends \yii\base\Response
*
* - `mimeType`: the MIME type of the content. If not set, it will be guessed based on `$filePath`
* - `inline`: boolean, whether the browser should open the file within the browser window. Defaults to false,
* meaning a download dialog will pop up.
* meaning a download dialog will pop up.
* - xHeader: string, the name of the x-sendfile header. Defaults to "X-Sendfile".
*
* @return $this the response object itself