Prepare for PHP 8.1 (#42)

swaggest · Sep 17, 2021 · d223be0 · d223be0
1 parent f373420
commit d223be0
Show file tree

Hide file tree

Showing 15 changed files with 588 additions and 81 deletions.
diff --git a/.github/workflows/cloc.yml b/.github/workflows/cloc.yml
@@ -0,0 +1,35 @@
+name: cloc
+on:
+  pull_request:
+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 -OL https://github.com/vearutop/sccdiff/releases/download/v1.0.1/linux_amd64.tar.gz && tar xf linux_amd64.tar.gz
+          OUTPUT=$(cd pr && ../sccdiff -basedir ../base)
+          OUTPUT="${OUTPUT//'%'/'%25'}"
+          OUTPUT="${OUTPUT//$'\n'/'%0A'}"
+          OUTPUT="${OUTPUT//$'\r'/'%0D'}"
+          echo "::set-output name=diff::$OUTPUT"
+
+      - name: Comment Code Lines
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          header: LOC
+          message: |
+            ### Lines Of Code
+
+            ${{ steps.loc.outputs.diff }}
diff --git a/.github/workflows/lint.yml b/.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@v2
+        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
diff --git a/.github/workflows/test-unit-cov.yml b/.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@v2
+        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 && patch -s -p0 < ./tests/phpunit.patch)'
+
+      - name: Run Tests With Coverage
+        run: make deps test-coverage && bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/test-unit.yml b/.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: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache vendor
+        uses: actions/cache@v2
+        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 && patch -s -p0 < ./tests/phpunit.patch)'
+
+      - name: Run Tests
+        run: make deps test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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.8.2] - 2021-09-17
+
+### Fixed
+- PHP 8.1 Deprecation notices with missing returns.
+
 ## [3.8.1] - 2020-09-25
 
 ### Fixed
@@ -55,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Compatibility option to `TOLERATE_ASSOCIATIVE_ARRAYS` that mimic JSON objects.
 
+[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

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PHPSTAN_VERSION ?= 0.11.19
+PHPSTAN_VERSION ?= 0.12.99
 PHPBENCH_VERSION ?= 0.16.10
 
 deps:
@@ -11,11 +11,17 @@ lint:
 docker-lint:
 	@docker run -v $$PWD:/app --rm phpstan/phpstan analyze -l 7 -c phpstan.neon ./src
 
+docker-test-new:
+	@docker run -v $$PWD:/app -w /app --rm php:8.1.0RC1-zts-buster php vendor/bin/phpunit --configuration phpunit.xml
+
+docker-test-old:
+	@docker run -v $$PWD:/app -w /app --rm php:5.4-cli php vendor/bin/phpunit --configuration phpunit.xml
+
 test:
-	@php -derror_reporting="E_ALL & ~E_DEPRECATED" vendor/bin/phpunit --configuration phpunit.xml
+	@php vendor/bin/phpunit --configuration phpunit.xml
 
 test-coverage:
-	@php -derror_reporting="E_ALL & ~E_DEPRECATED" -dzend_extension=xdebug.so vendor/bin/phpunit --configuration phpunit.xml --coverage-text --coverage-clover=coverage.xml
+	@php -dzend_extension=xdebug.so vendor/bin/phpunit --configuration phpunit.xml --coverage-text --coverage-clover=coverage.xml
 
 phpbench:
 	@test -f ${HOME}/.cache/composer/phpbench-${PHPBENCH_VERSION}.phar || (mkdir -p ${HOME}/.cache/composer/ && wget https://github.com/phpbench/phpbench/releases/download/${PHPBENCH_VERSION}/phpbench.phar -O ${HOME}/.cache/composer/phpbench-${PHPBENCH_VERSION}.phar)

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,8 @@
+parameters:
+	inferPrivatePropertyTypeFromConstructor: true
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	ignoreErrors:
+		- '#has no return typehint specified#'
+		- '#with no typehint specified#'
+		- '#has no typehint specified#'
diff --git a/src/JsonPatch.php b/src/JsonPatch.php
@@ -55,7 +55,7 @@ public static function import(array $data)
     {
         $result = new JsonPatch();
         foreach ($data as $operation) {
-            /** @var OpPath|OpPathValue|OpPathFrom $operation */
+            /** @var OpPath|OpPathValue|OpPathFrom|array $operation */
             if (is_array($operation)) {
                 $operation = (object)$operation;
             }
@@ -124,6 +124,7 @@ public function op(OpPath $op)
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return self::export($this);