Code styling (#22)

* merge workflows

* Set Dockerfile indent (#23)

* fix indentation

* tweak editor config

* add spacing

* tweak json

Co-authored-by: Viktor Szépe <[email protected]>

Author: tillkruss

.editorconfig

@@ -14,5 +14,11 @@ block_comment_end = */
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml,neon}]
+[*.{xml,yml,yaml,neon,json}]
+indent_size = 2
+
+[*.{xml,yml,yaml,neon,json}.dist]
+indent_size = 2
+
+[*.Dockerfile]
 indent_size = 2

.github/workflows/cs.yml

@@ -1,18 +1,18 @@
-name: Analyse code
+name: Code style
 
-on: push
+on: [push, pull_request]
 
 jobs:
 
-  analyse:
+  phpstan:
 
-    name: Analyse
+    name: PHPStan
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,4 +27,17 @@ jobs:
         run: wget https://cachewerk.s3.amazonaws.com/relay/dev/relay.stub.php
 
       - name: Run PHPStan
-        run: composer run analyse
+        run: composer run stan
+
+  editorconfig:
+
+    name: EditorConfig
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check EditorConfig
+        uses: greut/eclint-action@v0

.github/workflows/analyse.yml .github/workflows/style.yml

@@ -4,9 +4,9 @@
     "type": "library",
     "license": "MIT",
     "scripts": {
-        "analyse": "phpstan analyse",
         "bench": "phpbench run --report=redis",
-        "bench:verbose": "phpbench run --report=redis --progress=blinken"
+        "bench:verbose": "phpbench run --report=redis --progress=blinken",
+        "stan": "phpstan analyse"
     },
     "require": {
         "php": "^7.4|^8.0",

composer.json

@@ -10,12 +10,12 @@ RUN yum remove php*
 RUN amazon-linux-extras enable php8.0
 
 RUN yum install -y \
- php-cli \
- php-fpm \
- php-pear \
- php-devel \
- openssl11 \
- libzstd-devel
+  php-cli \
+  php-fpm \
+  php-pear \
+  php-devel \
+  openssl11 \
+  libzstd-devel
 
 RUN pecl config-set php_ini /etc/php.ini
 

docker/amzn2.Dockerfile

@@ -1,11 +1,15 @@
 parameters:
+
   level: max
+
   scanFiles:
     - relay.stub.php
+
   paths:
     - benchmarks/
     - resources/
     - src/
+
   ignoreErrors:
     - '#Parameter .+? expects Redis, Relay\\Relay given#'
     - '#Return type \(Relay\\Relay\) of method .+? should be compatible with return type \(Redis\) of method#'