Skip to content

Commit 546767b

Browse files
authored
Merge pull request #55 from akrabat/update-dependencies
Update dependencies
2 parents 95dd269 + 2436599 commit 546767b

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
}
1212
],
1313
"require": {
14+
"php": "^7.1",
1415
"psr/http-message": "^1.0"
1516
},
1617
"autoload": {
@@ -19,7 +20,7 @@
1920
}
2021
},
2122
"require-dev": {
22-
"phpunit/phpunit": "^4.8",
23-
"slim/slim" : "^3.0"
23+
"phpunit/phpunit": "^7.0",
24+
"slim/psr7" : "^0.6"
2425
}
2526
}

tests/PhpRendererTest.php

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<?php
2-
use Slim\Http\Body;
3-
use Slim\Http\Headers;
4-
use Slim\Http\Response;
2+
3+
use PHPUnit\Framework\TestCase;
4+
use Slim\Psr7\Headers;
5+
use Slim\Psr7\Response;
6+
use Slim\Psr7\Stream;
57

68
/**
79
* Created by PhpStorm.
810
* User: Glenn
911
* Date: 2015-11-12
1012
* Time: 1:19 PM
1113
*/
12-
class PhpRendererTest extends PHPUnit_Framework_TestCase
14+
class PhpRendererTest extends TestCase
1315
{
1416

1517
public function testRenderer() {
1618
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files/");
1719

1820
$headers = new Headers();
19-
$body = new Body(fopen('php://temp', 'r+'));
21+
$body = new Stream(fopen('php://temp', 'r+'));
2022
$response = new Response(200, $headers, $body);
2123

2224
$newResponse = $renderer->render($response, "template.phtml", array("hello" => "Hi"));
@@ -30,7 +32,7 @@ public function testRenderConstructor() {
3032
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files");
3133

3234
$headers = new Headers();
33-
$body = new Body(fopen('php://temp', 'r+'));
35+
$body = new Stream(fopen('php://temp', 'r+'));
3436
$response = new Response(200, $headers, $body);
3537

3638
$newResponse = $renderer->render($response, "template.phtml", array("hello" => "Hi"));
@@ -47,7 +49,7 @@ public function testAttributeMerging() {
4749
]);
4850

4951
$headers = new Headers();
50-
$body = new Body(fopen('php://temp', 'r+'));
52+
$body = new Stream(fopen('php://temp', 'r+'));
5153
$response = new Response(200, $headers, $body);
5254

5355
$newResponse = $renderer->render($response, "template.phtml", [
@@ -61,7 +63,7 @@ public function testExceptionInTemplate() {
6163
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files/");
6264

6365
$headers = new Headers();
64-
$body = new Body(fopen('php://temp', 'r+'));
66+
$body = new Stream(fopen('php://temp', 'r+'));
6567
$response = new Response(200, $headers, $body);
6668

6769
try {
@@ -91,7 +93,7 @@ public function testExceptionForTemplateInData() {
9193
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files/");
9294

9395
$headers = new Headers();
94-
$body = new Body(fopen('php://temp', 'r+'));
96+
$body = new Stream(fopen('php://temp', 'r+'));
9597
$response = new Response(200, $headers, $body);
9698

9799
$renderer->render($response, "template.phtml", [
@@ -107,7 +109,7 @@ public function testTemplateNotFound() {
107109
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files/");
108110

109111
$headers = new Headers();
110-
$body = new Body(fopen('php://temp', 'r+'));
112+
$body = new Stream(fopen('php://temp', 'r+'));
111113
$response = new Response(200, $headers, $body);
112114

113115
$renderer->render($response, "adfadftemplate.phtml", []);
@@ -118,7 +120,7 @@ public function testLayout() {
118120
$renderer->setLayout("layout.phtml");
119121

120122
$headers = new Headers();
121-
$body = new Body(fopen('php://temp', 'r+'));
123+
$body = new Stream(fopen('php://temp', 'r+'));
122124
$response = new Response(200, $headers, $body);
123125

124126
$newResponse = $renderer->render($response, "template.phtml", array("title" => "Hello - My App", "hello" => "Hi"));
@@ -132,7 +134,7 @@ public function testLayoutConstructor() {
132134
$renderer = new \Slim\Views\PhpRenderer(__DIR__ . "/_files", ["title" => "My App"], "layout.phtml");
133135

134136
$headers = new Headers();
135-
$body = new Body(fopen('php://temp', 'r+'));
137+
$body = new Stream(fopen('php://temp', 'r+'));
136138
$response = new Response(200, $headers, $body);
137139

138140
$newResponse = $renderer->render($response, "template.phtml", array("title" => "Hello - My App", "hello" => "Hi"));
@@ -147,7 +149,7 @@ public function testExceptionInLayout() {
147149
$renderer->setLayout("exception_layout.phtml");
148150

149151
$headers = new Headers();
150-
$body = new Body(fopen('php://temp', 'r+'));
152+
$body = new Stream(fopen('php://temp', 'r+'));
151153
$response = new Response(200, $headers, $body);
152154

153155
try {
@@ -180,7 +182,7 @@ public function testLayoutNotFound() {
180182
$renderer->setLayout("non-existent_layout.phtml");
181183

182184
$headers = new Headers();
183-
$body = new Body(fopen('php://temp', 'r+'));
185+
$body = new Stream(fopen('php://temp', 'r+'));
184186
$response = new Response(200, $headers, $body);
185187

186188
$renderer->render($response, "template.phtml", []);
@@ -191,7 +193,7 @@ public function testContentDataKeyShouldBeIgnored() {
191193
$renderer->setLayout("layout.phtml");
192194

193195
$headers = new Headers();
194-
$body = new Body(fopen('php://temp', 'r+'));
196+
$body = new Stream(fopen('php://temp', 'r+'));
195197
$response = new Response(200, $headers, $body);
196198

197199
$newResponse = $renderer->render($response, "template.phtml", array("title" => "Hello - My App", "hello" => "Hi", "content" => "Ho"));

0 commit comments

Comments
 (0)