Merge pull request #94 from Codeception/code-style

Code style

.github/workflows/static-analysis.yml

@@ -0,0 +1,43 @@
+name: Static analysis
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ phpcs:
+ name: Code style
+ runs-on: ubuntu-latest
+
+ steps:
+ - 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, phpstan
+
+ - name: Validate composer.json
+ run: composer validate
+
+ - name: Install dependencies
+ run: composer update
+
+ - name: Generate action files
+ run: vendor/bin/codecept build
+
+ - name: Check production code style
+ run: phpcs src/
+
+ - name: Check test code style
+ run: phpcs tests/ --standard=tests/phpcs.xml
+
+ - name: Static analysis of production code
+ run: phpstan analyze src/ --level=1
+
+ - name: Static analysis of test code
+ run: phpstan analyze tests/

composer.json

@@ -33,6 +33,15 @@
  "autoload":{
  "classmap": ["src/"]
  },
+ "autoload-dev": {
+ "classmap": [
+ "tests/data/app/data.php",
+ "tests/unit/Codeception/Constraints/TestedWebElement.php"
+ ],
+ "psr-4": {
+ "Tests\\Web\\": "tests/web/"
+ }
+ },
  "config": {
  "classmap-authoritative": true
  }

phpcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ruleset name="Codeception">
+ <description>Codeception code standard</description>
+ <rule ref="PSR12">
+ <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+ </rule>
+</ruleset>

src/Codeception/Constraint/WebDriver.php

@@ -54,7 +54,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
  }
 
  $output = "Failed asserting that any element by " . Locator::humanReadableString($selector);
- $output .= $this->uriMessage('on page');
+ $output .= ' ' . $this->uriMessage('on page');
 
  if (count($nodes) < 5) {
  $output .= "\nElements: ";

src/Codeception/Constraint/WebDriverNot.php

@@ -38,7 +38,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
  }
 
  $output = "There was {$selector} element";
- $output .= $this->uriMessage("on page");
+ $output .= ' ' . $this->uriMessage('on page');
  $output .= $this->nodesList($nodes, $this->string);
  $output .= "\ncontaining '{$this->string}'";