Skip to content

Commit 3ed8e1c

Browse files
meet-alekseymeet-aleksey
committed
Fixes and improvements.
1 parent c955b2d commit 3ed8e1c

File tree

8 files changed

+74
-30
lines changed

8 files changed

+74
-30
lines changed

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ Create the following structure in the project root directory:
7777

7878
```php
7979
<?php
80-
// include PhpMvc
81-
require_once __DIR__ . '/vendor/php-mvc-project/php-mvc/src/index.php';
80+
// use aoutoload (recommended)
81+
require_once getcwd() . '/vendor/autoload.php';
82+
// or include the required files
83+
// require_once getcwd() . '/vendor/php-mvc-project/php-mvc/src/index.php';
8284

8385
// import the AppBuilder class
8486
use PhpMvc\AppBuilder;
@@ -183,6 +185,8 @@ use PhpMvc\Model;
183185
class AccountController extends Controller {
184186

185187
public function __construct() {
188+
Model::use('join', 'join');
189+
186190
Model::required('join', 'username');
187191
Model::required('join', 'email');
188192
Model::required('join', 'password');
@@ -428,7 +432,7 @@ The filters must be in the `./Filters` folder.
428432

429433
Each filter must be inherited from the `PhpMvc\ActionFilter` class.
430434

431-
Filters can be global, or work at the level of a single controller, or at the level of a single action.
435+
Filters can be global, or work at the level of an individual controller, or action.
432436

433437
Filters for specific controller or action can be set in the controller's constructor:
434438

@@ -609,7 +613,7 @@ var_dump($cache->get('test'));
609613

610614
For output caching, you can use the static `OutputCache` class.
611615

612-
Caching rules can be specified for both the controller and for a single action.
616+
Caching rules can be specified for both the controller and for an each action.
613617

614618
Cache rules should be specified in the constructor of the controller.
615619

‎src/Info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
*/
3131
final class Info {
3232

33-
const VERSION = '1.0.0';
33+
const VERSION = '1.1.0';
3434

3535
}

‎src/ModelState.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ public function getValues() {
131131
* @return void
132132
*/
133133
public function addError($key, $error) {
134+
if (is_array($key)) {
135+
$key = implode('_', $key);
136+
}
137+
134138
if (array_key_exists($key, $this->errors)) {
135139
$this->errors[$key][] = $error;
136140
}
@@ -143,11 +147,15 @@ public function addError($key, $error) {
143147
* Gets the metadata for the specified model key.
144148
* If there is no data, it returns null.
145149
*
146-
* @param string @key The key to get metadata.
150+
* @param string|string[] @key The key to get metadata.
147151
*
148152
* @return ModelDataAnnotation|null
149153
*/
150154
public function getAnnotation($key) {
155+
if (is_array($key)) {
156+
$key = implode('_', $key);
157+
}
158+
151159
if (array_key_exists($key, $this->annotations)) {
152160
return $this->annotations[$key];
153161
}

‎src/View.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,35 @@ public static function setLayout($path) {
9393
self::$viewContext->layout = $path;
9494
}
9595

96+
/**
97+
* Gets current layout file name or path.
98+
*
99+
* @return void
100+
*/
101+
public static function getLayout() {
102+
return self::$viewContext->layout;
103+
}
104+
96105
/**
97106
* Sets page title.
98107
*
108+
* @param string $title The title to set.
109+
*
99110
* @return void
100111
*/
101112
public static function setTitle($title) {
102113
self::$viewContext->title = $title;
103114
}
104115

116+
/**
117+
* Gets page title.
118+
*
119+
* @return void
120+
*/
121+
public static function getTitle() {
122+
return self::$viewContext->title;
123+
}
124+
105125
/**
106126
* Injects model to state.
107127
*

‎src/ViewResult.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function execute($viewContext) {
102102
!empty($this->model) ? $viewContext->model = $this->model : null;
103103

104104
if (!empty($this->viewData)) {
105-
$viewContext->viewData = array_unique(array_merge($viewContext->viewData, $this->viewData), SORT_REGULAR);
105+
$viewContext->viewData = array_unique(array_merge($viewContext->viewData, $this->viewData), \SORT_REGULAR);
106106
}
107107
}
108108

‎tests/AppBuilderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ public function testLoginGet() {
418418
);
419419

420420
$this->assertContains(
421-
'<a href="/home" class="btn btn-default">Cancel</a>',
421+
'<a href="/" class="btn btn-default">Cancel</a>',
422422
$result
423423
);
424424

‎tests/HtmlTest.php‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public function testDisplay(): void {
4343

4444
$viewContext->model = $this->getModelA('Hello, world!');
4545

46-
Model::display('index', 'text', 'Program', 'The program name.');
47-
Model::display('index', 'number', 'Lines', 'The lines of program code.');
46+
Model::use('.', 'test');
47+
Model::display('test', 'text', 'Program', 'The program name.');
48+
Model::display('test', 'number', 'Lines', 'The lines of program code.');
4849

4950
$this->makeActionState($viewContext);
5051

@@ -63,8 +64,9 @@ public function testDisplay(): void {
6364

6465
$viewContext->model = $this->getModelB(null, 'Hello, world!');
6566

66-
Model::display('index', array('a', 'text'), 'Program', 'The program name.');
67-
Model::display('index', array('a', 'number'), 'Lines', 'The lines of program code.');
67+
Model::use('.', 'test');
68+
Model::display('test', array('a', 'text'), 'Program', 'The program name.');
69+
Model::display('test', array('a', 'number'), 'Lines', 'The lines of program code.');
6870

6971
$this->makeActionState($viewContext);
7072

@@ -83,8 +85,9 @@ public function testValidationSummary(): void {
8385

8486
$viewContext->model = $this->getModelA();
8587

86-
Model::required('justModel', 'text');
87-
Model::validation('justModel', 'number', function($value, &$errorMessage) {
88+
Model::use('.', 'test');
89+
Model::required('test', 'text');
90+
Model::validation('test', 'number', function($value, &$errorMessage) {
8891
if ($value != 555) {
8992
$errorMessage = '555 is expected.';
9093
return false;
@@ -116,8 +119,9 @@ public function testValidationSummary(): void {
116119

117120
$viewContext = $this->setContext('justModel', 'Home', 'POST', array('text' => '', 'number' => 555));
118121

119-
Model::required('justModel', 'text');
120-
Model::validation('justModel', 'number', function($value, &$errorMessage) {
122+
Model::use('.', 'test');
123+
Model::required('test', 'text');
124+
Model::validation('test', 'number', function($value, &$errorMessage) {
121125
if ($value != 555) {
122126
$errorMessage = '555 is expected.';
123127
return false;
@@ -126,7 +130,7 @@ public function testValidationSummary(): void {
126130
return true;
127131
});
128132

129-
Model::display('justModel', 'text', 'Program name');
133+
Model::display('test', 'text', 'Program name');
130134

131135
$this->makeActionState($viewContext);
132136
$this->annotateAndValidateModel($viewContext->getModelState());
@@ -139,8 +143,9 @@ public function testValidationSummary(): void {
139143

140144
$viewContext = $this->setContext('justModel', 'Home', 'POST', array('text' => 'Hello, world!', 'number' => 555));
141145

142-
Model::required('justModel', 'text');
143-
Model::required('justModel', 'number');
146+
Model::use('.', 'test');
147+
Model::required('test', 'text');
148+
Model::required('test', 'number');
144149

145150
$this->makeActionState($viewContext);
146151
$this->annotateAndValidateModel($viewContext->getModelState());
@@ -156,8 +161,9 @@ public function testValidationSummary(): void {
156161
$viewContext->model = $this->getModelB();
157162
$viewContext->model->a->number = 123;
158163

159-
Model::required('justModel', array('a', 'text'));
160-
Model::validation('justModel', array('a', 'number'), function($value, &$errorMessage) {
164+
Model::use('.', 'test');
165+
Model::required('test', array('a', 'text'));
166+
Model::validation('test', array('a', 'number'), function($value, &$errorMessage) {
161167
if ($value != 555) {
162168
$errorMessage = '555 is expected.';
163169
return false;
@@ -166,7 +172,7 @@ public function testValidationSummary(): void {
166172
return true;
167173
});
168174

169-
Model::display('justModel', array('a', 'text'), 'Test text');
175+
Model::display('test', array('a', 'text'), 'Test text');
170176

171177
$this->makeActionState($viewContext);
172178
$this->annotateAndValidateModel($viewContext->getModelState());
@@ -183,8 +189,9 @@ public function testValidationMessage(): void {
183189

184190
$viewContext->model = $this->getModelA();
185191

186-
Model::required('justModel', 'text');
187-
Model::validation('justModel', 'number', function($value, &$errorMessage) {
192+
Model::use('.', 'test');
193+
Model::required('test', 'text');
194+
Model::validation('test', 'number', function($value, &$errorMessage) {
188195
if ($value != 555) {
189196
$errorMessage = '555 is expected.';
190197
return false;
@@ -220,8 +227,9 @@ public function testValidationMessage(): void {
220227
$viewContext->model->b1 = new ModelB();
221228
$viewContext->model->b1->a = new ModelA();
222229

223-
Model::required('justModel', array('b1', 'a', 'text'));
224-
Model::validation('justModel', array('b1', 'a', 'number'), function($value, &$errorMessage) {
230+
Model::use('.', 'test');
231+
Model::required('test', array('b1', 'a', 'text'));
232+
Model::validation('test', array('b1', 'a', 'number'), function($value, &$errorMessage) {
225233
if ($value != 555) {
226234
$errorMessage = '555 is expected.';
227235
return false;
@@ -259,8 +267,9 @@ public function testValidationMessage(): void {
259267
$viewContext->model->b1->a->text = 'hello, world!';
260268
$viewContext->model->b1->a->number = 555;
261269

262-
Model::required('justModel', array('b1', 'a', 'text'));
263-
Model::validation('justModel', array('b1', 'a', 'number'), function($value, &$errorMessage) {
270+
Model::use('.', 'test');
271+
Model::required('test', array('b1', 'a', 'text'));
272+
Model::validation('test', array('b1', 'a', 'number'), function($value, &$errorMessage) {
264273
if ($value != 555) {
265274
$errorMessage = '555 is expected.';
266275
return false;
@@ -290,7 +299,7 @@ public function testAction() {
290299
$this->assertEquals('/home/page', $action);
291300

292301
$action = Html::action('index');
293-
$this->assertEquals('/home', $action);
302+
$this->assertEquals('/', $action);
294303

295304
$action = Html::action('Index', 'Forum');
296305
$this->assertEquals('/forum', $action);
@@ -325,7 +334,7 @@ public function testActionLink() {
325334
$this->assertEquals('<a href="/home/page">link</a>', $action);
326335

327336
$action = Html::actionLink('home', 'index');
328-
$this->assertEquals('<a href="/home">home</a>', $action);
337+
$this->assertEquals('<a href="/">home</a>', $action);
329338

330339
$action = Html::actionLink('forum', 'Index', 'Forum');
331340
$this->assertEquals('<a href="/forum">forum</a>', $action);
@@ -1452,6 +1461,7 @@ private function setContext($actionName = 'index', $controllerName = 'Home', $me
14521461
}
14531462

14541463
private function resetModel() {
1464+
InternalHelper::setStaticPropertyValue('\\PhpMvc\\Model', 'modelType', null);
14551465
InternalHelper::setStaticPropertyValue('\\PhpMvc\\Model', 'annotations', array());
14561466
}
14571467

‎tests/mvc/controllers/AccountController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
class AccountController extends Controller {
1111

1212
public function __construct() {
13+
Model::use('login', 'login');
14+
1315
Model::required('login', 'username');
1416
Model::required('login', 'password', 'Password is required.');
1517

0 commit comments

Comments
 (0)