Skip to content

Commit 89bd75c

Browse files
meet-alekseymeet-aleksey
committed
Fixes for working with sessions.
Added set() and get() methods for custom settings. Default endHandler() and preSendHandler().
1 parent 315e0f2 commit 89bd75c

File tree

6 files changed

+125
-47
lines changed

6 files changed

+125
-47
lines changed

‎src/AppBuilder.php‎

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ final class AppBuilder {
1212
private static $appContext;
1313

1414
/**
15+
* The config of the AppBuilder.
16+
*
1517
* @var array
1618
*/
1719
private static $config = array();
@@ -110,6 +112,37 @@ public static function use($callback) {
110112
self::$config['customHandlers'] = $callback;
111113
}
112114

115+
/**
116+
* Adds a custom setting.
117+
*
118+
* @param string $key The unique key.
119+
* @param mixed $value The value.
120+
*
121+
* @return void
122+
*/
123+
public static function set($key, $value) {
124+
if (!isset(self::$config['settings'])) {
125+
self::$config['settings'] = array();
126+
}
127+
128+
self::$config['settings'][$key] = $value;
129+
}
130+
131+
/**
132+
* Gets a custom setting.
133+
*
134+
* @param string $key The name of the parameter to get.
135+
*
136+
* @return mixed
137+
*/
138+
public static function get($key) {
139+
if (!isset(self::$config['settings']) || !isset(self::$config['settings'][$key])) {
140+
return null;
141+
}
142+
143+
return self::$config['settings'][$key];
144+
}
145+
113146
/**
114147
* Registers routes.
115148
*
@@ -140,7 +173,7 @@ public static function build() {
140173
if ($route !== false) {
141174
$actionContext = self::actionContext($route);
142175

143-
if (!self::cached($actionContext)) {
176+
if ($actionContext !== null && !self::cached($actionContext)) {
144177
self::filters($actionContext);
145178
self::headers();
146179
self::validation();
@@ -260,6 +293,7 @@ private static function init() {
260293
$info->cacheProvider = $config['cacheProvider'];
261294
$info->request = new HttpRequest();
262295
$info->response = new HttpResponse();
296+
$info->session = $_SESSION;
263297

264298
$config['httpContext'] = new HttpContext($info);
265299
}
@@ -277,6 +311,18 @@ private static function init() {
277311
}
278312
}
279313

314+
// default response handlers
315+
$response = $config['httpContext']->getResponse();
316+
317+
$response->setEndHandler(function() use ($config) {
318+
self::invokeAll(self::$appContext->getEnd(), array(new ActionContext($config['httpContext'])));
319+
});
320+
321+
$response->setPreSendHandler(function() use ($config) {
322+
self::invokeAll(self::$appContext->getPreSend(), array(new ActionContext($config['httpContext'])));
323+
});
324+
325+
// set context and config, and invoke init handlers
280326
InternalHelper::setStaticPropertyValue('\\PhpMvc\\HttpContext', 'current', $config['httpContext']);
281327

282328
self::$appContext->setConfig($config);
@@ -329,6 +375,7 @@ private static function canRoute() {
329375
*/
330376
private static function actionContext($route) {
331377
$httpContext = self::$config['httpContext'];
378+
$response = $httpContext->getResponse();
332379

333380
// TODO: kill constants
334381
if (!defined('PHPMVC_CONTROLLER')) { define('PHPMVC_CONTROLLER', ucfirst($route->getValueOrDefault('controller', 'Home'))); }
@@ -337,13 +384,21 @@ private static function actionContext($route) {
337384
if (!defined('PHPMVC_CURRENT_CONTROLLER_PATH')) { define('PHPMVC_CURRENT_CONTROLLER_PATH', PHPMVC_CONTROLLER_PATH . PHPMVC_VIEW . PHPMVC_DS); }
338385
if (!defined('PHPMVC_CURRENT_VIEW_PATH')) { define('PHPMVC_CURRENT_VIEW_PATH', PHPMVC_VIEW_PATH . PHPMVC_VIEW . PHPMVC_DS . PHPMVC_ACTION . '.php'); }
339386

387+
$controllerClassName = '\\' . PHPMVC_APP_NAMESPACE . '\\Controllers\\' . PHPMVC_CONTROLLER . 'Controller';
388+
389+
if (!class_exists($controllerClassName)) {
390+
$response->setStatusCode(404);
391+
$response->end();
392+
return null;
393+
}
394+
340395
// create action context
341396
$actionContext = new ActionContext($httpContext);
342397
InternalHelper::setPropertyValue($actionContext, 'actionName', PHPMVC_ACTION);
343398

344-
// preparing to create an instance of the controller class
345-
$controllerClass = new \ReflectionClass('\\' . PHPMVC_APP_NAMESPACE . '\\Controllers\\' . PHPMVC_CONTROLLER . 'Controller');
346-
399+
// preparing to create an instance of the controller class
400+
$controllerClass = new \ReflectionClass($controllerClassName);
401+
347402
if (!$controllerClass->isSubclassOf('\\PhpMvc\\Controller')) {
348403
throw new \Exception('The controller type must be the base of "\\PhpMvc\\Controller".');
349404
}
@@ -375,17 +430,17 @@ private static function actionContext($route) {
375430
// InternalHelper::setPropertyValue($modelState, 'annotations', $annotations);
376431

377432
// response handling
378-
$httpContext->getResponse()->setFlushHandler(function($eventArgs) use ($actionContext) {
433+
$response->setFlushHandler(function($eventArgs) use ($actionContext) {
379434
self::cachingPartial($actionContext, $eventArgs);
380435
self::invokeAll(self::$appContext->getFlush(), array($actionContext, $eventArgs));
381436
});
382437

383-
$httpContext->getResponse()->setEndHandler(function() use ($actionContext) {
438+
$response->setEndHandler(function() use ($actionContext) {
384439
self::caching($actionContext);
385440
self::invokeAll(self::$appContext->getEnd(), array($actionContext));
386441
});
387442

388-
$httpContext->getResponse()->setPreSendHandler(function() use ($actionContext) {
443+
$response->setPreSendHandler(function() use ($actionContext) {
389444
self::cachingClient($actionContext);
390445
self::invokeAll(self::$appContext->getPreSend(), array($actionContext));
391446
});

‎src/HttpContextBase.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ abstract class HttpContextBase {
2727
*/
2828
protected $response;
2929

30+
/**
31+
* An associative array containing session variables available to the current script.
32+
*
33+
* @var array
34+
*/
35+
protected $session;
36+
3037
/**
3138
* The routes collection.
3239
*
@@ -70,6 +77,7 @@ public function __construct($info) {
7077
$this->cache = $info->cacheProvider;
7178
$this->request = $info->request;
7279
$this->response = $info->response;
80+
$this->session = $info->session;
7381
}
7482

7583
/**
@@ -99,6 +107,29 @@ public function getResponse() {
99107
return $this->response;
100108
}
101109

110+
/**
111+
* Gets the session variables.
112+
*
113+
* @param string|null $key The key to get. Default: null - all variables.
114+
*
115+
* @return array|mixed
116+
*/
117+
public function getSession($key = null) {
118+
return InternalHelper::getSingleKeyOrAll($this->session, $key);
119+
}
120+
121+
/**
122+
* Sets the variable to the session.
123+
*
124+
* @param string $key The key to set.
125+
* @param string $value The value to set.
126+
*
127+
* @return void
128+
*/
129+
public function setSession($key, $value) {
130+
$this->session[$key] = $value;
131+
}
132+
102133
/**
103134
* Gets list of routes.
104135
*

‎src/HttpContextInfo.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,11 @@ class HttpContextInfo {
3434
*/
3535
public $response;
3636

37+
/**
38+
* Gets or sets session variables.
39+
*
40+
* @var array
41+
*/
42+
public $session;
43+
3744
}

‎src/HttpRequestBase.php‎

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ abstract class HttpRequestBase {
4848
*/
4949
protected $cookies;
5050

51-
/**
52-
* An associative array containing session variables available to the current script.
53-
*
54-
* @var array
55-
*/
56-
protected $session;
57-
5851
/**
5952
* An associative array of variables passed to the current script via the URL parameters.
6053
*
@@ -96,15 +89,13 @@ abstract class HttpRequestBase {
9689
protected function __construct(
9790
$serverVariables,
9891
$cookies = array(),
99-
$session = array(),
10092
$get = array(),
10193
$post = array(),
10294
$files = array()
10395
) {
10496
$this->serverVariables = $serverVariables;
10597

10698
$this->cookies = $cookies;
107-
$this->session = $session;
10899
$this->get = $get;
109100
$this->post = $post;
110101
$this->files = $files;
@@ -147,7 +138,7 @@ public function url() {
147138
*
148139
* @return string
149140
*/
150-
public function rawUrl () {
141+
public function rawUrl() {
151142
if ($this->rawUrl === null) {
152143
$this->rawUrl = (isset($this->serverVariables['REQUEST_URI']) ? $this->serverVariables['REQUEST_URI'] : '');
153144
}
@@ -216,7 +207,7 @@ public function documentRoot() {
216207
* @return array|string
217208
*/
218209
public function server($key = null) {
219-
return $this->getSingleKeyOrAll($this->serverVariables, $key);
210+
return InternalHelper::getSingleKeyOrAll($this->serverVariables, $key);
220211
}
221212

222213
/**
@@ -227,18 +218,7 @@ public function server($key = null) {
227218
* @return array|string
228219
*/
229220
public function cookies($key = null) {
230-
return $this->getSingleKeyOrAll($this->cookies, $key);
231-
}
232-
233-
/**
234-
* Returns session.
235-
*
236-
* @param string|null $key The session key to get. Default: null - all keys.
237-
*
238-
* @return array|mixed
239-
*/
240-
public function session($key = null) {
241-
return $this->getSingleKeyOrAll($this->session, $key);
221+
return InternalHelper::getSingleKeyOrAll($this->cookies, $key);
242222
}
243223

244224
/**
@@ -249,7 +229,7 @@ public function session($key = null) {
249229
* @return array|mixed
250230
*/
251231
public function get($key = null) {
252-
return $this->getSingleKeyOrAll($this->get, $key);
232+
return InternalHelper::getSingleKeyOrAll($this->get, $key);
253233
}
254234

255235
/**
@@ -260,7 +240,7 @@ public function get($key = null) {
260240
* @return array|mixed
261241
*/
262242
public function post($key = null) {
263-
return $this->getSingleKeyOrAll($this->post, $key);
243+
return InternalHelper::getSingleKeyOrAll($this->post, $key);
264244
}
265245

266246
/**
@@ -271,7 +251,7 @@ public function post($key = null) {
271251
* @return array|mixed
272252
*/
273253
public function files($key = null) {
274-
return $this->getSingleKeyOrAll($this->files, $key);
254+
return InternalHelper::getSingleKeyOrAll($this->files, $key);
275255
}
276256

277257
/**
@@ -390,19 +370,7 @@ public function headers($key = null) {
390370
$this->headers = $result;
391371
}
392372

393-
return $this->getSingleKeyOrAll($this->headers, $key);
394-
}
395-
396-
/**
397-
* Gets single key from array or all keys, if key is null.
398-
*/
399-
private function getSingleKeyOrAll($array, $key) {
400-
if ($key !== null) {
401-
return (isset($array[$key])) ? $array[$key] : null;
402-
}
403-
else {
404-
return $array;
405-
}
373+
return InternalHelper::getSingleKeyOrAll($this->headers, $key);
406374
}
407375

408376
}

‎src/InternalHelper.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,23 @@ public static function arrayToObject($array, $parent = null) {
238238
return $result;
239239
}
240240

241+
/**
242+
* Gets single key from array or all keys, if key is null.
243+
*
244+
* @param array $array The array to work.
245+
* @param string|null $key The key to get, or null to get the $array.
246+
*
247+
* @return array|mixed|null
248+
*/
249+
public static function getSingleKeyOrAll($array, $key) {
250+
if ($key !== null) {
251+
return (isset($array[$key])) ? $array[$key] : null;
252+
}
253+
else {
254+
return $array;
255+
}
256+
}
257+
241258
/**
242259
* Sets view context to static classes.
243260
*

‎tests/HttpRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
final class HttpRequest extends HttpRequestBase {
55

66
public function __construct($serverVariables, $get = array(), $post = array()) {
7-
parent::__construct($serverVariables, array(), array(), $get, $post);
7+
parent::__construct($serverVariables, array(), $get, $post);
88
}
99

1010
}

0 commit comments

Comments
 (0)