From b853770adabaeaea590da340d9c54a940d5ea1dd Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 22 Nov 2013 09:26:12 +0000
Subject: [PATCH] fix tests with short_open_tags off

---
 tests/envrequestbody001.phpt   | 4 ++--
 tests/envrequestbody002.phpt   | 4 ++--
 tests/envrequestbody003.phpt   | 4 ++--
 tests/envrequestheader001.phpt | 5 +++--
 tests/message002.phpt          | 6 +++---
 tests/message003.phpt          | 4 ++--
 tests/negotiate001.phpt        | 2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/envrequestbody001.phpt b/tests/envrequestbody001.phpt
index 2351186..28f6a74 100644
--- a/tests/envrequestbody001.phpt
+++ b/tests/envrequestbody001.phpt
@@ -1,12 +1,12 @@
 --TEST--
 env request body
 --SKIPIF--
-<? include "skipif.inc";
+<?php include "skipif.inc"; ?>
 --PUT--
 Content-Type: skip/me
 foo
 --FILE--
-<?
+<?php
 var_dump((string) \http\Env::getRequestBody());
 ?>
 DONE
diff --git a/tests/envrequestbody002.phpt b/tests/envrequestbody002.phpt
index ec7d2d5..69c5988 100644
--- a/tests/envrequestbody002.phpt
+++ b/tests/envrequestbody002.phpt
@@ -1,12 +1,12 @@
 --TEST--
 env request body
 --SKIPIF--
-<? include "skipif.inc";
+<?php include "skipif.inc"; ?>
 --PUT--
 Content-Type: application/x-www-form-urlencoded
 foo=bar&baz=buh
 --FILE--
-<?
+<?php
 var_dump($_POST);
 ?>
 DONE
diff --git a/tests/envrequestbody003.phpt b/tests/envrequestbody003.phpt
index a22dbbd..1aeae79 100644
--- a/tests/envrequestbody003.phpt
+++ b/tests/envrequestbody003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 env request body
 --SKIPIF--
-<? include "skipif.inc";
+<?php include "skipif.inc"; ?>
 --PUT--
 Content-Type: multipart/form-data;boundary=123
 --123
@@ -18,7 +18,7 @@ Content-Disposition: form-data; name="up"; filename="up.txt"
 foo=bar&baz=buh
 --123--
 --FILE--
-<?
+<?php
 var_dump($_POST);
 var_dump($_FILES);
 ?>
diff --git a/tests/envrequestheader001.phpt b/tests/envrequestheader001.phpt
index b259ea5..5ec5eb7 100644
--- a/tests/envrequestheader001.phpt
+++ b/tests/envrequestheader001.phpt
@@ -1,19 +1,20 @@
 --TEST--
 env request header
 --SKIPIF--
-<? include "skipif.inc";
+<?php include "skipif.inc"; ?>
 --POST--
 a=b
 --ENV--
 HTTP_HOST=foo.bar
 HTTP_ACCEPT=*/*
 --FILE--
-<?
+<?php
 
 var_dump(http\Env::getRequestHeader("nono"));
 var_dump(http\Env::getRequestHeader("Host"));
 var_dump(http\Env::getRequestHeader("content-type"));
 var_dump(http\Env::getRequestHeader());
+?>
 --EXPECTF--
 NULL
 string(%d) "foo.bar"
diff --git a/tests/message002.phpt b/tests/message002.phpt
index 06d9e1b..f782f8f 100644
--- a/tests/message002.phpt
+++ b/tests/message002.phpt
@@ -10,7 +10,7 @@ HTTP_X_TEST=test
 --COOKIE--
 foo=bar
 --FILE--
-<?
+<?php
 echo "Test\n";
 
 use http\env\Request as HttpEnvRequest;
@@ -27,8 +27,8 @@ var_dump((string)$m->getBody());
 
 echo "stream\n";
 var_dump(file_get_contents("php://input"));
-
-echo "Done\n";
+?>
+Done
 --EXPECTF--
 Test
 object(%s)#%d (12) {
diff --git a/tests/message003.phpt b/tests/message003.phpt
index 69be990..26c6bc1 100644
--- a/tests/message003.phpt
+++ b/tests/message003.phpt
@@ -1,9 +1,9 @@
 --TEST--
 multipart message
 --SKIPIF--
-<? include "skipif.inc";
+<?php include "skipif.inc"; ?>
 --FILE--
-<?
+<?php
 $m = new http\Message(fopen(__DIR__."/data/message_r_multipart_put.txt","rb"));
 if ($m->isMultipart($boundary)) {
     var_dump($boundary);
diff --git a/tests/negotiate001.phpt b/tests/negotiate001.phpt
index d384b87..f628cdf 100644
--- a/tests/negotiate001.phpt
+++ b/tests/negotiate001.phpt
@@ -52,7 +52,7 @@ echo "$ln: "; print_r($lnr);
 
 CUSTOM
 
-<?
+<?php
 $cc = http\Env::negotiate("a, a.b;q=0.9, c.d;q=0, *.* ; q=0.1",
     array("a.x", "c.d", "c.e", "a.b"), ".", $ccr);
 echo "$cc: "; print_r($ccr);
-- 
2.30.2