From 4dce4154e894ccacf5a731c5785c0571d28305a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 6 Jan 2024 17:42:56 +0100 Subject: [PATCH] Enhancement: Synchronize with ergebnis/php-package-template --- .github/dependabot.yaml | 2 +- .github/settings.yml | 2 +- .github/workflows/integrate.yaml | 11 +---------- .github/workflows/release.yaml | 13 +++++++++++++ .github/workflows/renew.yaml | 5 +---- Makefile | 10 +--------- README.md | 4 ++-- psalm-baseline.xml | 2 +- 8 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index da211c1e..fdebab6f 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1,4 +1,4 @@ -# https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 diff --git a/.github/settings.yml b/.github/settings.yml index b7b33712..b973fa32 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -82,7 +82,7 @@ repository: archived: false default_branch: "main" delete_branch_on_merge: true - description: ":briefcase: Provides an abstraction of an open-source license." + description: "💼 Provides a composer package with an abstraction of an open-source license." enable_automated_security_fixes: true enable_vulnerability_alerts: true has_discussions: false diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index b54fffb2..d2e16b4c 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -127,9 +127,6 @@ jobs: - name: "Run ergebnis/composer-normalize" run: "composer normalize --ansi --dry-run" - - name: "Create cache directory for friendsofphp/php-cs-fixer" - run: "mkdir -p .build/php-cs-fixer/" - - name: "Cache cache directory for friendsofphp/php-cs-fixer" uses: "actions/cache@v3.3.2" with: @@ -140,7 +137,7 @@ jobs: php-${{ matrix.php-version }}-php-cs-fixer- - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose" + run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --show-progress=dots --verbose" dependency-analysis: name: "Dependency Analysis" @@ -297,9 +294,6 @@ jobs: with: dependencies: "${{ matrix.dependencies }}" - - name: "Create cache directory for rector/rector" - run: "mkdir -p .build/rector/" - - name: "Cache cache directory for rector/rector" uses: "actions/cache@v3.3.2" with: @@ -409,9 +403,6 @@ jobs: with: dependencies: "${{ matrix.dependencies }}" - - name: "Create cache directory for vimeo/psalm" - run: "mkdir -p .build/psalm/" - - name: "Run vimeo/psalm" run: "vendor/bin/psalm --config=psalm.xml --output-format=github --shepherd --show-info=false --stats --threads=4" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dc949a58..7e2f16ee 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,3 +20,16 @@ jobs: uses: "ergebnis/.github/actions/github/release/create@1.9.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" + + - name: "Post to twitter.com about release" + uses: "Eomm/why-don-t-you-tweet@v1.1.0" + env: + TWITTER_ACCESS_TOKEN: "${{ secrets.ERGEBNIS_TWITTER_ACCESS_TOKEN }}" + TWITTER_ACCESS_TOKEN_SECRET: "${{ secrets.ERGEBNIS_TWITTER_ACCESS_TOKEN_SECRET }}" + TWITTER_CONSUMER_API_KEY: "${{ secrets.ERGEBNIS_TWITTER_CONSUMER_API_KEY }}" + TWITTER_CONSUMER_API_SECRET: "${{ secrets.ERGEBNIS_TWITTER_CONSUMER_API_KEY_SECRET }}" + with: + tweet-message: | + 💼 Just released: ${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}:${{ env.RELEASE_TAG }}. + + ${{ env.RELEASE_HTML_URL }} diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index e18cd4cc..0899980f 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -56,9 +56,6 @@ jobs: with: dependencies: "${{ matrix.dependencies }}" - - name: "Create cache directory for friendsofphp/php-cs-fixer" - run: "mkdir -p .build/php-cs-fixer" - - name: "Cache cache directory for friendsofphp/php-cs-fixer" uses: "actions/cache@v3.3.2" with: @@ -69,7 +66,7 @@ jobs: php-${{ matrix.php-version }}-php-cs-fixer- - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --verbose" + run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --show-progress=dots --verbose" - name: "Commit modified files" uses: "stefanzweifel/git-auto-commit-action@v5.0.0" diff --git a/Makefile b/Makefile index f693f4e2..64ea7005 100644 --- a/Makefile +++ b/Makefile @@ -3,15 +3,13 @@ it: refactoring coding-standards security-analysis static-code-analysis tests ## .PHONY: code-coverage code-coverage: vendor ## Collects coverage from running unit tests with phpunit/phpunit - mkdir -p .build/phpunit/ vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text .PHONY: coding-standards coding-standards: vendor ## Lints YAML files with yamllint, normalizes composer.json with ergebnis/composer-normalize, and fixes code style issues with friendsofphp/php-cs-fixer yamllint -c .yamllint.yaml --strict . composer normalize - mkdir -p .build/php-cs-fixer/ - vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose + vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose .PHONY: dependency-analysis dependency-analysis: phive vendor ## Runs a dependency analysis with maglnet/composer-require-checker @@ -23,17 +21,14 @@ help: ## Displays this list of targets with descriptions .PHONY: mutation-tests mutation-tests: vendor ## Runs mutation tests with infection/infection - mkdir -p .build/infection/ vendor/bin/infection --configuration=infection.json .PHONY: phive phive: .phive ## Installs dependencies with phive - mkdir -p .build/phive/ PHIVE_HOME=.build/phive phive install --trust-gpg-keys 0x033E5F8D801A2F8D .PHONY: refactoring refactoring: vendor ## Runs automated refactoring with rector/rector - mkdir -p .build/rector/ vendor/bin/rector process --config=rector.php .PHONY: security-analysis @@ -42,19 +37,16 @@ security-analysis: vendor ## Runs a security analysis with composer .PHONY: static-code-analysis static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm - mkdir -p .build/psalm/ vendor/bin/psalm --config=psalm.xml --clear-cache vendor/bin/psalm --config=psalm.xml --show-info=false --stats --threads=4 .PHONY: static-code-analysis-baseline static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with vimeo/psalm - mkdir -p .build/psalm/ vendor/bin/psalm --config=psalm.xml --clear-cache vendor/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml .PHONY: tests tests: vendor ## Runs unit tests with phpunit/phpunit - mkdir -p .build/phpunit/ vendor/bin/phpunit --configuration=test/Unit/phpunit.xml vendor: composer.json composer.lock diff --git a/README.md b/README.md index 8b4b11c2..4d6805fc 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ $license = License\Type\MIT::text( __DIR__ . '/LICENSE', License\Range::since( License\Year::fromString('2020'), - new \DateTimeZone('UTC') + new DateTimeZone('UTC') ), License\Holder::fromString('Andreas Möller'), License\Url::fromString('https://github.com/ergebnis/license') @@ -104,7 +104,7 @@ use PhpCsFixer\Finder; $license = License\Type\None::text( License\Range::since( License\Year::fromString('2020'), - new \DateTimeZone('UTC') + new DateTimeZone('UTC') ), License\Holder::fromString('Andreas Möller'), License\Url::fromString('https://github.com/localheinz/localheinz.com') diff --git a/psalm-baseline.xml b/psalm-baseline.xml index c58d6043..4a12f939 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + return !\is_string($key);