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

Commit

Permalink
Merge branch 'hotfix/46' into develop
Browse files Browse the repository at this point in the history
Forward port #46

Conflicts:
	CHANGELOG.md
  • Loading branch information
weierophinney committed Feb 6, 2019
2 parents c884840 + b6e167e commit 6d46424
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 2.8.3 - TBD
## 2.8.3 - 2019-02-06

### Added

Expand All @@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#46](https://github.com/zendframework/zend-file/pull/46) fixes a unit test assertion for `Zend\File\Transfer\Adapter\Http`.

## 2.8.2 - 2018-10-15

Expand Down
2 changes: 1 addition & 1 deletion test/Transfer/Adapter/HttpTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,6 @@ public function testValidationOfPhpExtendsFormError()
$_FILES = [];
$adapter = new HttpTestMockAdapter();
$this->assertFalse($adapter->isValidParent());
$this->assertContains('exceeds the defined ini size', current($adapter->getMessages()));
$this->assertContains('exceeds', current($adapter->getMessages()));
}
}

0 comments on commit 6d46424

Please sign in to comment.