Merge pull request php-pm#528 from acasademont/gh_actions

Add github actions, remove travis

Author: andig

.github/workflows/continuous-integration.yml

@@ -0,0 +1,72 @@
+name: "CS & PHPStan & Phpunit & Integration Tests"
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  cs-phpstan-phpunit-integration:
+    name: "CS & PHPStan & Phpunit & Integration Tests"
+    runs-on: "ubuntu-18.04"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - "7.4"
+        deps:
+          - "normal"
+        include:
+          - deps: "low"
+            php-version: "7.1"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 0
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: "pcntl"
+          tools: "cs2pr"
+          # this is needed in order to remove the pcntl_ restrictions on the php-cgi SAPI
+          ini-values: "disable_functions="
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.composer/cache"
+          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+
+      - name: "Install dependencies with composer"
+        run: "composer update --no-interaction --no-progress --no-suggest --prefer-dist"
+        if: "${{ matrix.deps == 'normal' }}"
+
+      - name: "Install lowest possible dependencies with composer"
+        run: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-lowest"
+        if: "${{ matrix.deps == 'low' }}"
+
+      - name: "Run git-phpcs (for pull request)"
+        if: "${{ github.event_name == 'pull_request' }}"
+        run: |
+          CHANGED_PHP_FILES=$(git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$")
+          php vendor/bin/php-cs-fixer fix --config=.php_cs.php --dry-run --diff -v -- $CHANGED_PHP_FILES
+
+      - name: "Run git-phpcs (for push)"
+        if: "${{ github.event_name != 'pull_request' }}"
+        run: |
+          CHANGED_PHP_FILES=$(git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$")
+          php vendor/bin/php-cs-fixer fix --config=.php_cs.php --dry-run --diff -v -- $CHANGED_PHP_FILES
+
+      - name: "Run a static analysis with phpstan/phpstan"
+        run: "php vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"
+
+      - name: "Run PHPUnit"
+        run: "vendor/bin/phpunit"
+
+      - name: "Run Integration test"
+        run: "./integration_test.sh"

.travis.yml

@@ -4,6 +4,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.1",
+        "ext-pcntl": "*",
         "symfony/console": "^3.4|^4|^5",
         "symfony/error-handler": "^4.4|^5",
         "symfony/process": "^3.4|^4|^5",
@@ -13,11 +14,17 @@
         "react/socket": "^1.0",
         "react/child-process": "^0.6",
         "psr/http-server-handler": "^1.0",
-        "ringcentral/psr7": "^1.2"
+        "ringcentral/psr7": "^1.2",
+        "psr/http-message": "^1.0.1",
+        "react/cache": "^0.4",
+        "react/promise": "^2.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.0",
+        "friendsofphp/php-cs-fixer": "^2.16.7",
+        "phpstan/phpstan": "^0.12.58",
+        "drew/debug-statements-fixers": "^0.5.0"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -0,0 +1,48 @@
+#!/bin/bash
+# exit when any command fails
+set -e
+
+# Integration test
+mkdir web && echo "Hello" > web/index.html
+bin/ppm start --workers=1 --bridge=StaticBridge --static-directory=web --max-requests=1 -v &
+sleep 5
+bin/ppm status
+curl -v -f "http://127.0.0.1:8080"
+bin/ppm status
+curl -v -f "http://127.0.0.1:8080"
+bin/ppm status
+bin/ppm stop
+# Test memory limit
+bin/ppm start --workers=1 --bridge=PHPPM\\Tests\\TestBridge --static-directory=web --memory-limit=5 -v > /tmp/ppmout &
+sleep 5
+# Memory limit: Nothing should happen
+curl -f --silent "http://127.0.0.1:8080/test?memory=0" &
+sleep 5
+bash -c 'grep -q "because it reached memory limit of 5" /tmp/ppmout || exit 0'
+bin/ppm status
+sleep 5
+# Memory limit: Worker should restart
+curl -f --silent "http://127.0.0.1:8080/test?memory=10" &
+sleep 5
+bash -c 'grep -q "because it reached memory limit of 5" /tmp/ppmout && exit 0'
+bin/ppm status
+bin/ppm stop
+# Trigger 502 error by triggering an exit() in the worker
+bin/ppm start --workers=1 --bridge=PHPPM\\Tests\\TestBridge --static-directory=web --max-requests=1 --max-execution-time=15 -v > /tmp/ppmout &
+sleep 5
+bash -c 'if [[ $(curl --write-out %{http_code} --silent --output /dev/null "http://127.0.0.1:8080/test?exit_prematurely=1") == "502" ]]; then exit 0; else exit 1; fi'
+bin/ppm status
+# Trigger 503 error by tying up the worker and making a second request
+curl -f --silent "http://127.0.0.1:8080/test?sleep=10000" &
+bash -c 'if [[ $(curl --write-out %{http_code} --silent --output /dev/null "http://127.0.0.1:8080") == "503" ]]; then exit 0; else exit 1; fi'
+bin/ppm status
+# Trigger 504 error by making a sleep request and waiting until the timeout
+bash -c 'if [[ $(curl --write-out %{http_code} --silent --output /dev/null "http://127.0.0.1:8080/test?sleep=10000") == "504" ]]; then exit 0; else exit 1; fi'
+bin/ppm status
+# Trigger 502 error by making the bridge throw an exception
+bash -c 'if [[ $(curl --write-out %{http_code} --silent --output /dev/null "http://127.0.0.1:8080/test?exception=1") == "502" ]]; then exit 0; else exit 1; fi'
+bash -c 'grep -q "An exception was thrown by the bridge. Forcing restart of the worker. The exception was" /tmp/ppmout && exit 0'
+bash -c 'grep -q "This is a very bad exception" /tmp/ppmout && exit 0'
+bash -c 'grep -q "Shutdown function triggered" /tmp/ppmoutshutdownfunc && exit 0'
+bin/ppm status
+bin/ppm stop

integration_test.sh

@@ -3,8 +3,6 @@ parameters:
     paths:
         - src/
     ignoreErrors:
-        # For version 2.x and 3.x of \Symfony\Component\Process\Process package
-        - '#^Call to an undefined static method Symfony\\Component\\Process\\ProcessUtils::escapeArgument\(\)\.$#'
         # Actually called on implementations of PromiseInterface
         - '#^Call to an undefined method React\\Promise\\PromiseInterface::done\(\)\.$#'
         # Actually returns an implementation of PromiseInterface

phpstan.neon.dist

@@ -1251,7 +1251,6 @@ protected function newSlaveInstance($port)
             PHP_BINARY
         )
     );
-    exit();
 }
 
 if (!pcntl_enabled()) {
@@ -1272,15 +1271,9 @@ protected function newSlaveInstance($port)
         // we can not use -q since this disables basically all header support
         // but since this is necessary at least in Symfony we can not use it.
         // e.g. headers_sent() returns always true, although wrong.
-        // For version 2.x and 3.x of \Symfony\Component\Process\Process package
-        if (\method_exists('\Symfony\Component\Process\ProcessUtils', 'escapeArgument')) {
-            $commandline = 'exec ' . $this->phpCgiExecutable . ' -C ' . ProcessUtils::escapeArgument($file);
-        } else {
-            //For version 4.x of \Symfony\Component\Process\Process package
-            $commandline = ['exec', $this->phpCgiExecutable, '-C', $file];
-            $processInstance = new \Symfony\Component\Process\Process($commandline);
-            $commandline = $processInstance->getCommandLine();
-        }
+        $commandline = ['exec', $this->phpCgiExecutable, '-C', $file];
+        $processInstance = new \Symfony\Component\Process\Process($commandline);
+        $commandline = $processInstance->getCommandLine();
 
         // use exec to omit wrapping shell
         $process = new Process($commandline);

src/ProcessManager.php

@@ -30,13 +30,13 @@ function console_log($expression, $_ = null)
 }
 
 /**
- * Checks that PCNTL is actually enabled in this installation.
+ * Checks that PCNTL extension is installed and loaded in this installation.
  *
  * @return bool
  */
 function pcntl_installed()
 {
-    return \function_exists('pcntl_signal');
+    return \extension_loaded('pcntl');
 }
 
 /**