bumped to php 7.3

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: build
+
+on: [push, pull_request]
+
+env:
+    DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader"
+
+jobs:
+    phpunit:
+        name: PHP ${{ matrix.php }} on ${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ubuntu-latest]
+                php: ['7.3', '7.4', '8.0', '8.1']
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+            - name: Install PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: apc, curl, dom, intl, mbstring, mcrypt
+                  ini-values: date.timezone='UTC'
+            - name: Get composer cache directory
+              id: composer-cache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - name: Cache composer dependencies
+              uses: actions/cache@v1
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: ${{ runner.os }}-composer-
+            - name: Install dependencies
+              run: composer update $DEFAULT_COMPOSER_FLAGS
+            - name: PHP Unit tests
+              run: vendor/bin/phpunit --verbose

.gitignore

@@ -25,4 +25,5 @@ composer.lock
 # phpunit itself is not needed
 phpunit.phar
 # local phpunit config
-/phpunit.xml
+/phpunit.xml
+.phpunit.result.cache

composer.json

@@ -1,58 +1,63 @@
 {
-  "name": "simialbi/yii2-rest-client",
-  "type": "yii2-extension",
-  "description": "REST client (AR-like model) for Yii Framework 2.0 (via yii2-http-client, extends ApexWire/yii2-restclient)",
-  "keywords": [
-    "yii2",
-    "rest",
-    "client",
-    "model",
-    "active record"
-  ],
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "ApexWire",
-      "email": "[email protected]"
+    "name": "simialbi/yii2-rest-client",
+    "type": "yii2-extension",
+    "description": "REST client (AR-like model) for Yii Framework 2.0 (via yii2-http-client, extends ApexWire/yii2-restclient)",
+    "keywords": [
+        "yii2",
+        "rest",
+        "client",
+        "model",
+        "active record"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "ApexWire",
+            "email": "[email protected]"
+        },
+        {
+            "name": "simialbi",
+            "email": "[email protected]"
+        }
+    ],
+    "support": {
+        "source": "https://github.com/simialbi/yii2-rest-client",
+        "issues": "https://github.com/simialbi/yii2-rest-client/issues"
     },
-    {
-      "name": "simialbi",
-      "email": "[email protected]"
-    }
-  ],
-  "support": {
-    "source": "https://github.com/simialbi/yii2-rest-client",
-    "issues": "https://github.com/simialbi/yii2-rest-client/issues"
-  },
-  "minimum-stability": "beta",
-  "require": {
-    "php": ">=7.0",
-    "yiisoft/yii2": "^2.0.14",
-    "yiisoft/yii2-httpclient": "^2.0.0"
-  },
-  "require-dev": {
-    "yiisoft/yii2-coding-standards": "~2.0",
-    "phpunit/phpunit": "^5.0.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "simialbi\\yii2\\rest\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "yiiunit\\extensions\\rest\\": "tests"
-    }
-  },
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "https://asset-packagist.org"
-    }
-  ],
-  "extra": {
-    "branch-alias": {
-      "dev-master": "2.0.x-dev"
+    "minimum-stability": "beta",
+    "require": {
+        "php": ">=7.3",
+        "yiisoft/yii2": "^2.0.14",
+        "yiisoft/yii2-httpclient": "^2.0.0"
+    },
+    "require-dev": {
+        "yiisoft/yii2-coding-standards": "~2.0",
+        "phpunit/phpunit": "^9.5.21"
+    },
+    "autoload": {
+        "psr-4": {
+            "simialbi\\yii2\\rest\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "yiiunit\\extensions\\rest\\": "tests"
+        }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "yiisoft/yii2-composer": true
+        }
     }
-  }
 }

src/ActiveFixture.php

@@ -105,7 +105,7 @@ public function getModel($name)
         $modelClass = $this->modelClass;
         $keys = [];
         foreach ($modelClass::primaryKey() as $key) {
-            $keys[$key] = isset($row[$key]) ? $row[$key] : null;
+            $keys[$key] = $row[$key] ?? null;
         }
 
         /* @var $model ActiveRecord */

src/ActiveQuery.php

@@ -60,7 +60,7 @@ public function createCommand($db = null): Command
      * {@inheritdoc}
      * @throws InvalidConfigException
      */
-    public function prepare($builder)
+    public function prepare($builder): Query
     {
         if (!empty($this->joinWith)) {
             $this->buildJoinWith();
@@ -179,7 +179,7 @@ private function joinWithRelation(ActiveQuery $parent, ActiveQuery $child)
     /**
      * {@inheritdoc}
      */
-    public function all($db = null)
+    public function all($db = null): array
     {
         return parent::all($db);
     }

src/ActiveRecord.php

@@ -80,7 +80,7 @@ public static function find(): ActiveQuery
      * @return null|Connection
      * @throws InvalidConfigException
      */
-    public static function getDb()
+    public static function getDb(): ?Connection
     {
         /* @var $connection Connection */
         return Yii::$app->get(Connection::getDriverName());
@@ -129,7 +129,7 @@ public function insert($runValidation = true, $attributes = null): bool
      * @throws InvalidConfigException
      * @throws Exception
      */
-    protected function insertInternal($attributes): bool
+    protected function insertInternal(?array $attributes): bool
     {
         if (!$this->beforeSave(true)) {
             return false;

src/Command.php

@@ -10,6 +10,7 @@
 
 use Yii;
 use yii\base\Component;
+use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
 
@@ -186,7 +187,7 @@ public function update(string $model, array $data = [], string $id = null)
      * @param string $model
      * @param string|null $id
      *
-     * @return mixed
+     * @return array|false
      * @throws Exception
      */
     public function delete(string $model, string $id = null)

src/Connection.php

@@ -231,7 +231,7 @@ public function noCache(callable $callable)
      * @throws InvalidConfigException
      * @internal
      */
-    public function getQueryCacheInfo(int $duration = null, \yii\caching\Dependency $dependency = null)
+    public function getQueryCacheInfo(int $duration = null, \yii\caching\Dependency $dependency = null): ?array
     {
         if (!$this->enableQueryCache) {
             return null;

src/Query.php

@@ -43,7 +43,7 @@ public function __construct($modelClass, array $config = [])
     /**
      * {@inheritDoc}
      */
-    public static function create($from)
+    public static function create($from): self
     {
         $modelClass = ($from->hasProperty('modelClass')) ? $from->modelClass : null;
 
@@ -74,7 +74,7 @@ public static function create($from)
      *
      * @return $this a prepared query instance which will be used by [[QueryBuilder]] to build the SQL
      */
-    public function prepare($builder)
+    public function prepare($builder): self
     {
         return $this;
     }

src/QueryBuilder.php

@@ -150,9 +150,7 @@ public function buildJoin($joins, &$params): string
      */
     public function buildWhere($condition, &$params): array
     {
-        $where = $this->buildCondition($condition, $params);
-
-        return $where;
+        return $this->buildCondition($condition, $params);
     }
 
     /**
@@ -162,7 +160,7 @@ public function buildWhere($condition, &$params): array
      */
     public function buildCondition($condition, &$params): array
     {
-        if ($condition instanceof Expression || empty($condition) || !is_array($condition)) {
+        if (empty($condition) || !is_array($condition)) {
             return [];
         }
 
@@ -246,7 +244,7 @@ public function buildLimit($limit, $offset)
     /**
      * {@inheritdoc}
      */
-    public function bindParam($value, &$params)
+    public function bindParam($value, &$params): ?string
     {
         return $value;
     }

src/conditions/BetweenConditionBuilder.php

@@ -6,7 +6,6 @@
 
 namespace simialbi\yii2\rest\conditions;
 
-
 use yii\db\conditions\BetweenCondition;
 use yii\db\ExpressionInterface;
 

src/conditions/ConditionBuilderTrait.php

@@ -7,7 +7,6 @@
 
 namespace simialbi\yii2\rest\conditions;
 
-
 use yii\data\DataFilter;
 use yii\helpers\ArrayHelper;
 

src/conditions/ConjunctionConditionBuilder.php

@@ -6,7 +6,6 @@
 
 namespace simialbi\yii2\rest\conditions;
 
-
 use yii\db\conditions\ConjunctionCondition;
 use yii\db\ExpressionInterface;
 

src/conditions/HashConditionBuilder.php

@@ -6,7 +6,6 @@
 
 namespace simialbi\yii2\rest\conditions;
 
-
 use simialbi\yii2\rest\Query;
 use yii\db\conditions\InCondition;
 use yii\db\ExpressionInterface;

src/conditions/NotConditionBuilder.php

@@ -6,7 +6,6 @@
 
 namespace simialbi\yii2\rest\conditions;
 
-
 use yii\db\conditions\NotCondition;
 use yii\db\ExpressionInterface;
 

tests/RelationTest.php

@@ -13,7 +13,7 @@
 
 class RelationTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -17,7 +17,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
     /**
      * {@inheritdoc}
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->destroyApplication();
@@ -28,7 +28,7 @@ protected function tearDown()
      * @param array $config
      * @param string $appClass
      */
-    protected function mockWebApplication($config = [], $appClass = '\yii\web\Application')
+    protected function mockWebApplication(array $config = [], string $appClass = '\yii\web\Application')
     {
         new $appClass(ArrayHelper::merge([
             'id' => 'testapp',
@@ -75,7 +75,7 @@ protected function destroyApplication()
      * Parse log from index and returns data
      * @return array
      */
-    protected function parseLogs()
+    protected function parseLogs(): array
     {
         $method = '';
         $url = '';

tests/UrlTest.php

@@ -12,7 +12,7 @@
 
 class UrlTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/UrlWithoutPluralisationTest.php

@@ -13,7 +13,7 @@
 
 class UrlWithoutPluralisationTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/log/ArrayTarget.php

@@ -36,8 +36,8 @@ public function export()
      * Getter for cache variable
      * @return array
      */
-    public function getCache()
+    public function getCache(): array
     {
         return $this->_cache;
     }
-}
+}

tests/models/RelatedRestModel.php

@@ -27,7 +27,7 @@ class RelatedRestModel extends ActiveRecord
     /**
      * {@inheritDoc}
      */
-    public static function primaryKey()
+    public static function primaryKey(): array
     {
         return ['id'];
     }