Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f6bc936

Browse files
Make folder names and namespaces consistent
1 parent 7fccfff commit f6bc936

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

‎src/app/routes.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
$router->addRoute('{controller}/{action}/{id:\d+}');
1010
$router->addRoute('{controller}/{id:\d+}/{action}');
1111

12-
// Routes in folder controllers/module1/ (Namespace \Controllers\Module1)
13-
$router->addRoute('module1/{controller}/{action}', ['namespace' => 'Module1']);
14-
$router->addRoute('module1/{controller}/{id:\d+}/{action}', ['namespace' => 'Module1']);
12+
// Routes in folder controllers/folder1/ (Namespace \Controllers\Folder1)
13+
$router->addRoute('folder1/{controller}/{action}', ['namespace' => 'Folder1']);
14+
$router->addRoute('folder1/{controller}/{id:\d+}/{action}', ['namespace' => 'Folder1']);
1515

16-
// Routes in folder controllers/module2/ (Namespace \Controllers\Module2)
17-
$router->addRoute('module2/{controller}/{action}', ['namespace' => 'Module2']);
18-
$router->addRoute('module2/{controller}/{id:\d+}/{action}', ['namespace' => 'Module2']);
16+
// Routes in folder controllers/folder2/ (Namespace \Controllers\Folder2)
17+
$router->addRoute('folder2/{controller}/{action}', ['namespace' => 'Folder2']);
18+
$router->addRoute('folder2/{controller}/{id:\d+}/{action}', ['namespace' => 'Folder2']);
1919

2020
$router->setParams(getUri());

‎src/controllers/Controller.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ public function model(string $model)
2424
* @param array $data Passing vars to the view
2525
* @return void
2626
*/
27-
public static function view(string $view) : void
27+
public static function view(string $view, array$data = []) : void
2828
{
29+
extract($data, EXTR_SKIP);
30+
2931
$file = APPROOT . '/src/views/' . $view . '.php';
3032
// Check for view file
3133
if (is_readable($file))

‎src/controllers/Folder1/Class1.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Controllers\Module1;
2+
namespace Controllers\Folder1;
33

44
use \Controllers\Controller;
55

‎src/controllers/Folder1/Class2.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Controllers\Module1;
2+
namespace Controllers\Folder1;
33

44
use \Controllers\Controller;
55

‎src/controllers/Folder2/Class1.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Controllers\Module2;
2+
namespace Controllers\Folder2;
33

44
use \Controllers\Controller;
55

‎src/controllers/Folder2/Class2.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Controllers\Module2;
2+
namespace Controllers\Folder2;
33

44
use \Controllers\Controller;
55

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /