Skip to content

Commit

Permalink
Enhancement: Synchronize with ergebnis/php-package-template
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Jan 7, 2025
1 parent 272c505 commit 2c5f56d
Showing 7 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CONTRIBUTING
# Contributing

We use [GitHub Actions](https://github.com/features/actions) as a continuous integration system.

4 changes: 2 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ updates:
open-pull-requests-limit: 10
package-ecosystem: "composer"
schedule:
interval: "daily"
interval: "weekly"
versioning-strategy: "increase"

- commit-message:
@@ -26,4 +26,4 @@ updates:
open-pull-requests-limit: 10
package-ecosystem: "github-actions"
schedule:
interval: "daily"
interval: "weekly"
6 changes: 6 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -22,16 +22,22 @@ branches:
- context: "Security Analysis (7.4, locked)"
- context: "Static Code Analysis (7.4, locked)"
- context: "Tests (7.4, highest)"
- context: "Tests (7.4, locked)"
- context: "Tests (7.4, lowest)"
- context: "Tests (8.0, highest)"
- context: "Tests (8.0, locked)"
- context: "Tests (8.0, lowest)"
- context: "Tests (8.1, highest)"
- context: "Tests (8.1, locked)"
- context: "Tests (8.1, lowest)"
- context: "Tests (8.2, highest)"
- context: "Tests (8.2, locked)"
- context: "Tests (8.2, lowest)"
- context: "Tests (8.3, highest)"
- context: "Tests (8.3, locked)"
- context: "Tests (8.3, lowest)"
- context: "Tests (8.4, highest)"
- context: "Tests (8.4, locked)"
- context: "Tests (8.4, lowest)"
strict: false
restrictions:
5 changes: 1 addition & 4 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
@@ -426,6 +426,7 @@ jobs:

dependencies:
- "lowest"
- "locked"
- "highest"

steps:
@@ -458,10 +459,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove incompatible dependencies with composer"
if: "matrix.dependencies != 'locked'"
run: "composer remove ergebnis/composer-normalize ergebnis/license ergebnis/php-cs-fixer-config infection/infection psalm/plugin-phpunit rector/rector vimeo/psalm --ansi --dev --no-interaction --no-progress"

- name: "Remove platform configuration with composer"
if: "matrix.dependencies != 'locked'"
run: "composer config platform.php --ansi --unset"
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
.PHONY: it
it: refactoring coding-standards security-analysis static-code-analysis tests ## Runs the refactoring, coding-standards, security-analysis, static-code-analysis, and tests targets

.PHONY: backward-compatibility-analysis
backward-compatibility-analysis: vendor ## Runs a backward-compatibility analysis with roave/backward-compatibility-check
vendor/bin/roave-backward-compatibility-check

.PHONY: code-coverage
code-coverage: vendor ## Collects coverage from running unit tests with phpunit/phpunit
code-coverage: vendor ## Collects code coverage from running unit tests with phpunit/phpunit
vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text

.PHONY: coding-standards
4 changes: 3 additions & 1 deletion rector.php
Original file line number Diff line number Diff line change
@@ -24,9 +24,11 @@
__DIR__ . '/src/',
__DIR__ . '/test/Unit/',
__DIR__ . '/test/Util/',
__DIR__ . '/.php-cs-fixer.php',
__DIR__ . '/rector.php',
]);

$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_73);
$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_74);

$rectorConfig->sets([
PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
3 changes: 0 additions & 3 deletions test/Unit/phpunit.xml
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@
verbose="true"
>
<coverage>
<exclude>
<directory suffix=".php">../../src/Subscriber/</directory>
</exclude>
<include>
<directory suffix=".php">../../src/</directory>
</include>

0 comments on commit 2c5f56d

Please sign in to comment.