diff --git a/.gitattributes b/.gitattributes index c2f9d60b..475c7f73 100644 --- 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 new file mode 100644 index 00000000..01c24919 --- /dev/null +++ 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 index a898fdaa..4842e88c 100644 --- 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 index 651bb93d..a6d0fe14 100644 --- 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 b/.phive/composer-normalize similarity index 100% rename from tools/composer-normalize rename to .phive/composer-normalize diff --git a/tools/composer-require-checker b/.phive/composer-require-checker similarity index 100% rename from tools/composer-require-checker rename to .phive/composer-require-checker diff --git a/Makefile b/Makefile index 09ae2532..3dd4d7d6 100644 --- 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 index d3797a55..fecbe904 100644 --- a/phive.xml +++ b/phive.xml @@ -1,5 +1,5 @@ - - + +