Skip to content

Commit

Permalink
[SERVELAB-1156]: Fix badoo/soft-mocks and update php-parser to 4.3.0
Browse files Browse the repository at this point in the history
There are next changes:
- update `nikic/php-parser` to `^4.3.0`, so now version isn't specific
- minimum php version now is `7.0`
- now ext-json is required for get nikic/php-parser version for right rewritten files cache
- fixed error 'Unbinding $this of closure is deprecated'
  • Loading branch information
mougrim committed Nov 28, 2019
1 parent e2f47b5 commit 09800fb
Show file tree
Hide file tree
Showing 12 changed files with 351 additions and 245 deletions.
16 changes: 0 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ php:
- 7.2
- 7.1
- 7.0
- 5.6
- 5.5

env:
- PHPUNIT_VERSION=^8.4.0
Expand Down Expand Up @@ -43,20 +41,6 @@ after_success:
jobs:
fast_finish: true
exclude:
- php: 5.5
env: PHPUNIT_VERSION=^5.7.0
- php: 5.5
env: PHPUNIT_VERSION=^6.5.0
- php: 5.5
env: PHPUNIT_VERSION=^7.5.0
- php: 5.5
env: PHPUNIT_VERSION=^8.4.0
- php: 5.6
env: PHPUNIT_VERSION=^6.5.0
- php: 5.6
env: PHPUNIT_VERSION=^7.5.0
- php: 5.6
env: PHPUNIT_VERSION=^8.4.0
- php: 7.0
env: PHPUNIT_VERSION=^7.5.0
- php: 7.0
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
There are next changes:

- add support phpunit 7.x and 8.x
- update `nikic/php-parser` to `^4.3.0`, so now version isn't specific
- minimum php version now is `7.0`
- now ext-json is required for get nikic/php-parser version for right rewritten files cache
- fixed error 'Unbinding $this of closure is deprecated'

## v2.0.6

Expand Down
6 changes: 6 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

The following upgrading instructions are cumulative. That is, if you want to upgrade from version A to version C and there is version B between A and C, you need to follow the instructions for both A and B.

## Upgrade from SoftMocks 2.0.6

- update php to at least `7.0`
- update `nikic/php-parser` to `^4.3.0`, so if you use it, then update
- install ext-json

## Upgrade from SoftMocks 1.3.5

- Class constants redefining logic was changed (see [CHANGELOG.md](CHANGELOG.md)). Check class constants redefining usages, that it's working.
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
}
],
"require": {
"php": ">=5.5",
"nikic/php-parser": "3.0.6"
"ext-json": "*",
"php": ">=7.0",
"nikic/php-parser": "^4.3.0"
},
"require-dev": {
"vaimo/composer-patches": "3.23.1",
Expand Down
Loading

0 comments on commit 09800fb

Please sign in to comment.