Skip to content

Commit f6af4af

Browse files
meet-alekseymeet-aleksey
committed
Development Html class.
Tests for the Html class. Fixes and improvements.
1 parent 68b7b8a commit f6af4af

17 files changed

+1092
-156
lines changed

‎src/Html.php‎

Lines changed: 509 additions & 11 deletions
Large diffs are not rendered by default.

‎src/HttpRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ final class HttpRequest extends HttpRequestBase {
1212
public function __construct() {
1313
parent::__construct($_SERVER, $_COOKIE, $_SESSION, $_GET, $_POST, $_FILES);
1414
}
15-
15+
1616
}

‎src/HttpRequestBase.php‎

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected function __construct(
9696
*
9797
* @return string
9898
*/
99-
public function getRequestUri() {
99+
public function requestUri() {
100100
return $this->requestUri;
101101
}
102102

@@ -105,7 +105,7 @@ public function getRequestUri() {
105105
*
106106
* @return string
107107
*/
108-
public function getQueryString() {
108+
public function queryString() {
109109
return $this->queryString;
110110
}
111111

@@ -114,7 +114,7 @@ public function getQueryString() {
114114
*
115115
* @return array
116116
*/
117-
public function getServerVariables() {
117+
public function serverVariables() {
118118
return $this->serverVariables;
119119
}
120120

@@ -123,7 +123,7 @@ public function getServerVariables() {
123123
*
124124
* @return array
125125
*/
126-
public function getCookies() {
126+
public function cookies() {
127127
return $this->cookies;
128128
}
129129

@@ -132,7 +132,7 @@ public function getCookies() {
132132
*
133133
* @return array
134134
*/
135-
public function getSession() {
135+
public function session() {
136136
return $this->session;
137137
}
138138

@@ -141,7 +141,7 @@ public function getSession() {
141141
*
142142
* @return array
143143
*/
144-
public function getGetData() {
144+
public function get() {
145145
return $this->get;
146146
}
147147

@@ -150,7 +150,7 @@ public function getGetData() {
150150
*
151151
* @return array
152152
*/
153-
public function getPostData() {
153+
public function post() {
154154
return $this->post;
155155
}
156156

@@ -159,7 +159,7 @@ public function getPostData() {
159159
*
160160
* @return array
161161
*/
162-
public function getFiles() {
162+
public function files() {
163163
return $this->files;
164164
}
165165

@@ -172,6 +172,15 @@ public function isPost() {
172172
return $this->serverVariables['REQUEST_METHOD'] === 'POST';
173173
}
174174

175+
/**
176+
* Gets the HTTP data transfer method (such as GET, POST, or HEAD) used by the client.
177+
*
178+
* @return string
179+
*/
180+
public function httpMethod() {
181+
return $this->serverVariables['REQUEST_METHOD'];
182+
}
183+
175184
/**
176185
* Gets a value indicating whether the HTTP connection uses secure sockets (HTTPS).
177186
*
@@ -182,29 +191,57 @@ public function isSecureConnection() {
182191
}
183192

184193
/**
185-
* Returns HTTP method of the request.
194+
* Returns user agent.
186195
*
187196
* @return string
188197
*/
189-
public function httpMethod() {
190-
return $this->serverVariables['REQUEST_METHOD'];
198+
public function userAgent() {
199+
return $this->serverVariables['HTTP_USER_AGENT'];
200+
}
201+
202+
/**
203+
* The IP address from which the user is viewing the current page.
204+
*
205+
* @return string
206+
*/
207+
public function userHostAddress() {
208+
return $this->serverVariables['REMOTE_ADDR'];
191209
}
192210

193211
/**
194212
* Returns Content-Type of the request or empty string.
195213
*
196214
* @return string
197215
*/
198-
public function getContentType() {
216+
public function contentType() {
199217
$headers = array('CONTENT_TYPE', 'HTTP_CONTENT_TYPE');
200218

201219
foreach ($headers as $header) {
202220
if (!empty($this->serverVariables[$header])) {
203221
return $this->serverVariables[$header];
204222
}
205223
}
206-
224+
207225
return '';
208226
}
209227

228+
/**
229+
* Returns HTTP headers of the request.
230+
*
231+
* @return array
232+
*/
233+
public function headers() {
234+
$result = array();
235+
236+
foreach ($this->serverVariables as $key => $value)
237+
{
238+
if (substr($key, 0, 5) == 'HTTP_')
239+
{
240+
$result[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))))] = $value;
241+
}
242+
}
243+
244+
return $result;
245+
}
246+
210247
}

‎src/HttpResponse.php‎

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,6 @@
66
*/
77
final class HttpResponse extends HttpResponseBase {
88

9-
/**
10-
* Gets or sets output data.
11-
*/
12-
private $output = '';
13-
14-
/**
15-
* Files to output.
16-
*/
17-
private $files = array();
18-
19-
/**
20-
* Writes the specified string to the HTTP response output stream.
21-
*
22-
* @param string $value The string to write to the HTTP output stream.
23-
*
24-
* @return void
25-
*/
26-
public function write($value) {
27-
$this->output .= $value;
28-
}
29-
30-
/**
31-
* Writes the contents of the specified file to the HTTP response output stream.
32-
*
33-
* @param string $path The path of the file to write to the HTTP output.
34-
*
35-
* @return void
36-
*/
37-
public function writeFile($path) {
38-
$this->files[] = $path;
39-
}
40-
41-
/**
42-
* Clears all headers and content output from the current response.
43-
*
44-
* @return void
45-
*/
46-
public function clear() {
47-
$this->header = array();
48-
$this->files = array();
49-
$this->output = '';
50-
}
51-
529
/**
5310
* Sends all currently buffered output to the client and stops execution of the requested process.
5411
*
@@ -73,6 +30,11 @@ public function end() {
7330
header($name . ': ' . $value);
7431
}
7532

33+
// cookies
34+
foreach ($this->cookies as $cookie) {
35+
call_user_func_array('setcookie', $cookie);
36+
}
37+
7638
// files
7739
foreach ($this->files as $file) {
7840
$fp = fopen($this->path, 'rb');

‎src/HttpResponseBase.php‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,23 @@ abstract class HttpResponseBase {
2727
*/
2828
protected $headers = array();
2929

30+
/**
31+
* Gets or sets cookies list.
32+
*
33+
* @var array
34+
*/
35+
protected $cookies = array();
36+
37+
/**
38+
* Data to output.
39+
*/
40+
protected $output = '';
41+
42+
/**
43+
* Files to output.
44+
*/
45+
protected $files = array();
46+
3047
/**
3148
* Sets the HTTP status code of the output that is returned to the client.
3249
*
@@ -61,14 +78,23 @@ public function addHeader($name, $value) {
6178
$this->headers[$name] = $value;
6279
}
6380

81+
/**
82+
* Send a cookie.
83+
*/
84+
public function setCookie(string $name, string $value = '', int $expire = 0, string $path = '', string $domain = '', bool $secure = false, bool $httponly = false) {
85+
$this->cookies[] = func_get_args();
86+
}
87+
6488
/**
6589
* Writes the specified string to the HTTP response output stream.
6690
*
6791
* @param string $value The string to write to the HTTP output stream.
6892
*
6993
* @return void
7094
*/
71-
abstract public function write($value);
95+
public function write($value) {
96+
$this->output .= $value;
97+
}
7298

7399
/**
74100
* Writes the contents of the specified file to the HTTP response output stream.
@@ -77,14 +103,21 @@ abstract public function write($value);
77103
*
78104
* @return void
79105
*/
80-
abstract public function writeFile($path);
106+
public function writeFile($path) {
107+
$this->files[] = $path;
108+
}
81109

82110
/**
83111
* Clears all headers and content output from the current response.
84112
*
85113
* @return void
86114
*/
87-
abstract public function clear();
115+
public function clear() {
116+
$this->header = array();
117+
$this->cookies = array();
118+
$this->files = array();
119+
$this->output = '';
120+
}
88121

89122
/**
90123
* Sends all currently buffered output to the client and stops execution of the requested process.

‎src/Make.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ private static function context($httpContext = null) {
115115

116116
// create action context
117117
self::$actionContext = $actionContext = new ActionContext($httpContext);
118+
$actionContext->actionName = PHPMVC_ACTION;
118119

119120
// preparing to create an instance of the controller class
120121
$controllerClass = new \ReflectionClass('\\' . PHPMVC_APP_NAMESPACE . '\\Controllers\\' . PHPMVC_CONTROLLER . 'Controller');
@@ -142,7 +143,6 @@ private static function context($httpContext = null) {
142143
$actionContextProperty->setValue($controllerInstance, $actionContext);
143144

144145
$actionContext->controller = $controllerInstance;
145-
$actionContext->actionName = PHPMVC_ACTION;
146146
}
147147

148148
/**
@@ -279,22 +279,22 @@ private static function makeActionState($actionContext) {
279279

280280
// get http params
281281
// TODO: подумать о возможности управлять этим
282-
$get = self::$request->getGetData();
282+
$get = self::$request->get();
283283

284284
// change case of keys
285285
$get = array_change_key_case($get, CASE_LOWER);
286286

287287
// post params
288288
$isPost = self::$request->isPost();
289-
$postData = $isPost ? self::$request->getPostData() : null;
289+
$postData = $isPost ? self::$request->post() : null;
290290
$post = null;
291291

292292
if (!empty($postData)) {
293293
$post = self::arrayToObject($postData);
294294
}
295295

296296
if (empty($post) && $isPost) {
297-
$contentType = self::$request->getContentType();
297+
$contentType = self::$request->contentType();
298298

299299
if (strrpos($contentType, '/json') !== false) {
300300
$requestBody = file_get_contents('php://input');
@@ -383,8 +383,8 @@ private static function annotateAndValidateModelEntry($modelState, $key) {
383383
if (($dataAnnotation = $modelState->getAnnotation($key)) !== null) {
384384
$displayName = $key;
385385

386-
if (!empty($dataAnnotation->name)) {
387-
$displayName = $dataAnnotation->name;
386+
if (!empty($dataAnnotation->displayName)) {
387+
$displayName = $dataAnnotation->displayName;
388388
}
389389

390390
// required field
@@ -404,8 +404,8 @@ private static function annotateAndValidateModelEntry($modelState, $key) {
404404
$displayName2 = $entry2->key;
405405

406406
if (($dataAnnotation2 = $modelState->getAnnotation($entry2->key)) !== null) {
407-
if (!empty($dataAnnotation2->name)) {
408-
$displayName2 = $dataAnnotation2->name;
407+
if (!empty($dataAnnotation2->displayName)) {
408+
$displayName2 = $dataAnnotation2->displayName;
409409
}
410410
}
411411

0 commit comments

Comments
 (0)