added php 7 types

Author: Simon Karlen

src/ActiveFixture.php

@@ -70,7 +70,7 @@ public function load()
      * @throws InvalidConfigException
      * @throws \ReflectionException
      */
-    protected function getData()
+    protected function getData(): array
     {
         if ($this->dataFile === null) {
             if ($this->dataDirectory !== null) {

src/ActiveQuery.php

@@ -38,7 +38,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
      * @throws \yii\db\Exception
      * @throws \yii\base\NotSupportedException
      */
-    public function createCommand($db = null)
+    public function createCommand($db = null): Command
     {
         /**
          * @var ActiveRecord $modelClass
@@ -137,7 +137,7 @@ private function buildJoinWith()
      * @param ActiveRecord $model the primary model
      * @param array $with the relations to be joined
      */
-    protected function joinWithRelations($model, $with)
+    protected function joinWithRelations(ActiveRecord $model, array $with)
     {
         foreach ($with as $name => $callback) {
             if (is_int($name)) {
@@ -167,7 +167,7 @@ protected function joinWithRelations($model, $with)
      * @param ActiveQuery $parent
      * @param ActiveQuery $child
      */
-    private function joinWithRelation($parent, $child)
+    private function joinWithRelation(ActiveQuery $parent, ActiveQuery $child)
     {
         if (!empty($child->join)) {
             foreach ($child->join as $join) {
@@ -205,7 +205,7 @@ public function one($db = null)
      * {@inheritdoc}
      * @throws InvalidConfigException
      */
-    public function populate($rows)
+    public function populate($rows): array
     {
         if (empty($rows)) {
             return [];
@@ -232,7 +232,7 @@ public function populate($rows)
     /**
      * {@inheritDoc}
      */
-    protected function createModels($rows)
+    protected function createModels($rows): array
     {
         if ($this->asArray) {
             return $rows;
@@ -270,7 +270,7 @@ protected function createModels($rows)
      * @return array the distinctive models
      * @throws InvalidConfigException if model primary key is empty
      */
-    private function removeDuplicatedModels($models)
+    private function removeDuplicatedModels(array $models): array
     {
         $hash = [];
         /* @var $class ActiveRecord */
@@ -352,7 +352,7 @@ private function removeDuplicatedModels($models)
      *
      * @return $this the query object itself
      */
-    public function joinWith($with)
+    public function joinWith($with): ActiveQuery
     {
         $this->joinWith[] = (array)$with;
         return $this;

src/ActiveRecord.php

@@ -25,16 +25,11 @@ class ActiveRecord extends BaseActiveRecord
      */
     private $_attributeFields = [];
 
-    /**
-     * @var array
-     */
-    private $_relations = [];
-
     /**
      * @return array
      * @throws \ReflectionException
      */
-    public function attributes()
+    public function attributes(): array
     {
         if (empty($this->_attributeFields)) {
             $regex = '#^@property(?:-(read|write))?(?:\s+([^\s]+))?\s+\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)#';
@@ -56,28 +51,6 @@ public function attributes()
         return $this->_attributeFields;
     }
 
-    /**
-     * Relation getter
-     * @return array
-     */
-    public function getRelations()
-    {
-        if (empty($this->_relations)) {
-            $regex = '#^@property-read(?:\s+([^\s \[\]]+)(?:\[\])?)?\s+\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)#';
-            $reflection = new \ReflectionClass($this);
-            $docLines = preg_split('~\R~u', $reflection->getDocComment());
-            foreach ($docLines as $docLine) {
-                $matches = [];
-                $docLine = ltrim($docLine, "\t* ");
-                if (preg_match($regex, $docLine, $matches) && isset($matches[2])) {
-                    $this->_relations[$matches[2]] = $matches[1];
-                }
-            }
-        }
-
-        return $this->_relations;
-    }
-
     /**
      * {@inheritdoc}
      * @throws InvalidConfigException
@@ -93,7 +66,7 @@ public static function primaryKey()
      * @return ActiveQuery
      * @throws InvalidConfigException
      */
-    public static function find()
+    public static function find(): ActiveQuery
     {
         /* @var $query ActiveQuery */
         $query = Yii::createObject(ActiveQuery::class, [get_called_class()]);
@@ -102,15 +75,15 @@ public static function find()
     }
 
     /**
+     * {@inheritDoc}
+     *
      * @return null|Connection
      * @throws InvalidConfigException
      */
     public static function getDb()
     {
-        $connection = Yii::$app->get(Connection::getDriverName());
-
         /* @var $connection Connection */
-        return $connection;
+        return Yii::$app->get(Connection::getDriverName());
     }
 
     /**
@@ -124,7 +97,7 @@ public static function getDb()
      * @return string the url path
      * @throws InvalidConfigException
      */
-    public static function modelName()
+    public static function modelName(): string
     {
         $path = Inflector::camel2id(StringHelper::basename(get_called_class()), '-');
         return static::getDb()->usePluralisation ? Inflector::pluralize($path) : $path;
@@ -135,7 +108,7 @@ public static function modelName()
      * @throws InvalidConfigException
      * @throws Exception
      */
-    public function insert($runValidation = true, $attributes = null)
+    public function insert($runValidation = true, $attributes = null): bool
     {
         if ($runValidation && !$this->validate($attributes)) {
             Yii::info('Model not inserted due to validation error.', __METHOD__);
@@ -156,7 +129,7 @@ public function insert($runValidation = true, $attributes = null)
      * @throws InvalidConfigException
      * @throws Exception
      */
-    protected function insertInternal($attributes)
+    protected function insertInternal(array $attributes): bool
     {
         if (!$this->beforeSave(true)) {
             return false;
@@ -179,7 +152,6 @@ protected function insertInternal($attributes)
     /**
      * {@inheritdoc}
      * @throws InvalidConfigException
-     * @throws \yii\httpclient\Exception
      */
     public function update($runValidation = true, $attributeNames = null)
     {

src/Command.php

@@ -56,13 +56,13 @@ class Command extends Component
 
     /**
      * Enables query cache for this command.
-     * @param int $duration the number of seconds that query result of this command can remain valid in the cache.
+     * @param int|null $duration the number of seconds that query result of this command can remain valid in the cache.
      * If this is not set, the value of [[Connection::queryCacheDuration]] will be used instead.
      * Use 0 to indicate that the cached data will never expire.
-     * @param \yii\caching\Dependency $dependency the cache dependency associated with the cached query result.
+     * @param \yii\caching\Dependency|null $dependency the cache dependency associated with the cached query result.
      * @return $this the command object itself
      */
-    public function cache($duration = null, $dependency = null)
+    public function cache(int $duration = null, \yii\caching\Dependency $dependency = null): Command
     {
         $this->queryCacheDuration = $duration === null ? $this->db->queryCacheDuration : $duration;
         $this->queryCacheDependency = $dependency;
@@ -73,7 +73,7 @@ public function cache($duration = null, $dependency = null)
      * Disables query cache for this command.
      * @return $this the command object itself
      */
-    public function noCache()
+    public function noCache(): Command
     {
         $this->queryCacheDuration = -1;
         return $this;
@@ -85,7 +85,7 @@ public function noCache()
      * It is likely that this method returns an invalid URL due to improper replacement of parameter placeholders.
      * @return string the raw URL with parameter values inserted into the corresponding placeholders.
      */
-    public function getRawUrl()
+    public function getRawUrl(): string
     {
         $rawUrl = $this->db->handler->get($this->pathInfo, $this->queryParams)->fullUrl;
 
@@ -94,29 +94,30 @@ public function getRawUrl()
 
     /**
      * Executes the SQL statement and returns ALL rows at once.
-     * @param int $fetchMode for compatibility with [[\yii\db\Command]]
+     * @param int|null $fetchMode for compatibility with [[\yii\db\Command]]
      * @return array all rows of the query result. Each array element is an array representing a row of data.
      * An empty array is returned if the query results in nothing.
      * @throws \yii\base\InvalidConfigException
      */
-    public function queryAll($fetchMode = null)
+    public function queryAll(int $fetchMode = null): array
     {
         return $this->queryInternal();
     }
 
     /**
      * Executes the SQL statement and returns the first row of the result.
      * This method is best used when only the first row of result is needed for a query.
-     * @param int $fetchMode for compatibility with [[\yii\db\Command]]
+     * @param int|null $fetchMode for compatibility with [[\yii\db\Command]]
      * @return array|false the first row (in terms of an array) of the query result. False is returned if the query
      * results in nothing.
+     * @throws \yii\base\InvalidConfigException
      */
-    public function queryOne($fetchMode = null)
+    public function queryOne(int $fetchMode = null)
     {
-        /* @var $class ActiveRecord */
         $class = $this->modelClass;
 
         if (!empty($class) && class_exists($class)) {
+            /* @var $class ActiveRecord */
             $pks = $class::primaryKey();
 
             if (count($pks) === 1 && isset($this->queryParams['filter'])) {
@@ -138,7 +139,7 @@ public function queryOne($fetchMode = null)
      *
      * @return mixed
      */
-    public function execute($method = 'get')
+    public function execute(string $method = 'get')
     {
         return $this->queryInternal($method);
     }
@@ -152,7 +153,7 @@ public function execute($method = 'get')
      * @return mixed
      * @throws Exception
      */
-    public function insert($model, $columns)
+    public function insert(string $model, array $columns)
     {
         $this->pathInfo = $model;
 
@@ -164,12 +165,11 @@ public function insert($model, $columns)
      *
      * @param string $model
      * @param array $data
-     * @param string $id
+     * @param string|null $id
      *
      * @return mixed
-     * @throws Exception
      */
-    public function update($model, $data = [], $id = null)
+    public function update(string $model, array $data = [], string $id = null)
     {
         $method = $this->db->updateMethod;
         $this->pathInfo = $model;
@@ -184,12 +184,12 @@ public function update($model, $data = [], $id = null)
      * Deletes a record
      *
      * @param string $model
-     * @param string $id
+     * @param string|null $id
      *
      * @return mixed
      * @throws Exception
      */
-    public function delete($model, $id = null)
+    public function delete(string $model, string $id = null)
     {
         $this->pathInfo = $model;
         if ($id) {
@@ -206,7 +206,7 @@ public function delete($model, $id = null)
      *
      * @return mixed
      */
-    protected function queryInternal($method = 'get')
+    protected function queryInternal(string $method = 'get')
     {
         if ($this->db->usePluralisation && strpos($this->pathInfo, '/') === false) {
             $this->pathInfo = Inflector::pluralize($this->pathInfo);
@@ -246,7 +246,7 @@ protected function queryInternal($method = 'get')
      * @return array the cache key
      * @since 2.0.16
      */
-    protected function getCacheKey($method)
+    protected function getCacheKey(string $method): array
     {
         return [
             __CLASS__,