.github/renovate.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "packageRules": [
+    {
+      "managers": ["composer"],
+      "rangeStrategy": "in-range-only"
+    },
+    {
+      "managers": ["composer"],
+      "rangeStrategy": "bump"
+    },
+    {
+      "managers": ["composer"],
+      "matchPackageNames": ["php"],
+      "enabled": false
+    }
+  ],
+  "extends": [
+    "config:base",
+    ":widenPeerDependencies",
+    ":rebaseStalePrs",
+    ":prHourlyLimitNone",
+    ":prConcurrentLimitNone",
+    "group:phpstan"
+  ]
+}

.github/workflows/ci.yml

@@ -6,177 +6,12 @@ on:
       - 'master'
       - 'refs/heads/v[0-9]+.[0-9]+.[0-9]+'
   pull_request:
+## This workflow needs the `pull-request` permissions to work for the package diffing
+## Refs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#permissions
+permissions:
+  pull-requests: write
+  contents: read
 jobs:
-  package-name:
-    name: Package Name
-    runs-on: ubuntu-latest
-    needs:
-      - lint-json
-    outputs:
-      package-name: ${{ steps.package-name.outputs.package-name }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: package-name
-        run: |
-          printf "::set-output name=package-name::[\"%s\"]" $(docker run --rm -v "`pwd`:`pwd`" jess/jq jq -r -c '.name' "${GITHUB_WORKSPACE}/composer.json")
-  supported-versions-matrix:
-    name: Supported Versions Matrix
-    runs-on: ubuntu-latest
-    needs:
-      - lint-yaml
-      - lint-json
-    outputs:
-      version: ${{ steps.supported-versions-matrix.outputs.version }}
-      upcoming: ${{ steps.supported-versions-matrix.outputs.upcoming }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: supported-versions-matrix
-        uses: WyriHaximus/github-action-composer-php-versions-in-range@v1
-        with:
-          upcomingReleases: true
-  supported-checks-matrix:
-    name: Supported Checks Matrix
-    runs-on: ubuntu-latest
-    needs:
-      - lint-yaml
-    outputs:
-      check: ${{ steps.supported-checks-matrix.outputs.check }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: supported-checks-matrix
-        name: Generate check
-        run: |
-          printf "Checks found: %s\r\n" $(make task-list-ci)
-          printf "::set-output name=check::%s" $(make task-list-ci)
-  can-require:
-    name: Test we can require "${{ matrix.package-name }}" on PHP ${{ matrix.php }}
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
-        package-name: ${{ fromJson(needs.package-name.outputs.package-name) }}
-    needs:
-      - lint-yaml
-      - lint-json
-      - package-name
-      - supported-versions-matrix
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/wyrihaximusnet/php:${{ matrix.php }}-nts-buster-dev-root
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          path: checked_out_package
-      - name: Set Up composer.json
-        run: |
-          echo "{\"repositories\": [{\"name\": \"${{ matrix.package-name }}\",\"type\": \"path\",\"url\": \"./checked_out_package\"}]}" > composer.json
-      - name: Require package
-        if: needs.supported-versions-matrix.outputs.upcoming != matrix.php
-        run: |
-          composer config --no-plugins "allow-plugins.*/*" true
-          composer require "${{ matrix.package-name }}:dev-${GITHUB_SHA}" --no-progress --ansi --no-interaction --prefer-dist -o -vvv || composer require "${{ matrix.package-name }}:dev-${GITHUB_REF_NAME}" --no-progress --ansi --no-interaction --prefer-dist -o -vvv
-  qa:
-    name: Run ${{ matrix.check }} on PHP ${{ matrix.php }} with ${{ matrix.composer }} dependency preference
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
-        composer: [lowest, locked, highest]
-        check: ${{ fromJson(needs.supported-checks-matrix.outputs.check) }}
-    needs:
-      - lint-yaml
-      - lint-json
-      - supported-checks-matrix
-      - supported-versions-matrix
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/wyrihaximusnet/php:${{ matrix.php }}-nts-buster-dev-root
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: ${{ matrix.composer }}
-      - run: git config --global --add safe.directory $GITHUB_WORKSPACE # Do this ourself because `actions/checkout@v3 doesn't succeed in doing this
-      - name: Fetch Tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true
-        if: matrix.check == 'backward-compatibility-check'
-      - run: make ${{ matrix.check }} || true
-        if: needs.supported-versions-matrix.outputs.upcoming == matrix.php
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          COVERALLS_RUN_LOCALLY: ${{ secrets.COVERALLS_RUN_LOCALLY }}
-      - run: make ${{ matrix.check }}
-        if: needs.supported-versions-matrix.outputs.upcoming != matrix.php
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          COVERALLS_RUN_LOCALLY: ${{ secrets.COVERALLS_RUN_LOCALLY }}
-  tests-directly-on-os:
-    name: Run tests on PHP ${{ matrix.php }} with ${{ matrix.composer }} dependency preference (${{ matrix.os }})
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
-        composer: [lowest, locked, highest]
-    needs:
-      - lint-yaml
-      - lint-json
-      - supported-checks-matrix
-      - supported-versions-matrix
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: pcov
-          extensions: intl, sodium
-      - uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: ${{ matrix.composer }}
-      - run: make unit-testing-raw || true
-        if: needs.supported-versions-matrix.outputs.upcoming == matrix.php
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          COVERALLS_RUN_LOCALLY: ${{ secrets.COVERALLS_RUN_LOCALLY }}
-      - run: make unit-testing-raw
-        if: needs.supported-versions-matrix.outputs.upcoming != matrix.php
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          COVERALLS_RUN_LOCALLY: ${{ secrets.COVERALLS_RUN_LOCALLY }}
-  lint-yaml:
-    name: Lint YAML
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: yaml-lint
-        uses: ibiqlik/action-yamllint@v3
-        with:
-          config_data: |
-            extends: default
-            ignore: |
-              /.git/
-            rules:
-              line-length: disable
-              document-start: disable
-              truthy: disable
-  lint-json:
-    name: Lint JSON
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: json-syntax-check
-        uses: limitusus/json-syntax-check@v2
-        with:
-          pattern: "\\.json$"
-  check-mark:
-    name: ✔️
-    needs:
-      - lint-yaml
-      - lint-json
-      - can-require
-      - qa
-      - tests-directly-on-os
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "✔️"
+  ci:
+    name: Continuous Integration
+    uses: WyriHaximus/github-workflows/.github/workflows/package.yaml@main

Makefile

@@ -21,7 +21,7 @@ else
 		-v "`pwd`:`pwd`" \
 		-v "${COMPOSER_CACHE_DIR}:/home/app/.composer/cache" \
 		-w "`pwd`" \
-		"ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-buster${SLIM_DOCKER_IMAGE}-dev"
+		"ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-alpine${SLIM_DOCKER_IMAGE}-dev"
 endif
 
 ifneq (,$(findstring icrosoft,$(shell cat /proc/version)))

composer.json

@@ -10,11 +10,11 @@
   ],
   "require": {
     "php": "^8.2",
-    "phpunit/phpunit": "^9.6.7",
+    "phpunit/phpunit": "^9.6.9",
     "react/async": "^4.0",
-    "react/event-loop": "^1.3.0",
+    "react/event-loop": "^1.4.0",
     "react/promise": "^2.10.",
-    "wyrihaximus/test-utilities": "^5.5.0 || ^6"
+    "wyrihaximus/test-utilities": "^5.5.4 || ^6"
   },
   "require-dev": {
     "react/promise-timer": "^1.9",

etc/qa/phpstan.neon

@@ -10,8 +10,9 @@ parameters:
 		- '#Call to deprecated method expectCallableExactly\(\)#'
 		- '#Call to deprecated method expectCallableOnce\(\)#'
 	ergebnis:
-		classesAllowedToBeExtended:
-			- WyriHaximus\AsyncTestUtilities\AsyncTestCase
+		noExtends:
+			classesAllowedToBeExtended:
+				- WyriHaximus\AsyncTestUtilities\AsyncTestCase
 
 includes:
 	- ../../vendor/wyrihaximus/test-utilities/rules.neon

rules.neon

@@ -1,7 +1,8 @@
 parameters:
 	ergebnis:
-		classesAllowedToBeExtended:
-			- WyriHaximus\AsyncTestUtilities\AsyncTestCase
+		noExtends:
+			classesAllowedToBeExtended:
+				- WyriHaximus\AsyncTestUtilities\AsyncTestCase
 
 includes:
 	- ../test-utilities/rules.neon

src/AsyncTestCase.php

@@ -16,27 +16,21 @@ abstract class AsyncTestCase extends TestCase
 {
     private const INVOKE_ARRAY = ['__invoke'];
 
-    private ?string $realTestName = null;
+    private string|null $realTestName = null;
 
-    /**
-     * @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.)
-     */
+    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
     final protected function expectCallableExactly(int $amount): callable
     {
         return $this->getCallableMock(self::exactly($amount));
     }
 
-    /**
-     * @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.)
-     */
+    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
     final protected function expectCallableOnce(): callable
     {
         return $this->getCallableMock(self::once());
     }
 
-    /**
-     * @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.)
-     */
+    /** @deprecated With the move to fibers there is no need for these rarely used methods anymore. (Unless proven otherwise of course.) */
     final protected function expectCallableNever(): callable
     {
         return $this->getCallableMock(self::never());
@@ -55,15 +49,12 @@ private function getCallableMock(InvokedCount $invokedCount): callable
         return $mock;
     }
 
-    /**
-     * @codeCoverageIgnore Invoked before code coverage data is being collected.
-     */
+    /** @codeCoverageIgnore Invoked before code coverage data is being collected. */
     final public function setName(string $name): void
     {
-        /**
-         * @psalm-suppress InternalMethod
-         */
+        /** @psalm-suppress InternalMethod */
         parent::setName($name);
+
         $this->realTestName = $name;
     }
 
@@ -75,6 +66,7 @@ final protected function runAsyncTest(mixed ...$args): mixed
          * @psalm-suppress PossiblyNullArgument
          */
         parent::setName($this->realTestName);
+
         $timeout         = 30;
         $reflectionClass = new ReflectionClass($this::class);
         foreach ($reflectionClass->getAttributes() as $classAttribute) {
@@ -112,9 +104,7 @@ final protected function runAsyncTest(mixed ...$args): mixed
 
     final protected function runTest(): mixed
     {
-        /**
-         * @psalm-suppress InternalMethod
-         */
+        /** @psalm-suppress InternalMethod */
         parent::setName('runAsyncTest');
 
         return parent::runTest();

tests/bootstrap.php

@@ -12,6 +12,6 @@ function_exists('xdebug_set_filter') &&
         XDEBUG_PATH_WHITELIST,
         [
             dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src',
-        ]
+        ],
     );
 }