diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c2504cf0..ec04c5c5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,6 @@ For details, take a look at the following workflow configuration files: - [`workflows/integrate.yaml`](workflows/integrate.yaml) - [`workflows/merge.yaml`](workflows/merge.yaml) -- [`workflows/prune.yaml`](workflows/prune.yaml) - [`workflows/release.yaml`](workflows/release.yaml) - [`workflows/renew.yaml`](workflows/renew.yaml) - [`workflows/triage.yaml`](workflows/triage.yaml) diff --git a/.github/settings.yml b/.github/settings.yml index 1ada927f..2e77a18f 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -63,10 +63,6 @@ labels: color: "ee0701" description: "" - - name: "stale" - color: "eeeeee" - description: "" - # https://docs.github.com/en/rest/reference/repos#update-a-repository repository: diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 9fddbb19..e8216e7d 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -299,7 +299,6 @@ jobs: coverage: "none" extensions: "none, ctype, curl, dom, json, mbstring, pcntl, phar, posix, simplexml, tokenizer, xml, xmlwriter" php-version: "${{ matrix.php-version }}" - tools: "phive" - name: "Set up problem matchers for PHP" run: "echo \"::add-matcher::${{ runner.tool_cache }}/php.json\"" diff --git a/.github/workflows/prune.yaml b/.github/workflows/prune.yaml deleted file mode 100644 index 8b559cf3..00000000 --- a/.github/workflows/prune.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# https://docs.github.com/en/actions - -name: "Prune" - -on: # yamllint disable-line rule:truthy - schedule: - - cron: "0 12 * * *" - -env: - DAYS_BEFORE_CLOSE: 14 - DAYS_BEFORE_STALE: 180 - -jobs: - prune: - name: "Issues" - - runs-on: "ubuntu-latest" - - steps: - - name: "Prune issues and pull requests" - uses: "actions/stale@v7.0.0" - with: - days-before-close: "${{ env.DAYS_BEFORE_CLOSE }}" - days-before-stale: "${{ env.DAYS_BEFORE_STALE }}" - repo-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - stale-issue-label: "stale" - stale-issue-message: | - Since this issue has not had any activity within the last ${{ env.DAYS_BEFORE_STALE }} days, I have marked it as stale. - - I will close it if no further activity occurs within the next ${{ env.DAYS_BEFORE_CLOSE }} days. - stale-pr-label: "stale" - stale-pr-message: | - Since this pull request has not had any activity within the last ${{ env.DAYS_BEFORE_STALE }} days, I have marked it as stale. - - I will close it if no further activity occurs within the next ${{ env.DAYS_BEFORE_CLOSE }} days. diff --git a/README.md b/README.md index 356700b8..0929fc69 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Integrate](https://github.com/ergebnis/phpunit-slow-test-detector/workflows/Integrate/badge.svg)](https://github.com/ergebnis/phpunit-slow-test-detector/actions) [![Merge](https://github.com/ergebnis/phpunit-slow-test-detector/workflows/Merge/badge.svg)](https://github.com/ergebnis/phpunit-slow-test-detector/actions) -[![Prune](https://github.com/ergebnis/phpunit-slow-test-detector/workflows/Prune/badge.svg)](https://github.com/ergebnis/phpunit-slow-test-detector/actions) [![Release](https://github.com/ergebnis/phpunit-slow-test-detector/workflows/Release/badge.svg)](https://github.com/ergebnis/phpunit-slow-test-detector/actions) [![Renew](https://github.com/ergebnis/phpunit-slow-test-detector/workflows/Renew/badge.svg)](https://github.com/ergebnis/phpunit-slow-test-detector/actions) @@ -11,6 +10,7 @@ [![Latest Stable Version](https://poser.pugx.org/ergebnis/phpunit-slow-test-detector/v/stable)](https://packagist.org/packages/ergebnis/phpunit-slow-test-detector) [![Total Downloads](https://poser.pugx.org/ergebnis/phpunit-slow-test-detector/downloads)](https://packagist.org/packages/ergebnis/phpunit-slow-test-detector) +[![Monthly Downloads](http://poser.pugx.org/ergebnis/phpunit-slow-test-detector/d/monthly)](https://packagist.org/packages/ergebnis/phpunit-slow-test-detector) Provides an extension for detecting slow tests in [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit). @@ -168,6 +168,6 @@ Please have a look at [`LICENSE.md`](LICENSE.md). This project is inspired by [`johnkary/phpunit-speedtrap`](https://github.com/johnkary/phpunit-speedtrap). -## Curious what I am building? +## Curious what I am up to? -:mailbox_with_mail: [Subscribe to my list](https://localheinz.com/projects/), and I will occasionally send you an email to let you know what I am working on. +Follow me on [Twitter](https://twitter.com/intent/follow?screen_name=localheinz)! diff --git a/composer.json b/composer.json index 6040f740..16e10469 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "ergebnis/license": "^2.1.0", "ergebnis/php-cs-fixer-config": "^5.3.1", "fakerphp/faker": "^1.21.0", + "psalm/plugin-phpunit": "~0.18.4", "rector/rector": "~0.15.13", "vimeo/psalm": "^5.6.0" }, diff --git a/composer.lock b/composer.lock index 8c53b169..e470eadc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ce59f77cb97afe04f34fd1eb6fbfdb96", + "content-hash": "aae99e772b002e08a13dfcd24e3f4093", "packages": [ { "name": "myclabs/deep-copy", @@ -3421,6 +3421,66 @@ ], "time": "2023-02-07T10:42:21+00:00" }, + { + "name": "psalm/plugin-phpunit", + "version": "0.18.4", + "source": { + "type": "git", + "url": "https://github.com/psalm/psalm-plugin-phpunit.git", + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "shasum": "" + }, + "require": { + "composer/package-versions-deprecated": "^1.10", + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "ext-simplexml": "*", + "php": "^7.1 || ^8.0", + "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" + }, + "conflict": { + "phpunit/phpunit": "<7.5" + }, + "require-dev": { + "codeception/codeception": "^4.0.3", + "php": "^7.3 || ^8.0", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.3.1", + "weirdan/codeception-psalm-module": "^0.11.0", + "weirdan/prophecy-shim": "^1.0 || ^2.0" + }, + "type": "psalm-plugin", + "extra": { + "psalm": { + "pluginClass": "Psalm\\PhpUnitPlugin\\Plugin" + } + }, + "autoload": { + "psr-4": { + "Psalm\\PhpUnitPlugin\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Brown", + "email": "github@muglug.com" + } + ], + "description": "Psalm plugin for PHPUnit", + "support": { + "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" + }, + "time": "2022-12-03T07:47:07+00:00" + }, { "name": "psr/cache", "version": "3.0.0", diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 79bfeae1..089d5604 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -46,59 +46,9 @@ NullReporter - - - SleeperTest - - - - - SleeperTest - - - - - SleeperTest - - $this->milliseconds * 1000 - - - DurationComparatorTest - - - - - ColorTest - - - - - InvalidMaximumCountTest - - - - - InvalidMaximumDurationTest - - - - - DefaultDurationFormatterTest - - - - - MaximumCountTest - - - - - MaximumDurationTest - - diff --git a/psalm.xml b/psalm.xml index 22743aad..00713658 100644 --- a/psalm.xml +++ b/psalm.xml @@ -12,6 +12,10 @@ resolveFromConfigFile="true" strictBinaryOperands="true" > + + + + diff --git a/rector.php b/rector.php index 476bad81..759b5ec0 100644 --- a/rector.php +++ b/rector.php @@ -13,6 +13,7 @@ use Rector\Config; use Rector\Core; +use Rector\PHPUnit; return static function (Config\RectorConfig $rectorConfig): void { $rectorConfig->cacheDirectory(__DIR__ . '/.build/rector/'); @@ -25,4 +26,8 @@ ]); $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81); + + $rectorConfig->sets([ + PHPUnit\Set\PHPUnitSetList::PHPUNIT_90, + ]); };