Skip to content

Commit 0eb9e8b

Browse files
meet-alekseymeet-aleksey
committed
Added init() method to providers.
Add useHeaders() and useSession().
1 parent 00204e6 commit 0eb9e8b

9 files changed

+117
-20
lines changed

‎src/AppBuilder.php‎

Lines changed: 59 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,30 @@ public static function useRouter($routeProvider) {
6363
self::$config['routeProvider'] = $routeProvider;
6464
}
6565

66+
/**
67+
* Sets response HTTP headers.
68+
*
69+
* @param array $headers The HTTP headers collection.
70+
* For example: array('X-Powered-By' => 'PHP', 'X-PhpVersion' => '7.0')
71+
*
72+
* @return void
73+
*/
74+
public static function useHeaders($headers) {
75+
self::$config['httpHeaders'] = $headers;
76+
}
77+
78+
/**
79+
* Start new or resume existing session.
80+
*
81+
* @param array $opions If provided, this is an associative array of options that will override the currently set session configuration directives.
82+
* http://php.net/manual/en/session.configuration.php
83+
*
84+
* @return void
85+
*/
86+
public static function useSession($opions = null) {
87+
self::$config['session'] = (!empty($opions) ? $opions : true);
88+
}
89+
6690
/**
6791
* Registers routes.
6892
*
@@ -108,8 +132,12 @@ public static function build() {
108132
* @return void
109133
*/
110134
private static function headers() {
135+
if (empty(self::$config['httpHeaders'])) {
136+
return;
137+
}
138+
111139
$response = self::$config['httpContext']->getResponse();
112-
$response->addHeader('X-Powered-By', Info::XPOWEREDBY);
140+
$response->setHeaders(self::$config['httpHeaders']);
113141
}
114142

115143
/**
@@ -126,13 +154,33 @@ private static function init() {
126154
self::$config['basePath'] = getcwd();
127155
}
128156

157+
if (!defined('PHPMVC_DS')) { define('PHPMVC_DS', DIRECTORY_SEPARATOR); }
158+
if (!defined('PHPMVC_ROOT_PATH')) { define('PHPMVC_ROOT_PATH', self::$config['basePath'] . PHPMVC_DS); }
159+
if (!defined('PHPMVC_CORE_PATH')) { define('PHPMVC_CORE_PATH', __DIR__ .PHPMVC_DS); }
160+
if (!defined('PHPMVC_CONFIG_PATH')) { define('PHPMVC_CONFIG_PATH', PHPMVC_ROOT_PATH . 'config' . PHPMVC_DS); }
161+
if (!defined('PHPMVC_FILTER_PATH')) { define('PHPMVC_FILTER_PATH', PHPMVC_ROOT_PATH . 'filters' . PHPMVC_DS); }
162+
if (!defined('PHPMVC_CONTROLLER_PATH')) { define('PHPMVC_CONTROLLER_PATH', PHPMVC_ROOT_PATH . 'controllers' . PHPMVC_DS); }
163+
if (!defined('PHPMVC_MODEL_PATH')) { define('PHPMVC_MODEL_PATH', PHPMVC_ROOT_PATH . 'models' . PHPMVC_DS); }
164+
if (!defined('PHPMVC_VIEW_PATH')) { define('PHPMVC_VIEW_PATH', PHPMVC_ROOT_PATH . 'views' . PHPMVC_DS); }
165+
if (!defined('PHPMVC_SHARED_PATH')) { define('PHPMVC_SHARED_PATH', PHPMVC_VIEW_PATH . 'shared' . PHPMVC_DS); }
166+
if (!defined('PHPMVC_UPLOAD_PATH')) { define('PHPMVC_UPLOAD_PATH', PHPMVC_ROOT_PATH . 'upload' . PHPMVC_DS); }
167+
168+
if (!defined('PHPMVC_APP_NAMESPACE')) {
169+
define('PHPMVC_APP_NAMESPACE', self::$config['appNamespace']);
170+
}
171+
elseif (PHPMVC_APP_NAMESPACE !== self::$config['appNamespace']) {
172+
throw new \Exception('Constant PHPMVC_CONTROLLER already defined. Re-define with other value is not possible.');
173+
}
174+
129175
if (empty(self::$config['routeProvider'])) {
130176
self::$config['routeProvider'] = new DefaultRouteProvider();
131177
}
132178
elseif (!self::$config['routeProvider'] instanceof RouteProvider) {
133179
throw new \Exception('The routeProvider type must be the base of "\PhpMvc\RouteProvider".');
134180
}
135181

182+
self::$config['routeProvider']->init();
183+
136184
if (isset(self::$config['routes'])) {
137185
if (is_callable(self::$config['routes'])) {
138186
self::$config['routes'](self::$config['routeProvider']);
@@ -166,6 +214,8 @@ private static function init() {
166214
throw new \Exception('The $cacheProvider type must be the base of "\PhpMvc\CacheProvider".');
167215
}
168216

217+
self::$config['cacheProvider']->init();
218+
169219
if (empty(self::$config['httpContext'])) {
170220
$info = new HttpContextInfo();
171221
$info->routeProvider = self::$config['routeProvider'];
@@ -179,22 +229,14 @@ private static function init() {
179229
throw new \Exception('The httpContext type must be the base of "\PhpMvc\HttpContextBase".');
180230
}
181231

182-
if (!defined('PHPMVC_DS')) { define('PHPMVC_DS', DIRECTORY_SEPARATOR); }
183-
if (!defined('PHPMVC_ROOT_PATH')) { define('PHPMVC_ROOT_PATH', self::$config['basePath'] . PHPMVC_DS); }
184-
if (!defined('PHPMVC_CORE_PATH')) { define('PHPMVC_CORE_PATH', __DIR__ .PHPMVC_DS); }
185-
if (!defined('PHPMVC_CONFIG_PATH')) { define('PHPMVC_CONFIG_PATH', PHPMVC_ROOT_PATH . 'config' . PHPMVC_DS); }
186-
if (!defined('PHPMVC_FILTER_PATH')) { define('PHPMVC_FILTER_PATH', PHPMVC_ROOT_PATH . 'filters' . PHPMVC_DS); }
187-
if (!defined('PHPMVC_CONTROLLER_PATH')) { define('PHPMVC_CONTROLLER_PATH', PHPMVC_ROOT_PATH . 'controllers' . PHPMVC_DS); }
188-
if (!defined('PHPMVC_MODEL_PATH')) { define('PHPMVC_MODEL_PATH', PHPMVC_ROOT_PATH . 'models' . PHPMVC_DS); }
189-
if (!defined('PHPMVC_VIEW_PATH')) { define('PHPMVC_VIEW_PATH', PHPMVC_ROOT_PATH . 'views' . PHPMVC_DS); }
190-
if (!defined('PHPMVC_SHARED_PATH')) { define('PHPMVC_SHARED_PATH', PHPMVC_VIEW_PATH . 'shared' . PHPMVC_DS); }
191-
if (!defined('PHPMVC_UPLOAD_PATH')) { define('PHPMVC_UPLOAD_PATH', PHPMVC_ROOT_PATH . 'upload' . PHPMVC_DS); }
192-
193-
if (!defined('PHPMVC_APP_NAMESPACE')) {
194-
define('PHPMVC_APP_NAMESPACE', self::$config['appNamespace']);
195-
}
196-
elseif (PHPMVC_APP_NAMESPACE !== self::$config['appNamespace']) {
197-
throw new \Exception('Constant PHPMVC_CONTROLLER already defined. Re-define with other value is not possible.');
232+
if (isset(self::$config['session'])) {
233+
// TODO: session provider
234+
if (is_array(self::$config['session'])) {
235+
session_start(self::$config['session']);
236+
}
237+
else {
238+
session_start();
239+
}
198240
}
199241

200242
InternalHelper::setStaticPropertyValue('\\PhpMvc\\HttpContext', 'current', self::$config['httpContext']);

‎src/CacheProvider.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ function contains($key, $regionName = null);
4646
*/
4747
function count($regionName = null);
4848

49+
/**
50+
* Initializes the provider.
51+
*
52+
* @return void
53+
*/
54+
function init();
55+
4956
/**
5057
* Gets the specified cache entry from the cache as an object.
5158
*

‎src/DefaultRouteProvider.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ public function ignore($template, $constraints = null) {
142142
$this->ignored->add($route);
143143
}
144144

145+
/**
146+
* Initializes the provider.
147+
*
148+
* @return void
149+
*/
150+
public function init() {
151+
}
152+
145153
/**
146154
* Removes all routes.
147155
*

‎src/FileCacheProvider.php‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ final class FileCacheProvider implements CacheProvider {
2727
*/
2828
private $hash;
2929

30+
/**
31+
* Defines cache settings.
32+
*
33+
* @var FileCacheProviderConfig
34+
*/
35+
private $config;
36+
3037
/**
3138
* Initializes a new instance of the FileCacheProvider class.
3239
*
@@ -44,9 +51,7 @@ public function __construct($config = null) {
4451
$config->cachePath = '~/cache';
4552
}
4653

47-
$this->cachePath = PathUtility::mapPath($config->cachePath);
48-
$this->accessTime = (isset($config->accessTime) ? (int)$config->accessTime : 100) * 1000;
49-
$this->hash = (isset($config->hash) ? $config->hash : null);
54+
$this->config = $config;
5055
}
5156

5257
/**
@@ -104,6 +109,17 @@ public function count($regionName = null) {
104109
return count(glob($this->getPath($regionName) . DIRECTORY_SEPARATOR . '*.cache'));
105110
}
106111

112+
/**
113+
* Initializes the provider.
114+
*
115+
* @return void
116+
*/
117+
public function init() {
118+
$this->cachePath = PathUtility::mapPath($this->config->cachePath);
119+
$this->accessTime = (isset($this->config->accessTime) ? (int)$this->config->accessTime : 100) * 1000;
120+
$this->hash = (isset($this->config->hash) ? $this->config->hash : null);
121+
}
122+
107123
/**
108124
* Gets the specified cache entry from the cache as an object.
109125
*

‎src/IdleCacheProvider.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ public function count($regionName = null) {
5353
return 0;
5454
}
5555

56+
/**
57+
* Initializes the provider.
58+
*
59+
* @return void
60+
*/
61+
public function init() {
62+
}
63+
5664
/**
5765
* Gets the specified cache entry from the cache as an object.
5866
*

‎src/RouteProvider.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ function setOptions($options);
7070
*/
7171
function ignore($template, $constraints = null);
7272

73+
/**
74+
* Initializes the provider.
75+
*
76+
* @return void
77+
*/
78+
function init();
79+
7380
/**
7481
* Returns the first ignored route similar to the current url.
7582
*

‎tests/DefaultRouteProviderTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ final class DefaultRouteProviderTest extends TestCase
1616
public function testGetRoute(): void {
1717
$routes = new DefaultRouteProvider();
1818

19+
$routes->init();
20+
1921
$routes->ignore('favicon.ico');
2022
$routes->ignore('preview{extension}', array('extension' => '\.(png|jpg)'));
2123
$routes->ignore('content/{*file}');

‎tests/FileCacheProviderTest.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public function __construct($name = null, array $data = [], $dataName = '') {
2828
public function testDefault(): void {
2929
$cache = new FileCacheProvider();
3030

31+
$cache->init();
3132
$cache->clear();
3233

3334
$this->assertNull($cache->get('test'));
@@ -109,6 +110,7 @@ public function testDefault(): void {
109110
public function testRegion(): void {
110111
$cache = new FileCacheProvider();
111112

113+
$cache->init();
112114
$cache->clear();
113115

114116
$this->assertNull($cache->get('test'));
@@ -161,6 +163,7 @@ public function testRegion(): void {
161163
public function testKeys(): void {
162164
$cache = new FileCacheProvider();
163165

166+
$cache->init();
164167
$cache->clear();
165168

166169
$this->assertNull($cache->get('!@#/#$%@&*(/\\'));
@@ -174,6 +177,8 @@ public function testKeys(): void {
174177

175178
$cache = new FileCacheProvider(array('hash' => 'sha1'));
176179

180+
$cache->init();
181+
177182
$this->assertEquals('Hello, World!', $cache->getOrAdd('!@#/#$%@&*(/\\', function() { return 'Hello, World!'; }, 5));
178183
$this->assertEquals(123, $cache->getOrAdd('!@####!/#$%@&*(/\\', function() { return 123; }, 5));
179184

@@ -188,6 +193,7 @@ public function testKeys(): void {
188193
public function testAccess(): void {
189194
$cache = new FileCacheProvider();
190195

196+
$cache->init();
191197
$cache->clear();
192198

193199
$cache->add('test', 'Hello, world!', 300);

‎tests/OutputCacheTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public function __construct($name = null, array $data = [], $dataName = '') {
3838
AppBuilder::useBasePath($basePath);
3939

4040
$this->cacheProvider = new FileCacheProvider();
41+
$this->cacheProvider->init();
4142
}
4243

4344
public function testNoCache(): void {

0 commit comments

Comments
 (0)