Fixed #21

updated code style
introduced ecs

Author: simialbi

.github/workflows/build.yml

@@ -1,39 +1,41 @@
 name: build
 
-on: [push, pull_request, workflow_dispatch]
+on: [ push, pull_request, workflow_dispatch ]
 
 env:
     DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader"
 
 jobs:
     phpunit:
-        name: PHP ${{ matrix.php }} on ${{ matrix.os }}
+        name: PHP ${{ matrix.php }}-${{ matrix.os }}
         runs-on: ${{ matrix.os }}
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest]
-                php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+                os: [ ubuntu-latest ]
+                php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
 
         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 "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-            - name: Cache composer dependencies
-              uses: actions/cache@v4
-              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
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   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: Determine composer cache directory
+                id: composer-cache
+                run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
+            -   name: Cache dependencies composer installed with composer
+                uses: actions/cache@v4
+                with:
+                    path: ${{ env.COMPOSER_CACHE_DIR }}
+                    key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+                    restore-keys: php${{ matrix.php }}-composer-
+            -   name: Update composer
+                run: composer self-update
+            -   name: Install dependencies with composer
+                run: composer update $DEFAULT_COMPOSER_FLAGS
+            -   name: Run unit tests
+                run: vendor/bin/phpunit --verbose --colors=always

.github/workflows/ecs.yml

@@ -0,0 +1,39 @@
+name: ecs
+
+on: [ push, pull_request, workflow_dispatch ]
+
+env:
+    DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi --ignore-platform-req=php"
+
+jobs:
+    easy-coding-standard:
+        name: PHP ${{ matrix.php }}-${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ ubuntu-latest ]
+                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
+
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   name: Install PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+            -   name: Determine composer cache directory
+                id: composer-cache
+                run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
+            -   name: Cache dependencies composer installed with composer
+                uses: actions/cache@v4
+                with:
+                    path: ${{ env.COMPOSER_CACHE_DIR }}
+                    key: php${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+                    restore-keys: php${{ matrix.php }}-composer-
+            -   name: Update composer
+                run: composer self-update
+            -   name: Install dependencies with composer
+                run: composer update $DEFAULT_COMPOSER_FLAGS
+            -   name: Run easy-coding-standard
+                run: vendor/bin/ecs check src tests --ansi

composer.json

@@ -32,7 +32,8 @@
     },
     "require-dev": {
         "yiisoft/yii2-coding-standards": "~2.0",
-        "phpunit/phpunit": "^9.5.21"
+        "phpunit/phpunit": "^9.6.22",
+        "symplify/easy-coding-standard": "^12.1"
     },
     "autoload": {
         "psr-4": {

ecs.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
+use PhpCsFixer\Fixer\ClassNotation\OrderedTraitsFixer;
+use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return ECSConfig::configure()
+    ->withConfiguredRule(
+        ClassDefinitionFixer::class,
+        [
+            'space_before_parenthesis' => true,
+        ],
+    )
+    ->withFileExtensions(['php'])
+    ->withPaths(
+        [
+            __DIR__ . '/src',
+            __DIR__ . '/tests',
+        ]
+    )
+    ->withPhpCsFixerSets(false, false, false, false, false, true)
+    ->withPreparedSets(
+        true,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        false,
+        true,
+        false,
+        false,
+        true,
+        true
+    )
+    ->withRules([NoUnusedImportsFixer::class, OrderedTraitsFixer::class]);

src/ActiveFixture.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @package yii2-rest-client
  * @author Simon Karlen <[email protected]>
@@ -35,8 +37,6 @@ class ActiveFixture extends BaseActiveFixture
 
 
     /**
-     * {@inheritDoc}
-     *
      * @throws InvalidConfigException
      */
     public function init()
@@ -51,8 +51,6 @@ public function init()
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @throws InvalidConfigException
      * @throws \ReflectionException
      */
@@ -65,10 +63,7 @@ public function load()
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @throws InvalidConfigException
-     * @throws \ReflectionException
      */
     protected function getData(): array
     {
@@ -85,9 +80,6 @@ protected function getData(): array
         return parent::getData();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function getModel($name)
     {
         if (!isset($this->data[$name])) {
@@ -101,14 +93,14 @@ public function getModel($name)
             throw new InvalidConfigException('The "modelClass" property must be set.');
         }
         $row = $this->data[$name];
-        /* @var $modelClass ActiveRecord */
+        /** @var ActiveRecord $modelClass */
         $modelClass = $this->modelClass;
         $keys = [];
         foreach ($modelClass::primaryKey() as $key) {
             $keys[$key] = $row[$key] ?? null;
         }
 
-        /* @var $model ActiveRecord */
+        /** @var ActiveRecord $model */
         $model = new $modelClass();
         $model->setOldAttributes($row);
         $model->setAttributes($row, false);