From fc4a22ae1b1ddd0ea459308e79759fcb98aa6034 Mon Sep 17 00:00:00 2001
From: Petr Parolek <petr.parolek@gmail.com>
Date: Mon, 28 Jun 2021 13:08:28 +0200
Subject: [PATCH] Codestyle: improvements (#4)

---
 .editorconfig               |   2 +-
 .github/workflows/main.yaml | 400 ++++++++++++++++++------------------
 composer.json               |   7 +-
 3 files changed, 211 insertions(+), 198 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 575834a..3faf149 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json,*.yml,*.md}]
+[{*.json, *.yaml, *.yml, *.md}]
 indent_style = space
 indent_size = 2
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 8100195..84afdcc 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -1,202 +1,210 @@
 name: "build"
 
-on: [ push, pull_request ]
+on:
+  pull_request:
+    paths-ignore:
+      - ".docs/**"
+  push:
+    branches:
+      - "*"
+  schedule:
+    - cron: "0 8 * * 1" # At 08:00 on Monday
 
 env:
-    extensions: "json"
-    cache-version: "1"
-    composer-version: "v1"
-    composer-install: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
+  extensions: "json"
+  cache-version: "1"
+  composer-version: "v1"
+  composer-install: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
 
 jobs:
-    qa:
-        name: "Quality assurance"
-        runs-on: "${{ matrix.operating-system }}"
-
-        strategy:
-            matrix:
-                php-version: [ "7.4" ]
-                operating-system: [ "ubuntu-latest" ]
-            fail-fast: false
-
-        steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v2"
-
-            -   name: "Setup PHP cache environment"
-                id: "extcache"
-                uses: "shivammathur/cache-extensions@v1"
-                with:
-                    php-version: "${{ matrix.php-version }}"
-                    extensions: "${{ env.extensions }}"
-                    key: "${{ env.cache-version }}"
-
-            -   name: "Cache PHP extensions"
-                uses: "actions/cache@v2"
-                with:
-                    path: "${{ steps.extcache.outputs.dir }}"
-                    key: "${{ steps.extcache.outputs.key }}"
-                    restore-keys: "${{ steps.extcache.outputs.key }}"
-
-            -   name: "Install PHP"
-                uses: "shivammathur/setup-php@v2"
-                with:
-                    php-version: "${{ matrix.php-version }}"
-                    extensions: "${{ env.extensions }}"
-                    tools: "composer:${{ env.composer-version }} "
-
-            -   name: "Setup problem matchers for PHP"
-                run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
-
-            -   name: "Get Composer cache directory"
-                id: "composercache"
-                run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
-
-            -   name: "Cache PHP dependencies"
-                uses: "actions/cache@v2"
-                with:
-                    path: "${{ steps.composercache.outputs.dir }}"
-                    key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
-                    restore-keys: "${{ runner.os }}-composer-"
-
-            -   name: "Validate Composer"
-                run: "composer validate"
-
-            -   name: "Install dependencies"
-                run: "${{ env.composer-install }}"
-
-            -   name: "Coding Standard"
-                run: "make cs"
-    tests:
-        name: "Tests"
-        runs-on: "${{ matrix.operating-system }}"
-
-        strategy:
-            matrix:
-                php-version: [ "7.2", "7.3", "7.4" ]
-                operating-system: [ "ubuntu-latest" ]
-                composer-args: [ "" ]
-                include:
-                    -   php-version: "7.4"
-                        operating-system: "ubuntu-latest"
-                        composer-args: "--prefer-lowest"
-                    -   php-version: "7.2"
-                        operating-system: "ubuntu-latest"
-                        composer-args: ""
-            fail-fast: false
-
-        steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v2"
-
-            -   name: "Setup PHP cache environment"
-                id: "extcache"
-                uses: "shivammathur/cache-extensions@v1"
-                with:
-                    php-version: "${{ matrix.php-version }}"
-                    extensions: "${{ env.extensions }}"
-                    key: "${{ env.cache-version }}"
-
-            -   name: "Cache PHP extensions"
-                uses: "actions/cache@v2"
-                with:
-                    path: "${{ steps.extcache.outputs.dir }}"
-                    key: "${{ steps.extcache.outputs.key }}"
-                    restore-keys: "${{ steps.extcache.outputs.key }}"
-
-            -   name: "Install PHP"
-                uses: "shivammathur/setup-php@v2"
-                with:
-                    php-version: "${{ matrix.php-version }}"
-                    extensions: "${{ env.extensions }}"
-                    tools: "composer:${{ env.composer-version }} "
-
-            -   name: "Setup problem matchers for PHP"
-                run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
-
-            -   name: "Get Composer cache directory"
-                id: "composercache"
-                run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
-
-            -   name: "Cache PHP dependencies"
-                uses: "actions/cache@v2"
-                with:
-                    path: "${{ steps.composercache.outputs.dir }}"
-                    key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
-                    restore-keys: "${{ runner.os }}-composer-"
-
-            -   name: "Install dependencies"
-                run: "${{ env.composer-install }} ${{ matrix.composer-args }}"
-
-            -   name: "Setup problem matchers for PHPUnit"
-                run: 'echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"'
-
-            -   name: "Tests"
-                run: "make tests"
-
-    tests-code-coverage:
-        name: "Tests with code coverage"
-        runs-on: "${{ matrix.operating-system }}"
-
-        strategy:
-            matrix:
-                php-version: ["7.4"]
-                operating-system: ["ubuntu-latest"]
-            fail-fast: false
-
-        if: "github.event_name == 'push'"
-
-        steps:
-            - name: "Checkout"
-              uses: "actions/checkout@v2"
-
-            - name: "Setup PHP cache environment"
-              id: "extcache"
-              uses: "shivammathur/cache-extensions@v1"
-              with:
-                  php-version: "${{ matrix.php-version }}"
-                  extensions: "${{ env.extensions }}"
-                  key: "${{ env.cache-version }}"
-
-            - name: "Cache PHP extensions"
-              uses: "actions/cache@v2"
-              with:
-                  path: "${{ steps.extcache.outputs.dir }}"
-                  key: "${{ steps.extcache.outputs.key }}"
-                  restore-keys: "${{ steps.extcache.outputs.key }}"
-
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
-              with:
-                  php-version: "${{ matrix.php-version }}"
-                  extensions: "${{ env.extensions }}"
-                  tools: "composer:${{ env.composer-version }} "
-
-            - name: "Setup problem matchers for PHP"
-              run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
-
-            - name: "Get Composer cache directory"
-              id: "composercache"
-              run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
-
-            - name: "Cache PHP dependencies"
-              uses: "actions/cache@v2"
-              with:
-                  path: "${{ steps.composercache.outputs.dir }}"
-                  key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
-                  restore-keys: "${{ runner.os }}-composer-"
-
-            - name: "Install dependencies"
-              run: "${{ env.composer-install }}"
-
-            - name: "Tests"
-              run: "make coverage-clover"
-
-            - name: "Coveralls.io"
-              env:
-                  CI_NAME: github
-                  CI: true
-                  COVERALLS_REPO_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-              run: |
-                  wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
-                  php php-coveralls.phar --verbose --config tests/.coveralls.yml
+  qa:
+    name: "Quality assurance"
+    runs-on: "${{ matrix.operating-system }}"
+
+    strategy:
+      matrix:
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
+      fail-fast: false
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP cache environment"
+        id: "extcache"
+        uses: "shivammathur/cache-extensions@v1"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          key: "${{ env.cache-version }}"
+
+      - name: "Cache PHP extensions"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.extcache.outputs.dir }}"
+          key: "${{ steps.extcache.outputs.key }}"
+          restore-keys: "${{ steps.extcache.outputs.key }}"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          tools: "composer:${{ env.composer-version }} "
+
+      - name: "Setup problem matchers for PHP"
+        run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
+
+      - name: "Get Composer cache directory"
+        id: "composercache"
+        run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
+
+      - name: "Cache PHP dependencies"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.composercache.outputs.dir }}"
+          key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "${{ runner.os }}-composer-"
+
+      - name: "Validate Composer"
+        run: "composer validate"
+
+      - name: "Install dependencies"
+        run: "${{ env.composer-install }}"
+
+      - name: "Coding Standard"
+        run: "make cs"
+  tests:
+    name: "Tests"
+    runs-on: "${{ matrix.operating-system }}"
+
+    strategy:
+      matrix:
+        php-version: [ "7.2", "7.3", "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
+        composer-args: [ "" ]
+        include:
+          - php-version: "7.4"
+            operating-system: "ubuntu-latest"
+            composer-args: "--prefer-lowest"
+          - php-version: "7.2"
+            operating-system: "ubuntu-latest"
+            composer-args: ""
+      fail-fast: false
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP cache environment"
+        id: "extcache"
+        uses: "shivammathur/cache-extensions@v1"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          key: "${{ env.cache-version }}"
+
+      - name: "Cache PHP extensions"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.extcache.outputs.dir }}"
+          key: "${{ steps.extcache.outputs.key }}"
+          restore-keys: "${{ steps.extcache.outputs.key }}"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          tools: "composer:${{ env.composer-version }} "
+
+      - name: "Setup problem matchers for PHP"
+        run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
+
+      - name: "Get Composer cache directory"
+        id: "composercache"
+        run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
+
+      - name: "Cache PHP dependencies"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.composercache.outputs.dir }}"
+          key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "${{ runner.os }}-composer-"
+
+      - name: "Install dependencies"
+        run: "${{ env.composer-install }} ${{ matrix.composer-args }}"
+
+      - name: "Setup problem matchers for PHPUnit"
+        run: 'echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"'
+
+      - name: "Tests"
+        run: "make tests"
+
+  tests-code-coverage:
+    name: "Tests with code coverage"
+    runs-on: "${{ matrix.operating-system }}"
+
+    strategy:
+      matrix:
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
+      fail-fast: false
+
+    if: "github.event_name == 'push'"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Setup PHP cache environment"
+        id: "extcache"
+        uses: "shivammathur/cache-extensions@v1"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          key: "${{ env.cache-version }}"
+
+      - name: "Cache PHP extensions"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.extcache.outputs.dir }}"
+          key: "${{ steps.extcache.outputs.key }}"
+          restore-keys: "${{ steps.extcache.outputs.key }}"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "${{ env.extensions }}"
+          tools: "composer:${{ env.composer-version }} "
+
+      - name: "Setup problem matchers for PHP"
+        run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
+
+      - name: "Get Composer cache directory"
+        id: "composercache"
+        run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
+
+      - name: "Cache PHP dependencies"
+        uses: "actions/cache@v2"
+        with:
+          path: "${{ steps.composercache.outputs.dir }}"
+          key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "${{ runner.os }}-composer-"
+
+      - name: "Install dependencies"
+        run: "${{ env.composer-install }}"
+
+      - name: "Tests"
+        run: "make coverage-clover"
+
+      - name: "Coveralls.io"
+        env:
+          CI_NAME: github
+          CI: true
+          COVERALLS_REPO_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
+          php php-coveralls.phar --verbose --config tests/.coveralls.yml
diff --git a/composer.json b/composer.json
index 0794c53..cc9d1b7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,12 @@
 {
   "name": "contributte/doctrine-gedmo",
   "description": "Doctrine2 behavioral extensions for Nette Framework",
-  "keywords": ["nette", "doctrine", "orm", "database"],
+  "keywords": [
+    "nette",
+    "doctrine",
+    "orm",
+    "database"
+  ],
   "type": "library",
   "license": "MIT",
   "homepage": "https://github.com/contributte/doctrine-gedmo",