clear code

yiisoft · Jun 1, 2024 · a6e4e0b · a6e4e0b
1 parent bcc499b
commit a6e4e0b
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 31 deletions.
diff --git a/build/controllers/TranslationController.php b/build/controllers/TranslationController.php
@@ -8,7 +8,6 @@
 namespace yii\build\controllers;
 
 use DirectoryIterator;
-use Yii;
 use yii\console\Controller;
 use yii\helpers\Html;
 

diff --git a/framework/base/ErrorException.php b/framework/base/ErrorException.php
@@ -7,8 +7,6 @@
 
 namespace yii\base;
 
-use Yii;
-
 /**
  * ErrorException represents a PHP error.
  *

diff --git a/framework/base/Security.php b/framework/base/Security.php
@@ -7,7 +7,6 @@
 
 namespace yii\base;
 
-use Yii;
 use yii\helpers\StringHelper;
 
 /**

diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
@@ -111,7 +111,6 @@ protected function prepareModels()
         if (($sort = $this->getSort()) !== false) {
             $query->addOrderBy($sort->getOrders());
         }
-
         return $query->all($this->db);
     }
 
@@ -129,7 +128,6 @@ protected function prepareKeys($models)
                     $keys[] = call_user_func($this->key, $model);
                 }
             }
-
             return $keys;
         } elseif ($this->query instanceof ActiveQueryInterface) {
             /* @var $class \yii\db\ActiveRecordInterface */
@@ -149,10 +147,8 @@ protected function prepareKeys($models)
                     $keys[] = $kk;
                 }
             }
-
             return $keys;
         }
-
         return array_keys($models);
     }
 
@@ -220,7 +216,6 @@ public function __clone()
         if (is_object($this->query)) {
             $this->query = clone $this->query;
         }
-
         parent::__clone();
     }
 }
diff --git a/framework/data/Pagination.php b/framework/data/Pagination.php
@@ -173,7 +173,6 @@ public function getPage($recalculate = false)
             $page = (int) $this->getQueryParam($this->pageParam, 1) - 1;
             $this->setPage($page, true);
         }
-
         return $this->_page;
     }
 
@@ -221,7 +220,6 @@ public function getPageSize()
                 $this->setPageSize($pageSize, true);
             }
         }
-
         return $this->_pageSize;
     }
 
@@ -264,7 +262,7 @@ public function createUrl($page, $pageSize = null, $absolute = false)
             $request = Yii::$app->getRequest();
             $params = $request instanceof Request ? $request->getQueryParams() : [];
         }
-        if ($page > 0 || $page == 0 && $this->forcePageParam) {
+        if ($page > 0 || ($page === 0 && $this->forcePageParam)) {
             $params[$this->pageParam] = $page + 1;
         } else {
             unset($params[$this->pageParam]);
@@ -282,7 +280,6 @@ public function createUrl($page, $pageSize = null, $absolute = false)
         if ($absolute) {
             return $urlManager->createAbsoluteUrl($params);
         }
-
         return $urlManager->createUrl($params);
     }
 
@@ -293,7 +290,6 @@ public function createUrl($page, $pageSize = null, $absolute = false)
     public function getOffset()
     {
         $pageSize = $this->getPageSize();
-
         return $pageSize < 1 ? 0 : $this->getPage() * $pageSize;
     }
 
@@ -305,7 +301,6 @@ public function getOffset()
     public function getLimit()
     {
         $pageSize = $this->getPageSize();
-
         return $pageSize < 1 ? -1 : $pageSize;
     }
 
@@ -331,7 +326,6 @@ public function getLinks($absolute = false)
                 $links[self::LINK_NEXT] = $this->createUrl($currentPage + 1, null, $absolute);
             }
         }
-
         return $links;
     }
 
@@ -348,7 +342,6 @@ protected function getQueryParam($name, $defaultValue = null)
             $request = Yii::$app->getRequest();
             $params = $request instanceof Request ? $request->getQueryParams() : [];
         }
-
         return isset($params[$name]) && is_scalar($params[$name]) ? $params[$name] : $defaultValue;
     }
 

diff --git a/framework/data/SqlDataProvider.php b/framework/data/SqlDataProvider.php
@@ -7,7 +7,6 @@
 
 namespace yii\data;
 
-use Yii;
 use yii\base\InvalidConfigException;
 use yii\caching\ArrayCache;
 use yii\db\Connection;
@@ -151,10 +150,8 @@ protected function prepareKeys($models)
                     $keys[] = call_user_func($this->key, $model);
                 }
             }
-
             return $keys;
         }
-
         return array_keys($models);
     }
 

diff --git a/framework/db/ColumnSchemaBuilder.php b/framework/db/ColumnSchemaBuilder.php
@@ -7,7 +7,6 @@
 
 namespace yii\db;
 
-use Yii;
 use yii\base\BaseObject;
 use yii\helpers\StringHelper;
 

diff --git a/framework/i18n/DbMessageSource.php b/framework/i18n/DbMessageSource.php
@@ -7,7 +7,6 @@
 
 namespace yii\i18n;
 
-use Yii;
 use yii\base\InvalidConfigException;
 use yii\caching\CacheInterface;
 use yii\db\Connection;

diff --git a/framework/log/DbTarget.php b/framework/log/DbTarget.php
@@ -7,7 +7,6 @@
 
 namespace yii\log;
 
-use Yii;
 use yii\base\InvalidConfigException;
 use yii\db\Connection;
 use yii\db\Exception;

diff --git a/framework/log/Logger.php b/framework/log/Logger.php
@@ -7,7 +7,6 @@
 
 namespace yii\log;
 
-use Yii;
 use yii\base\Component;
 
 /**

diff --git a/framework/log/SyslogTarget.php b/framework/log/SyslogTarget.php
@@ -7,7 +7,6 @@
 
 namespace yii\log;
 
-use Yii;
 use yii\helpers\VarDumper;
 
 /**

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
@@ -7,7 +7,6 @@
 
 namespace yii\rbac;
 
-use Yii;
 use yii\base\BaseObject;
 
 /**

diff --git a/framework/rest/Action.php b/framework/rest/Action.php
@@ -7,7 +7,6 @@
 
 namespace yii\rest;
 
-use Yii;
 use yii\base\InvalidConfigException;
 use yii\db\ActiveRecordInterface;
 use yii\web\NotFoundHttpException;

diff --git a/framework/rest/ViewAction.php b/framework/rest/ViewAction.php
@@ -7,8 +7,6 @@
 
 namespace yii\rest;
 
-use Yii;
-
 /**
  * ViewAction implements the API endpoint for returning the detailed information about a model.
  *

diff --git a/framework/web/CacheSession.php b/framework/web/CacheSession.php
@@ -7,7 +7,6 @@
 
 namespace yii\web;
 
-use Yii;
 use yii\caching\CacheInterface;
 use yii\di\Instance;
 

diff --git a/framework/web/HeaderCollection.php b/framework/web/HeaderCollection.php
@@ -7,7 +7,6 @@
 
 namespace yii\web;
 
-use Yii;
 use yii\base\BaseObject;
 
 /**