Browse Source

!== array() => !empty()

tags/2.0.0-beta
Alexander Kochetov 12 years ago
parent
commit
48d04fbb8c
  1. 2
      framework/YiiBase.php
  2. 2
      framework/base/Controller.php
  3. 4
      framework/base/Dictionary.php
  4. 2
      framework/base/Vector.php
  5. 8
      framework/console/Controller.php
  6. 6
      framework/console/controllers/HelpController.php
  7. 2
      framework/db/ActiveQuery.php
  8. 2
      framework/db/Query.php
  9. 2
      framework/db/QueryBuilder.php
  10. 2
      framework/helpers/base/ArrayHelper.php
  11. 2
      framework/helpers/base/Html.php
  12. 4
      framework/web/UrlManager.php
  13. 4
      framework/web/UrlRule.php
  14. 4
      framework/widgets/ActiveField.php
  15. 4
      framework/widgets/ActiveForm.php
  16. 2
      framework/widgets/Menu.php

2
framework/YiiBase.php

@ -451,7 +451,7 @@ class YiiBase
}
$args = func_get_args();
array_shift($args); // remove $config
if ($config !== array()) {
if (!empty($config)) {
$args[] = $config;
}
return $reflection->newInstanceArgs($args);

2
framework/base/Controller.php

@ -183,7 +183,7 @@ class Controller extends Component
}
}
if ($missing !== array()) {
if (!empty($missing)) {
throw new InvalidRequestException(Yii::t('yii|Missing required parameters: {params}', array(
'{params}' => implode(', ', $missing),
)));

4
framework/base/Dictionary.php

@ -51,7 +51,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
*/
public function __construct($data = array(), $config = array())
{
if ($data !== array()) {
if (!empty($data)) {
$this->copyFrom($data);
}
parent::__construct($config);
@ -187,7 +187,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
public function copyFrom($data)
{
if (is_array($data) || $data instanceof \Traversable) {
if ($this->_d !== array()) {
if (!empty($this->_d)) {
$this->removeAll();
}
if ($data instanceof self) {

2
framework/base/Vector.php

@ -58,7 +58,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
*/
public function __construct($data = array(), $config = array())
{
if ($data !== array()) {
if (!empty($data)) {
$this->copyFrom($data);
}
parent::__construct($config);

8
framework/console/Controller.php

@ -45,7 +45,7 @@ class Controller extends \yii\base\Controller
*/
public function runAction($id, $params = array())
{
if ($params !== array()) {
if (!empty($params)) {
$options = $this->globalOptions();
foreach ($params as $name => $value) {
if (in_array($name, $options, true)) {
@ -69,7 +69,7 @@ class Controller extends \yii\base\Controller
*/
public function bindActionParams($action, $params)
{
if ($params !== array()) {
if (!empty($params)) {
$options = $this->globalOptions();
foreach ($params as $name => $value) {
if (in_array($name, $options, true)) {
@ -81,7 +81,7 @@ class Controller extends \yii\base\Controller
$args = isset($params[Request::ANONYMOUS_PARAMS]) ? $params[Request::ANONYMOUS_PARAMS] : array();
unset($params[Request::ANONYMOUS_PARAMS]);
if ($params !== array()) {
if (!empty($params)) {
throw new Exception(Yii::t('yii|Unknown options: {params}', array(
'{params}' => implode(', ', array_keys($params)),
)));
@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
}
}
if ($missing !== array()) {
if (!empty($missing)) {
throw new Exception(Yii::t('yii|Missing required arguments: {params}', array(
'{params}' => implode(', ', $missing),
)));

6
framework/console/controllers/HelpController.php

@ -142,7 +142,7 @@ class HelpController extends Controller
protected function getHelp()
{
$commands = $this->getCommands();
if ($commands !== array()) {
if (!empty($commands)) {
echo "The following commands are available:\n\n";
foreach ($commands as $command) {
echo "* $command\n";
@ -172,7 +172,7 @@ class HelpController extends Controller
}
$actions = $this->getActions($controller);
if ($actions !== array()) {
if (!empty($actions)) {
echo "\nSUB-COMMANDS\n\n";
$prefix = $controller->getUniqueId();
foreach ($actions as $action) {
@ -280,7 +280,7 @@ class HelpController extends Controller
}
$options = $this->getOptionHelps($controller);
if ($options !== array()) {
if (!empty($options)) {
echo "\nOPTIONS\n\n";
echo implode("\n\n", $options) . "\n\n";
}

2
framework/db/ActiveQuery.php

@ -103,7 +103,7 @@ class ActiveQuery extends Query
{
$command = $this->createCommand();
$rows = $command->queryAll();
if ($rows !== array()) {
if (!empty($rows)) {
$models = $this->createModels($rows);
if (!empty($this->with)) {
$this->populateRelations($models, $this->with);

2
framework/db/Query.php

@ -589,7 +589,7 @@ class Query extends \yii\base\Component
*/
public function addParams($params)
{
if ($params !== array()) {
if (!empty($params)) {
if ($this->params === null) {
$this->params = $params;
} else {

2
framework/db/QueryBuilder.php

@ -777,7 +777,7 @@ class QueryBuilder extends \yii\base\Object
$parts[] = $operand;
}
}
if ($parts !== array()) {
if (!empty($parts)) {
return '(' . implode(") $operator (", $parts) . ')';
} else {
return '';

2
framework/helpers/base/ArrayHelper.php

@ -36,7 +36,7 @@ class ArrayHelper
{
$args = func_get_args();
$res = array_shift($args);
while ($args !== array()) {
while (!empty($args)) {
$next = array_shift($args);
foreach ($next as $k => $v) {
if (is_integer($k)) {

2
framework/helpers/base/Html.php

@ -324,7 +324,7 @@ class Html
$options['action'] = $action;
$options['method'] = $method;
$form = static::beginTag('form', $options);
if ($hiddenInputs !== array()) {
if (!empty($hiddenInputs)) {
$form .= "\n" . implode("\n", $hiddenInputs);
}

4
framework/web/UrlManager.php

@ -190,13 +190,13 @@ class UrlManager extends Component
if ($this->suffix !== null) {
$route .= $this->suffix;
}
if ($params !== array()) {
if (!empty($params)) {
$route .= '?' . http_build_query($params);
}
return rtrim($baseUrl, '/') . '/' . $route . $anchor;
} else {
$url = $baseUrl . '?' . $this->routeVar . '=' . $route;
if ($params !== array()) {
if (!empty($params)) {
$url .= '&' . http_build_query($params);
}
return $url;

4
framework/web/UrlRule.php

@ -144,7 +144,7 @@ class UrlRule extends Object
$this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern);
$this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u';
if ($this->_routeParams !== array()) {
if (!empty($this->_routeParams)) {
$this->_routeRule = '#^' . strtr($this->route, $tr2) . '$#u';
}
}
@ -275,7 +275,7 @@ class UrlRule extends Object
$url .= ($this->suffix === null ? $manager->suffix : $this->suffix);
}
if ($params !== array()) {
if (!empty($params)) {
$url .= '?' . http_build_query($params);
}
return $url;

4
framework/widgets/ActiveField.php

@ -104,7 +104,7 @@ class ActiveField extends Component
public function begin()
{
$options = $this->getClientOptions();
if ($options !== array()) {
if (!empty($options)) {
$this->form->attributes[$this->attribute] = $options;
}
@ -143,7 +143,7 @@ class ActiveField extends Component
$validators[] = $js;
}
}
if ($validators !== array()) {
if (!empty($validators)) {
$options['validate'] = new JsExpression("function(attribute,value,messages){" . implode('', $validators) . '}');
}
}

4
framework/widgets/ActiveForm.php

@ -130,7 +130,7 @@ class ActiveForm extends Widget
*/
public function run()
{
if ($this->attributes !== array()) {
if (!empty($this->attributes)) {
$id = $this->options['id'];
$options = Json::encode($this->getClientOptions());
$attributes = Json::encode($this->attributes);
@ -197,7 +197,7 @@ class ActiveForm extends Widget
$options['class'] .= ' ' . $this->errorSummaryCssClass;
}
if ($lines !== array()) {
if (!empty($lines)) {
$content = "<ul><li>" . implode("</li>\n<li>", $lines) . "</li><ul>";
return Html::tag('div', $header . $content . $footer, $options);
} else {

2
framework/widgets/Menu.php

@ -166,7 +166,7 @@ class Menu extends Widget
if ($this->itemCssClass !== null) {
$class[] = $this->itemCssClass;
}
if ($class !== array()) {
if (!empty($class)) {
if (empty($options['class'])) {
$options['class'] = implode(' ', $class);
} else {

Loading…
Cancel
Save