diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edbeffa..3aeb474 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,21 +13,14 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest] - php-versions: ['7.2', '7.3', '7.4'] + php-versions: ['7.4', '8.0', '8.1'] composer-args: ['', '--prefer-lowest'] - include: - - operating-system: ubuntu-latest - php-versions: '8.0' - composer-args: '--ignore-platform-reqs' - - operating-system: ubuntu-latest - php-versions: '8.0' - composer-args: '--prefer-lowest --ignore-platform-reqs --no-scripts' runs-on: ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.0 - name: Setup PHP - uses: shivammathur/setup-php@2.10.0 + uses: shivammathur/setup-php@2.16.0 with: php-version: ${{ matrix.php-versions }} extensions: mbstring @@ -39,7 +32,7 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.7 with: path: ${{ steps.composer-cache.outputs.dir }} key: php${{ matrix.php-versions }}-composer-${{ matrix.composer-args }}-${{ hashFiles('**/composer.json') }} @@ -50,21 +43,14 @@ jobs: - name: PHPStan run: composer phpstan - name: Code Style Check + env: + PHP_CS_FIXER_IGNORE_ENV: true run: composer style-check -- --format=checkstyle | cs2pr - name: Test run: composer test-with-coverage - name: Upload Coverage - run: bash <(curl -s https://codecov.io/bash) -f ./clover.xml - merge-me: - name: Merge me! - needs: - - build - runs-on: ubuntu-latest - steps: - - name: Merge me! - uses: ridedott/merge-me-action@master + uses: codecov/codecov-action@v2 with: - # This must be used as GitHub Actions token does not support - # pushing to protected branches. - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_LOGIN: 'dependabot[bot]' + files: ./clover.xml + fail_ci_if_error: true + verbose: true diff --git a/.github/workflows/merge-me.yml b/.github/workflows/merge-me.yml new file mode 100644 index 0000000..c7559ae --- /dev/null +++ b/.github/workflows/merge-me.yml @@ -0,0 +1,32 @@ +name: Merge me! + +on: + workflow_run: + types: + - completed + workflows: + - 'Build' + +jobs: + merge-me: + name: Merge me! + runs-on: ubuntu-latest + steps: + - # It is often a desired behavior to merge only when a workflow execution + # succeeds. This can be changed as needed. + if: ${{ github.event.workflow_run.conclusion == 'success' }} + name: Merge me! + uses: ridedott/merge-me-action@v2 + with: + # Depending on branch protection rules, a manually populated + # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to + # a protected branch must be used. This secret can have an arbitrary + # name, as an example, this repository uses `DOTTBOTT_TOKEN`. + # + # When using a custom token, it is recommended to leave the following + # comment for other developers to be aware of the reasoning behind it: + # + # This must be used as GitHub Actions token does not support pushing + # to protected branches. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ENABLE_GITHUB_API_PREVIEW: true diff --git a/.gitignore b/.gitignore index 0c9c4f0..e5b8007 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /composer.lock /clover.xml .php_cs.cache -.phpunit.result.cache \ No newline at end of file +.phpunit.result.cache +.php-cs-fixer.cache diff --git a/.php_cs b/.php-cs-fixer.php similarity index 64% rename from .php_cs rename to .php-cs-fixer.php index d6999f6..2ec4112 100644 --- a/.php_cs +++ b/.php-cs-fixer.php @@ -6,17 +6,16 @@ ->in(__DIR__) ; -return PhpCsFixer\Config::create() - ->setRiskyAllowed(true) +$config = new PhpCsFixer\Config(); +return $config->setRiskyAllowed(true) ->setRules(array( '@PSR2' => true, '@PHPUnit60Migration:risky' => true, - '@PHPUnit75Migration:risky' => true, - 'binary_operator_spaces' => array('align_double_arrow' => true, 'align_equals' => true), + 'binary_operator_spaces' => array('operators' => array('=' => 'align', '=>' => 'align')), 'single_quote' => true, 'array_syntax' => array('syntax' => 'long'), 'concat_space' => array('spacing' => 'one'), - 'psr0' => true + 'psr_autoloading' => array('dir' => 'src'), )) ->setUsingCache(true) ->setFinder($finder); diff --git a/composer.json b/composer.json index de05684..41e7fe7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "^7.0 || ^8.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "ext-dom": "*", "ext-libxml": "*", "ext-SimpleXML": "*", @@ -28,11 +28,11 @@ } }, "require-dev": { - "phpunit/phpunit": "^8.0", - "phpstan/phpstan": "0.12.83", - "friendsofphp/php-cs-fixer": "2.18.4", - "maglnet/composer-require-checker": "^1.1.0 || ^2.0.0", - "phpro/grumphp-shim": "^0.22.0 || ^1.1" + "phpunit/phpunit": "^9.5.10", + "phpstan/phpstan": "1.2.0", + "friendsofphp/php-cs-fixer": "3.3.2", + "maglnet/composer-require-checker": "^3.0.0", + "phpro/grumphp-shim": "^1.5.0" }, "archive": { "exclude": [ diff --git a/grumphp.yml.dist b/grumphp.yml.dist index 480176c..ed37d03 100644 --- a/grumphp.yml.dist +++ b/grumphp.yml.dist @@ -6,7 +6,7 @@ grumphp: composer_require_checker: ~ phpcsfixer2: allow_risky: true - config: .php_cs + config: .php-cs-fixer.php phpstan: configuration: phpstan.neon phpunit: diff --git a/phpstan.neon b/phpstan.neon index c22fafe..2d7dd60 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,7 +3,7 @@ parameters: level: 8 paths: - ./ - excludes_analyse: + excludePaths: - %rootDir%/../../../tests/* - %rootDir%/../../../vendor/* ignoreErrors: diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2204d13..d55ddf3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,19 +1,13 @@ - - - - ./tests - - - - - ./src - - + + + + + ./src + + + + + ./tests + + diff --git a/src/Zend/Xml/Security.php b/src/Zend/Xml/Security.php index 9bb3302..90cbc2b 100644 --- a/src/Zend/Xml/Security.php +++ b/src/Zend/Xml/Security.php @@ -174,17 +174,6 @@ public static function scanFile($file, DOMDocument $dom = null) */ public static function isPhpFpm() { - $isVulnerableVersion = ( - version_compare(PHP_VERSION, '5.5.22', 'lt') - || ( - version_compare(PHP_VERSION, '5.6', 'ge') - && version_compare(PHP_VERSION, '5.6.6', 'lt') - ) - ); - - if (substr((string) php_sapi_name(), 0, 3) === 'fpm' && $isVulnerableVersion) { - return true; - } return false; }