Merge pull request #90 from Codeception/improve-types

Improve types and code style

Author: Naktibalda

.github/workflows/main.yml

@@ -3,6 +3,25 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+  phpcs:
+    name: Code style
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          ini-values: memory_limit=-1, date.timezone='UTC'
+          tools: phpcs
+
+      - name: Check production code style
+        run: phpcs src/
+
+      - name: Check test code style
+        run: phpcs tests/ --standard=tests/phpcs.xml
   tests:
     runs-on: ubuntu-latest
 
@@ -11,7 +30,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1]
+        php: [8.0, 8.1, 8.2]
 
     steps:
     - name: Checkout code

phpcs.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset name="Codeception">
+    <description>Codeception code standard</description>
+    <rule ref="PSR12">
+        <exclude name="Generic.Files.LineLength.TooLong"/>
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
+    </rule>
+</ruleset>

src/Codeception/Constraint/JsonContains.php

@@ -16,14 +16,8 @@
 
 class JsonContains extends Constraint
 {
-    /**
-     * @var array
-     */
-    protected $expected;
-
-    public function __construct(array $expected)
+    public function __construct(protected array $expected)
     {
-        $this->expected = $expected;
     }
 
     /**

src/Codeception/Constraint/JsonType.php

@@ -13,26 +13,17 @@
 
 class JsonType extends Constraint
 {
-    /**
-     * @var array
-     */
-    protected $jsonType;
-    /**
-     * @var bool
-     */
-    private $match;
-
-    public function __construct(array $jsonType, bool $match = true)
-    {
-        $this->jsonType = $jsonType;
-        $this->match = $match;
+    public function __construct(
+        protected array $jsonType,
+        private bool $match = true
+    ) {
     }
 
     /**
      * Evaluates the constraint for parameter $other. Returns true if the
      * constraint is met, false otherwise.
      *
-     * @param mixed $jsonArray Value or object to evaluate.
+     * @param array|JsonArray $jsonArray Value or object to evaluate.
      */
     protected function matches($jsonArray): bool
     {