Merge pull request #273 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template

Author: ergebnis-bot

.gitattributes

@@ -1,13 +1,12 @@
 /.github/                       export-ignore
+/.phive/                        export-ignore
 /test/                          export-ignore
-/tools/                         export-ignore
 /.editorconfig                  export-ignore
 /.gitattributes                 export-ignore
 /.gitignore                     export-ignore
 /.php_cs                        export-ignore
 /composer-require-checker.json  export-ignore
 /Makefile                       export-ignore
-/phive.xml                      export-ignore
 /phpstan-baseline.neon          export-ignore
 /phpstan.neon                   export-ignore
 /psalm-baseline.xml             export-ignore

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ergebnis-bot @localheinz

.github/actions/composer/composer/determine-cache-directory/action.yaml

@@ -13,4 +13,4 @@ runs:
   steps:
     - name: "Determine composer cache directory"
       shell: "bash"
-      run: "echo \"::set-env name=COMPOSER_CACHE_DIR::$(composer config cache-dir)\""
+      run: "echo \"COMPOSER_CACHE_DIR=$(composer config cache-dir)\" >> $GITHUB_ENV"

.github/actions/composer/composer/install/run.sh

@@ -3,21 +3,21 @@
 dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"
 
 if [[ ${dependencies} == "lowest" ]]; then
-  composer update --no-interaction --no-progress --no-suggest --prefer-lowest
+  composer update --no-interaction --no-progress --prefer-lowest
 
-  exit 0
+  exit $?
 fi
 
 if [[ ${dependencies} == "locked" ]]; then
-  composer install --no-interaction --no-progress --no-suggest
+  composer install --no-interaction --no-progress
 
-  exit 0
+  exit $?
 fi
 
 if [[ ${dependencies} == "highest" ]]; then
-  composer update --no-interaction --no-progress --no-suggest
+  composer update --no-interaction --no-progress
 
-  exit 0
+  exit $?
 fi
 
 echo "::error::The value for the \"dependencies\" input needs to be one of \"lowest\", \"locked\"', \"highest\"' - got \"${dependencies}\" instead."

.github/workflows/integrate.yaml

@@ -31,7 +31,7 @@ jobs:
         uses: "actions/checkout@v2.3.3"
 
       - name: "Lint YAML files"
-        uses: "ibiqlik/action-yamllint@v2"
+        uses: "ibiqlik/action-yamllint@v2.0.0"
         with:
           config_file: ".yamllint.yaml"
           file_or_dir: "."
@@ -72,7 +72,7 @@ jobs:
         uses: "actions/cache@v2.1.2"
         with:
           path: ".build/php-cs-fixer"
-          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
+          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"
@@ -118,7 +118,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Run maglnet/composer-require-checker"
-        run: "tools/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
+        run: ".phive/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
 
   static-code-analysis:
     name: "Static Code Analysis"
@@ -183,7 +183,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-psalm-"
 
       - name: "Run vimeo/psalm"
-        run: "vendor/bin/psalm --config=psalm.xml --diff --diff-methods --shepherd --show-info=false --stats --threads=4"
+        run: "vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"
 
   tests:
     name: "Tests"

.github/workflows/renew.yaml

@@ -61,7 +61,7 @@ jobs:
         uses: "actions/cache@v2.1.2"
         with:
           path: ".build/php-cs-fixer"
-          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
+          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"

tools/composer-require-checker renamed to .phive/composer-require-checker

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
 </phive>

phive.xml renamed to .phive/phars.xml

@@ -29,13 +29,13 @@ $license->save();
 $config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php71($license->header()));
 
 $config->getFinder()
-    ->ignoreDotFiles(false)
-    ->in(__DIR__)
     ->exclude([
         '.build/',
         '.github/',
         '.notes/',
     ])
+    ->ignoreDotFiles(false)
+    ->in(__DIR__)
     ->name('.php_cs');
 
 $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache');

.php_cs

@@ -10,7 +10,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
 
 .PHONY: dependency-analysis
 dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
-	tools/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json
+	.phive/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json
 
 .PHONY: help
 help: ## Displays this list of targets with descriptions
@@ -21,7 +21,7 @@ static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan
 	mkdir -p .build/phpstan
 	vendor/bin/phpstan analyse --configuration=phpstan.neon --memory-limit=-1
 	mkdir -p .build/psalm
-	vendor/bin/psalm --config=psalm.xml --diff --diff-methods --show-info=false --stats --threads=4
+	vendor/bin/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4
 
 .PHONY: static-code-analysis-baseline
 static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with phpstan/phpstan and vimeo/psalm
@@ -40,4 +40,4 @@ tests: vendor ## Runs auto-review, unit, and integration tests with phpunit/phpu
 
 vendor: composer.json composer.lock
 	composer validate --strict
-	composer install --no-interaction --no-progress --no-suggest
+	composer install --no-interaction --no-progress

Makefile

@@ -19,7 +19,7 @@
     "php": "^7.2"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.9.0",
+    "ergebnis/composer-normalize": "^2.10.0",
     "ergebnis/license": "^1.1.0",
     "ergebnis/php-cs-fixer-config": "^2.5.2",
     "ergebnis/phpstan-rules": "~0.15.3",
@@ -40,6 +40,12 @@
     "preferred-install": "dist",
     "sort-packages": true
   },
+  "extra": {
+    "composer-normalize": {
+      "indent-size": 2,
+      "indent-style": "space"
+    }
+  },
   "autoload": {
     "psr-4": {
       "Ergebnis\\Http\\": "src/"