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

Commit 759a875

Browse files
committed
Merge branch 'qa/80'
Close #80
2 parents 8983c94 + dae0b09 commit 759a875

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: false
2-
31
language: php
42

53
cache:
@@ -33,6 +31,15 @@ matrix:
3331
- php: 7.2
3432
env:
3533
- DEPS=latest
34+
- php: 7.3
35+
env:
36+
- DEPS=lowest
37+
- php: 7.3
38+
env:
39+
- DEPS=locked
40+
- php: 7.3
41+
env:
42+
- DEPS=latest
3643

3744
before_install:
3845
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- Nothing.
9+
- [#80](https://github.com/zendframework/zend-expressive-router/pull/80) adds support for PHP 7.3.
1010

1111
### Changed
1212

test/RouteTest.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,28 @@ public function testRouteNameWithGetAndPost()
121121
$this->assertSame('/test^GET' . Route::HTTP_METHOD_SEPARATOR . RequestMethod::METHOD_POST, $route->getName());
122122
}
123123

124-
public function testThrowsExceptionDuringConstructionIfPathIsNotString()
124+
/**
125+
* @requires PHP < 7.3
126+
*/
127+
public function testThrowsExceptionDuringConstructionIfPathIsNotStringPhpPriorTo73()
125128
{
126129
$this->expectException(TypeError::class);
127130
$this->expectExceptionMessage('must be of the type string, integer given');
128131

129132
new Route(12345, $this->noopMiddleware);
130133
}
131134

135+
/**
136+
* @requires PHP 7.3
137+
*/
138+
public function testThrowsExceptionDuringConstructionIfPathIsNotString()
139+
{
140+
$this->expectException(TypeError::class);
141+
$this->expectExceptionMessage('must be of the type string, int given');
142+
143+
new Route(12345, $this->noopMiddleware);
144+
}
145+
132146
public function testThrowsExceptionDuringConstructionOnInvalidMiddleware()
133147
{
134148
$this->expectException(TypeError::class);

0 commit comments

Comments
 (0)