Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Nov 22, 2019
2 parents f50973f + e83174a commit 944f4fe
Show file tree
Hide file tree
Showing 28 changed files with 407 additions and 360 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.phpunit.result.cache
/clover.xml
/coveralls-upload.json
/phpunit.xml
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ matrix:
- php: 7.1
env:
- DEPS=locked
- LEGACY_DEPS="symfony/console"
- LEGACY_DEPS="phpunit/phpunit symfony/console"
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
Expand Down
24 changes: 1 addition & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 1.3.0 - TBD
## 1.3.0 - 2019-11-22

### Added

Expand All @@ -25,28 +25,6 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 1.2.2 - TBD

### Added

- Nothing.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 1.2.1 - 2019-08-28

### Added
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"require-dev": {
"malukenho/docheader": "^0.1.6",
"mikey179/vfsstream": "^1.6.7",
"mockery/mockery": "^1.0",
"php-mock/php-mock-phpunit": "^2.1",
"phpunit/phpunit": "^7.0.3",
"mockery/mockery": "^1.2.4",
"php-mock/php-mock-phpunit": "^2.5",
"phpunit/phpunit": "^7.5.17 || ^8.4.3",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
Expand All @@ -54,8 +54,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev",
"dev-develop": "1.3.x-dev"
"dev-master": "1.3.x-dev",
"dev-develop": "1.4.x-dev"
}
},
"bin": [
Expand Down
Loading

0 comments on commit 944f4fe

Please sign in to comment.