.gitattributes

@@ -1,13 +1,14 @@
 * text          eol=lf
 *.serialized    -text
 *.dat           -text
-/tests export-ignore
-/stubs export-ignore
+/.github/ export-ignore
+/tests/ export-ignore
+/benchmarks/ export-ignore
+/composer.lock export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
-/.gitlab-ci.yml
 /phpunit.xml export-ignore
+/phpstan.neon export-ignore
 /changelog.md export-ignore
 /Makefile export-ignore

.github/workflows/cloc.yml

@@ -0,0 +1,41 @@
+name: cloc
+on:
+  pull_request:
+
+# Cancel the workflow in progress in newer build is about to start.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  cloc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          path: pr
+      - name: Checkout base code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.base.sha }}
+          path: base
+      - name: Count Lines Of Code
+        id: loc
+        run: |
+          curl -sLO https://github.com/vearutop/sccdiff/releases/download/v1.0.2/linux_amd64.tar.gz && tar xf linux_amd64.tar.gz && echo "b17e76bede22af0206b4918d3b3c4e7357f2a21b57f8de9e7c9dc0eb56b676c0  sccdiff" | shasum -c
+          OUTPUT=$(cd pr && ../sccdiff -basedir ../base)
+          echo "${OUTPUT}"
+          OUTPUT="${OUTPUT//$'\n'/%0A}"
+          echo "::set-output name=diff::$OUTPUT"
+
+      - name: Comment Code Lines
+        continue-on-error: true
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          header: LOC
+          message: |
+            ### Lines Of Code
+
+            ${{ steps.loc.outputs.diff }}

.github/workflows/lint.yml

@@ -0,0 +1,37 @@
+name: lint
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '7.4' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+          key: vendor-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Lint
+        run: make lint

.github/workflows/test-unit-cov.yml

@@ -0,0 +1,38 @@
+name: test-unit-cov
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '7.4' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+          key: deps-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Run Tests With Coverage
+        run: make deps test-coverage && bash <(curl -s https://codecov.io/bash)

.github/workflows/test-unit.yml

@@ -0,0 +1,37 @@
+name: test-unit
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest' ]
+        php-versions: [ '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+          key: deps-${{ hashFiles('composer.lock') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          ini-values: post_max_size=256M, max_execution_time=180
+          tools: composer
+
+      - name: Populate vendor
+        run: '[ -e vendor ] || composer install'
+
+      - name: Run Tests
+        run: make deps test

.gitignore

@@ -1,5 +1,10 @@
 /vendor
 /.idea
-/json-diff
-/json-diff.tar.gz
-/composer.lock
+/composer.phar
+/clover.xml
+build
+/xhprof_report.*
+benchmark-result.json
+/coverage.xml
+/phpbench-candidate.xml
+/phpbench-master.xml

.scrutinizer.yml

@@ -1,3 +1,7 @@
+checks:
+    php:
+        code_rating: true
+        duplication: true
 filter:
     paths: [src/*]
     excluded_paths: [vendor/*, tests/*]
@@ -15,4 +19,10 @@ tools:
         excluded_dirs: [vendor, tests]
     php_cpd:
         enabled: true
-        excluded_dirs: [vendor, tests]
+        excluded_dirs: [vendor, tests]
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run

CHANGELOG.md

@@ -0,0 +1,119 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [3.10.4] - 2022-11-09
+
+### Fixed
+- Handling of non-string `op` values, [#63](https://github.com/swaggest/json-diff/pull/63).
+
+## [3.10.3] - 2022-11-08
+
+### Added
+- Option to skip paths, [#39](https://github.com/swaggest/json-diff/pull/39).
+
+## [3.10.2] - 2022-11-08
+
+### Added
+- Exceptions improved, [#60](https://github.com/swaggest/json-diff/pull/60).
+
+## [3.10.1] - 2022-10-24
+
+### Added
+- Exception type hints improved, [#59](https://github.com/swaggest/json-diff/pull/59).
+
+## [3.10.0] - 2022-10-21
+
+### Added
+- More specific exception types added for failed test operation, [#57](https://github.com/swaggest/json-diff/pull/57).
+
+
+## [3.9.0] - 2022-08-29
+
+### Added
+- Specific exception type `PatchTestOperationFailedException` for failed test operation.
+
+## [3.8.3] - 2021-09-25
+
+### Fixed
+- Redundant operations in array patches that strip first element.
+- XOR hash collision for properties having equal parts.
+
+### Added
+- Rearrange indexing by non-scalar properties that contain object, using XOR hash.
+
+## [3.8.2] - 2021-09-17
+
+### Fixed
+- PHP 8.1 Deprecation notices with missing returns.
+
+## [3.8.1] - 2020-09-25
+
+### Fixed
+- Rearrangement of equal array items is corrupting data by redundant replaces.
+
+## [3.8.0] - 2020-09-25
+
+### Added
+- Rearrangement of equal items for non-homogeneous arrays with `JsonDiff::REARRANGE_ARRAYS` option.
+
+## [3.7.5] - 2020-05-26
+
+### Fixed
+- Accidental array to associative array conversion ([#31](https://github.com/swaggest/json-diff/issues/31)).
+
+## [3.7.4] - 2020-01-26
+
+### Fixed
+- PHP version check for empty property name support.
+
+## [3.7.3] - 2020-01-24
+
+### Fixed
+- Merge patch was not replacing partially different arrays.
+
+## [3.7.2] - 2019-10-23
+
+### Added
+- Change log.
+
+### Fixed
+- Few irrelevant files not mentioned in `.gitattributes`.
+
+## [3.7.1] - 2019-09-26
+
+### Added
+- Benchmarks to CI.
+
+### Fixed
+- Unstable array rearrange order.
+
+## [3.7.0] - 2019-04-25
+
+### Added
+- `getModifiedDiff()` and `COLLECT_MODIFIED_DIFF` option to return paths with original and new values.
+
+## [3.6.0] - 2019-04-24
+
+### Added
+- Compatibility option to `TOLERATE_ASSOCIATIVE_ARRAYS` that mimic JSON objects.
+
+[3.10.4]: https://github.com/swaggest/json-diff/compare/v3.10.3...v3.10.4
+[3.10.3]: https://github.com/swaggest/json-diff/compare/v3.10.2...v3.10.3
+[3.10.2]: https://github.com/swaggest/json-diff/compare/v3.10.1...v3.10.2
+[3.10.1]: https://github.com/swaggest/json-diff/compare/v3.10.0...v3.10.1
+[3.10.0]: https://github.com/swaggest/json-diff/compare/v3.9.0...v3.10.0
+[3.9.0]: https://github.com/swaggest/json-diff/compare/v3.8.3...v3.9.0
+[3.8.3]: https://github.com/swaggest/json-diff/compare/v3.8.2...v3.8.3
+[3.8.2]: https://github.com/swaggest/json-diff/compare/v3.8.1...v3.8.2
+[3.8.1]: https://github.com/swaggest/json-diff/compare/v3.8.0...v3.8.1
+[3.8.0]: https://github.com/swaggest/json-diff/compare/v3.7.5...v3.8.0
+[3.7.5]: https://github.com/swaggest/json-diff/compare/v3.7.4...v3.7.5
+[3.7.4]: https://github.com/swaggest/json-diff/compare/v3.7.3...v3.7.4
+[3.7.3]: https://github.com/swaggest/json-diff/compare/v3.7.2...v3.7.3
+[3.7.2]: https://github.com/swaggest/json-diff/compare/v3.7.1...v3.7.2
+[3.7.1]: https://github.com/swaggest/json-diff/compare/v3.7.0...v3.7.1
+[3.7.0]: https://github.com/swaggest/json-diff/compare/v3.6.0...v3.7.0
+[3.6.0]: https://github.com/swaggest/json-diff/compare/v3.5.1...v3.6.0