Skip to content

Commit 4084ed1

Browse files
author
Anton
authored
Merge pull request #12 from bluzphp/develop
Migrate to new version of Bootstrap
2 parents 0ee8c54 + 5dddb0b commit 4084ed1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1413
-1114
lines changed

application/models/Test/Table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Table extends \Bluz\Db\Table
4242
*/
4343
public function saveTestRow()
4444
{
45-
return self::insert([ 'name' => 'Example #'.rand(1, 10), 'email' => 'example@example.com' ]);
45+
return self::insert([ 'name' => 'Example #'.random_int(1, 10), 'email' => 'example@example.com' ]);
4646
}
4747

4848
/**

application/modules/test/controllers/cache-data.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
Layout::breadCrumbs(
2626
[
2727
Layout::ahref('Test', [ 'test', 'index' ]),
28-
'Cache Data',
28+
'Cache',
29+
'Data',
2930
]
3031
);
3132
Layout::title('Check cache');

application/modules/test/controllers/cookies.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Bluz\Proxy\Response;
1717

1818
/**
19-
* @return void
19+
* @return string
2020
*/
2121
return function () {
2222
/**
@@ -37,5 +37,8 @@
3737
Response::setCookie('response', 'call');
3838
Response::setCookie('time', 'hour', time()+3600);
3939

40-
$this->disableView();
40+
$this->assign('title', 'Cookies');
41+
$this->assign('content', 'Check `hello` and `time` cookies');
42+
43+
return 'modal.phtml';
4144
};

application/modules/test/controllers/db-query.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
Layout::breadCrumbs(
2323
[
2424
Layout::ahref('Test', [ 'test', 'index' ]),
25-
'DB Query Builders',
25+
'Database',
26+
'Query Builders',
2627
]
2728
);
2829
// all examples inside view

application/modules/test/controllers/db-relations.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
Layout::breadCrumbs(
2424
[
2525
Layout::ahref('Test', [ 'test', 'index' ]),
26-
'DB Relations',
26+
'Database',
27+
'Relations',
2728
]
2829
);
2930
// all examples inside view

application/modules/test/controllers/db-table.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
Layout::breadCrumbs(
2424
[
2525
Layout::ahref('Test', [ 'test', 'index' ]),
26-
'DB Table',
26+
'Database',
27+
'Table',
2728
]
2829
);
2930
// all examples inside view

application/modules/test/controllers/db.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
Layout::breadCrumbs(
2323
[
2424
Layout::ahref('Test', [ 'test', 'index' ]),
25-
'Basic DB operations',
25+
'Database',
26+
'DB package',
2627
]
2728
);
2829
// all examples inside view

application/modules/test/controllers/events.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ function (Event $event) {
7979
);
8080

8181
return [
82-
'res1' => EventManager::trigger('testevent', 1),
83-
'res2' => EventManager::trigger('testspace:event', 1),
84-
'res3' => EventManager::trigger('testspace:event2', 1),
82+
'result1' => EventManager::trigger('testevent', 1),
83+
'result2' => EventManager::trigger('testspace:event', 1),
84+
'result3' => EventManager::trigger('testspace:event2', 1),
8585
];
8686
};

application/modules/test/controllers/grid-array.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
Layout::breadCrumbs(
2424
[
2525
Layout::ahref('Test', [ 'test', 'index' ]),
26-
'Grid with Array',
26+
'Grid',
27+
'Array source',
2728
]
2829
);
2930
$grid = new Test\ArrayGrid();

application/modules/test/controllers/grid-route.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
Layout::breadCrumbs(
2828
[
2929
Layout::ahref('Test', [ 'test', 'index' ]),
30-
'Grid with Select',
30+
'Grid',
31+
'Request params',
3132
]
3233
);
3334
$grid = new Test\SelectGrid();

0 commit comments

Comments
 (0)