Commit bf3c7514 by Carsten Brandt

reverted breaking PHPdoc codestyle changes

issue #2852
parent d1363d96
......@@ -74,7 +74,6 @@ class Action extends Component
* This method is mainly invoked by the controller.
*
* @param array $params the parameters to be bound to the action's run() method.
*
* @return mixed the result of the action
* @throws InvalidConfigException if the action class does not have a run() method
*/
......
......@@ -172,7 +172,6 @@ class Theme extends Component
}
}
/**
* Converts a relative file path into an absolute one using [[basePath]].
* @param string $path the relative file path to be converted.
......
......@@ -135,6 +135,7 @@ class FileCache extends Cache
if ($duration <= 0) {
$duration = 31536000; // 1 year
}
return @touch($cacheFile, $duration + time());
} else {
return false;
......
......@@ -194,6 +194,7 @@ class MemCache extends Cache
protected function setValue($key, $value, $duration)
{
$expire = $duration > 0 ? $duration + time() : 0;
return $this->useMemcached ? $this->_cache->set($key, $value, $expire) : $this->_cache->set($key, $value, 0, $expire);
}
......@@ -207,6 +208,7 @@ class MemCache extends Cache
{
if ($this->useMemcached) {
$this->_cache->setMulti($data, $duration > 0 ? $duration + time() : 0);
return [];
} else {
return parent::setValues($data, $duration);
......@@ -225,6 +227,7 @@ class MemCache extends Cache
protected function addValue($key, $value, $duration)
{
$expire = $duration > 0 ? $duration + time() : 0;
return $this->useMemcached ? $this->_cache->add($key, $value, $expire) : $this->_cache->add($key, $value, 0, $expire);
}
......
......@@ -411,7 +411,6 @@ SQL;
}
$column->phpType = $this->getColumnPhpType($column);
return $column;
}
}
......@@ -55,7 +55,6 @@ class ServiceLocator extends Component
*/
private $_definitions = [];
/**
* Getter magic method.
* This method is overridden to support accessing components like reading properties.
......
......@@ -695,12 +695,14 @@ class BaseConsole
*
* @param string $text prompt string
* @param array $options the options to validate the input:
* - required: whether it is required or not
* - default: default value if no input is inserted by the user
* - pattern: regular expression pattern to validate user input
* - validator: a callable function to validate input. The function must accept two parameters:
* - $input: the user input to validate
* - $error: the error value passed by reference if validation failed.
*
* - `required`: whether it is required or not
* - `default`: default value if no input is inserted by the user
* - `pattern`: regular expression pattern to validate user input
* - `validator`: a callable function to validate input. The function must accept two parameters:
* - `input`: the user input to validate
* - `error`: the error value passed by reference if validation failed.
*
* @return string the user input
*/
public static function prompt($text, $options = [])
......
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