Merge pull request #7 from BluePsyduck/feature/support-symfony-6.0

feature/support-symfony-6.0

Author: BluePsyduck

.github/workflows/ci.yaml

@@ -6,131 +6,12 @@ on:
     - cron: "0 0 * * 0"
 
 jobs:
-
-  unit-tests:
-    name: Unit Tests
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          coverage: xdebug
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Setup problem matchers
-        run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-          echo "::add-matcher::.github/problem-matchers/coverage-check.json"
-
-      - name: Update dependencies
-        run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Run phpunit
-        run: vendor/bin/phpunit --testsuite unit-test --coverage-clover=coverage.xml
-
-      - name: Check coverage.xml existence
-        id: check-coverage-file
-        uses: andstor/file-existence-action@v1
-        with:
-          files: coverage.xml
-
-      - name: Run coverage-check
-        if: ${{ always() && steps.check-coverage-file.outputs.files_exists == 'true' }}
-        run: vendor/bin/coverage-check coverage.xml 100
-
-      - name: Upload coverage as artifacts
-        if: ${{ always() && steps.check-coverage-file.outputs.files_exists == 'true' }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: coverage-${{ matrix.php-version }}
-          path: coverage.xml
-
-      - name: Upload coverage to Codecov
-        if: ${{ always() && steps.check-coverage-file.outputs.files_exists == 'true' }}
-        uses: codecov/codecov-action@v1
-        with:
-          name: coverage-${{ matrix.php-version }}
-          file: coverage.xml
-
-  coding-guidelines:
-    name: Coding Guidelines
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.0
-          tools: cs2pr
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Update dependencies
-        run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Run phpcs
-        run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
-
-  type-checker:
-    name: Type Checker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.0
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Update dependencies
-        run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Run phpstan
-        run: vendor/bin/phpstan analyse --no-interaction
+  call-workflow-ci-php-general:
+    name: General
+    uses: BluePsyduck/github-workflows/.github/workflows/ci-php-general.yaml@v1
+
+  call-workflow-ci-php-tests:
+    name: Tests
+    uses: BluePsyduck/github-workflows/.github/workflows/ci-php-tests.yaml@v1
+    with:
+      php-versions: "8.1 8.0 7.4 7.3 7.2"

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.3 - 2021-12-03
+
+### Added
+
+- Support for symfony/process 6.x to be used with the process manager.
+
 ## 1.3.2 - 2020-12-03
 
 ### Added

composer.json

@@ -14,13 +14,13 @@
   "minimum-stability": "stable",
   "require": {
     "php": "^7.2 || ^8.0",
-    "symfony/process": "^3.0 || ^4.0 || ^5.0"
+    "symfony/process": "^3.0 || ^4.0 || ^5.0 || ^6.0"
   },
   "require-dev": {
     "bluepsyduck/test-helper": "^1.0",
-    "phpstan/phpstan": "^0.12",
-    "phpstan/phpstan-phpunit": "^0.12",
-    "phpstan/phpstan-strict-rules": "^0.12",
+    "phpstan/phpstan": "^1.0",
+    "phpstan/phpstan-phpunit": "^1.0",
+    "phpstan/phpstan-strict-rules": "^1.0",
     "phpunit/phpunit": "^8.0 || ^9.0",
     "rregeer/phpunit-coverage-check": "^0.3",
     "squizlabs/php_codesniffer": "^3.3"

src/ProcessManager.php

@@ -35,7 +35,7 @@ class ProcessManager implements ProcessManagerInterface
 
     /**
      * The processes currently waiting to be executed.
-     * @var array<mixed>
+     * @var array<array{Process<string>, callable|null, array<mixed>}>
      */
     protected $pendingProcessData = [];
 
@@ -198,17 +198,20 @@ protected function executeNextPendingProcess(): void
         if ($this->canExecuteNextPendingRequest()) {
             $this->sleep($this->processStartDelay);
 
-            [$process, $callback, $env] = array_shift($this->pendingProcessData);
-            /* @var Process $process */
-            $this->invokeCallback($this->processStartCallback, $process);
-            $process->start($callback, $env);
-
-            $pid = $process->getPid();
-            if ($pid === null) {
-                // The process finished before we were able to check its process id.
-                $this->checkRunningProcess($pid, $process);
-            } else {
-                $this->runningProcesses[$pid] = $process;
+            $data = array_shift($this->pendingProcessData);
+            if ($data !== null) {
+                [$process, $callback, $env] = $data;
+                /* @var Process $process */
+                $this->invokeCallback($this->processStartCallback, $process);
+                $process->start($callback, $env);
+
+                $pid = $process->getPid();
+                if ($pid === null) {
+                    // The process finished before we were able to check its process id.
+                    $this->checkRunningProcess($pid, $process);
+                } else {
+                    $this->runningProcesses[$pid] = $process;
+                }
             }
         }
     }