Merge pull request #9 from mattiabasone/update

Update dependencies and code cleanup

Author: mattiabasone

.github/workflows/php.yml

@@ -0,0 +1,53 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    name: Test PHP ${{ matrix.php-versions }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.4', '8.0', '8.1']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: curl, mbstring, intl, libxml, simplexml
+          coverage: xdebug
+      - name: Get composer cache directory
+        id: composer-cache-dir
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache Composer packages
+        id: composer-cache-restore
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install dependencies
+        run: (test -d vendor && echo vendor directory exists) || composer install --prefer-dist --no-progress --no-suggest
+      - name: Run PHPUnit
+        run: ./bin/phpunit --coverage-text --coverage-clover clover.xml
+      - name: "[Code Coverage Report] Extract branch name"
+        if: matrix.php-versions == '8.0'
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: extract_branch
+      - name: "[Code Coverage Report] Checkout branch"
+        if: matrix.php-versions == '8.0'
+        shell: bash
+        run: git fetch --depth 1 && git checkout ${{ steps.extract_branch.outputs.branch }}
+#      - name: "[Code Coverage Report] Upload coverage"
+#        if: matrix.php-versions == '8.0'
+#        run: ./bin/ocular code-coverage:upload --format=php-clover clover.xml
+#      - name: "[Coveralls] Send report"
+#        if: matrix.php-versions == '8.0'
+#        run: ./bin/php-coveralls -v -x clover.xml -o coveralls-upload.json
+#        env:
+#          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

.gitignore

@@ -2,3 +2,9 @@ vendor
 node_modules
 bin
 phpunit.xml
+.php-cs-fixer.cache
+.phpunit.result.cache
+composer.lock
+/.coveralls.yml
+/clover.xml
+/coveralls-upload.json

.php-cs-fixer.dist.php

@@ -0,0 +1,50 @@
+<?php
+# https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/3.0/doc/rules/index.rst
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(['src', 'tests'])
+    ->exclude(['vendor'])
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony' => true,
+        '@PHP80Migration' => true,
+        'blank_line_after_namespace' => true,
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => true,
+        'constant_case' => true,
+        'increment_style' => false,
+        'lowercase_keywords' => true,
+        'normalize_index_brace' => true,
+        'no_closing_tag' => true,
+        'no_extra_blank_lines' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_around_offset' => true,
+        'no_superfluous_phpdoc_tags' => false,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_align' => false,
+        'phpdoc_order' => true,
+        'phpdoc_separation' => false,
+        'phpdoc_summary' => false,
+        'phpdoc_to_comment' => false,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_first'],
+        'protected_to_private' => true,
+        'single_blank_line_at_eof' => true,
+        'single_blank_line_before_namespace' => true,
+        'single_line_comment_style' => false,
+        'single_line_throw' => false,
+        'single_quote' => false,
+        'single_trait_insert_per_statement' => true,
+        'yoda_style' => true,
+        'whitespace_after_comma_in_array' => true,
+    ])
+    ->setFinder($finder)
+;

.travis.yml

@@ -18,7 +18,7 @@ Install with composer
 ``` json
 {
     "require": {
-        "cypresslab/patch-manager": "1.0.*@dev"
+        "cypresslab/patch-manager": "^2.0"
     }
 }
 ```
@@ -43,3 +43,8 @@ And let you **patch entire collections** with multiple operations
 
 Still interested? [Head over to the wiki...](https://github.com/matteosister/patch-manager/wiki) for documentation
 
+## Useful commands for development
+
+- `composer format`: runs php-cs-fixer
+- `composer analyse`: runs phpstan for static analysis
+- `composer test`: runs phpunit

Gulpfile.coffee

@@ -1,31 +1,39 @@
 {
     "name": "cypresslab/patch-manager",
     "description": "A library to manage patch requests",
-    "keywords": ["rest", "patch", "api", "symfony2", "bundle"],
+    "keywords": ["rest", "patch", "api", "symfony", "bundle"],
     "require": {
-        "php": ">=5.4",
-        "symfony/property-access": ">=3.0-stable",
-        "symfony/http-foundation": ">=3.0-stable",
-        "symfony/options-resolver": ">=3.0-stable",
-        "symfony/dependency-injection": ">=3.0-stable",
-        "symfony/http-kernel": ">=3.0-stable",
-        "symfony/config": ">=3.0-stable",
-        "symfony/event-dispatcher": ">=3.0-stable",
-        "phpcollection/phpcollection": "~0.4"
+        "php": "^7.4 || ^8.0",
+        "ext-json": "*",
+        "symfony/property-access": "^4.0 || ^5.0",
+        "symfony/http-foundation": "^4.0 || ^5.0",
+        "symfony/options-resolver": "^4.0 || ^5.0",
+        "symfony/dependency-injection": "^4.0 || ^5.0",
+        "symfony/http-kernel": "^4.0 || ^5.0",
+        "symfony/config": "^4.0 || ^5.0",
+        "symfony/event-dispatcher": "^4.0 || ^5.0",
+        "phpcollection/phpcollection": "^0.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.5",
-        "mockery/mockery": "~1.0",
-        "yohang/finite": "~1.1.0",
-        "doctrine/orm": "~2.4.6"
+        "friendsofphp/php-cs-fixer": "^3.1",
+        "phpunit/phpunit": "^9.5",
+        "mockery/mockery": "^1.4",
+        "yohang/finite": "^1.2",
+        "doctrine/orm": "^2.9",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpstan/phpstan": "^0.12.99",
+        "phpstan/phpstan-doctrine": "^0.12.44",
+        "phpstan/phpstan-mockery": "^0.12.14",
+        "php-coveralls/php-coveralls": "^2.4",
+        "scrutinizer/ocular": "^1.8"
     },
     "autoload": {
         "psr-4": {
             "Cypress\\PatchManager\\": "src/PatchManager/",
             "Cypress\\PatchManager\\Tests\\": "tests/PatchManager/"
         }
     },
-    "license": "LGPL-3.0+",
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Matteo Giachino",
@@ -38,11 +46,16 @@
     "minimum-stability": "stable",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     },
     "suggest": {
         "yohang/finite": "PatchManager with op 'state_machine'",
         "doctrine/orm": "PatchManager with op 'data' and doctrine integration"
+    },
+    "scripts": {
+        "analyse": "bin/phpstan analyse -c phpstan.neon -vvv --ansi",
+        "format": "bin/php-cs-fixer fix --show-progress=dots --verbose --diff",
+        "test": "@php bin/phpunit"
     }
 }