Merge pull request #581 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template
ergebnis · Oct 21, 2020 · 8c650dd · 8c650dd
2 parents c134131 + 0eb579c
commit 8c650dd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,8 @@
 /.github/                       export-ignore
+/.phive/                        export-ignore
 /bin/                           export-ignore
 /phar/                          export-ignore
 /test/                          export-ignore
-/tools/                         export-ignore
 /.editorconfig                  export-ignore
 /.gitattributes                 export-ignore
 /.gitignore                     export-ignore

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @ergebnis-bot @localheinz
diff --git a/.github/actions/composer/composer/determine-cache-directory/action.yaml b/.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"
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -66,7 +66,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Run ergebnis/composer-normalize"
-        run: "tools/composer-normalize --dry-run"
+        run: ".phive/composer-normalize --dry-run"
 
       - name: "Create cache directory for friendsofphp/php-cs-fixer"
         run: "mkdir -p .build/php-cs-fixer"
@@ -121,7 +121,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"

diff --git a/tools/composer-normalize → .phive/composer-normalize b/tools/composer-normalize → .phive/composer-normalize
diff --git a/tools/composer-require-checker → .phive/composer-require-checker b/tools/composer-require-checker → .phive/composer-require-checker
diff --git a/Makefile b/Makefile
@@ -10,14 +10,14 @@ code-coverage: vendor ## Collects coverage from running integration tests with p
 
 .PHONY: coding-standards
 coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-normalize, lints YAML files with yamllint and fixes code style issues with friendsofphp/php-cs-fixer
-	tools/composer-normalize
+	.phive/composer-normalize
 	yamllint -c .yamllint.yaml --strict .
 	mkdir -p .build/php-cs-fixer
 	vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose
 
 .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

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