Skip to content

Commit 7407390

Browse files
committed
Migrate a few classes to use php-mvc instead
1 parent bd8813e commit 7407390

39 files changed

+67
-188
lines changed

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controllers/Document/Index.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
namespace BNETDocs\Controllers\Document;
44

5-
use \CarlBennett\MVC\Libraries\Common;
65
use \BNETDocs\Libraries\Controller;
76
use \BNETDocs\Libraries\Document;
87
use \BNETDocs\Libraries\Exceptions\UnspecifiedViewException;
9-
use \BNETDocs\Libraries\Gravatar;
108
use \BNETDocs\Libraries\Router;
119
use \BNETDocs\Libraries\UserSession;
1210
use \BNETDocs\Models\Document\Index as DocumentIndexModel;
1311
use \BNETDocs\Views\Document\IndexHtml as DocumentIndexHtmlView;
1412
use \BNETDocs\Views\Document\IndexJSON as DocumentIndexJSONView;
13+
use \CarlBennett\MVC\Libraries\Common;
14+
use \CarlBennett\MVC\Libraries\Gravatar;
1515
use \DateTime;
1616
use \DateTimeZone;
1717

@@ -29,7 +29,7 @@ public function run(Router &$router) {
2929
throw new UnspecifiedViewException();
3030
}
3131
$model = new DocumentIndexModel();
32-
32+
3333
$model->documents = Document::getAllDocuments();
3434
$model->user_session = UserSession::load($router);
3535

@@ -98,7 +98,7 @@ public function run(Router &$router) {
9898
$router->setResponseContent(ob_get_contents());
9999
ob_end_clean();
100100
}
101-
101+
102102
protected static function renderDateTime($obj) {
103103
if (!$obj instanceof DateTime) return $obj;
104104
return $obj->format("r");

src/controllers/Packet/Index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22

33
namespace BNETDocs\Controllers\Packet;
44

5-
use \CarlBennett\MVC\Libraries\Common;
65
use \BNETDocs\Libraries\Controller;
76
use \BNETDocs\Libraries\Exceptions\UnspecifiedViewException;
8-
use \BNETDocs\Libraries\Gravatar;
97
use \BNETDocs\Libraries\Packet;
10-
use \BNETDocs\Libraries\Pair;
118
use \BNETDocs\Libraries\Router;
129
use \BNETDocs\Libraries\UserSession;
1310
use \BNETDocs\Models\Packet\Index as PacketIndexModel;
@@ -17,6 +14,9 @@
1714
use \BNETDocs\Views\Packet\IndexJava as PacketIndexJavaView;
1815
use \BNETDocs\Views\Packet\IndexPHP as PacketIndexPHPView;
1916
use \BNETDocs\Views\Packet\IndexVB as PacketIndexVBView;
17+
use \CarlBennett\MVC\Libraries\Common;
18+
use \CarlBennett\MVC\Libraries\Gravatar;
19+
use \CarlBennett\MVC\Libraries\Pair;
2020
use \DateTime;
2121
use \DateTimeZone;
2222

src/libraries/Email/Debug.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace BNETDocs\Libraries\Email;
44

55
use \BNETDocs\Libraries\EmailMessage;
6-
use \BNETDocs\Libraries\Pair;
7-
use \BNETDocs\Libraries\Template;
86
use \BNETDocs\Libraries\User;
7+
use \CarlBennett\MVC\Libraries\Pair;
8+
use \CarlBennett\MVC\Libraries\Template;
99
use \StdClass;
1010

1111
class Debug extends EmailMessage {

src/libraries/Email/User/Register.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace BNETDocs\Libraries\Email\User;
44

55
use \BNETDocs\Libraries\EmailMessage;
6-
use \BNETDocs\Libraries\Pair;
7-
use \BNETDocs\Libraries\Template;
86
use \BNETDocs\Libraries\User;
7+
use \CarlBennett\MVC\Libraries\Pair;
8+
use \CarlBennett\MVC\Libraries\Template;
99
use \StdClass;
1010

1111
class Register extends EmailMessage {

src/libraries/EmailMessage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace BNETDocs\Libraries;
44

5-
use \BNETDocs\Libraries\HTTPHeader;
6-
use \BNETDocs\Libraries\Pair;
5+
use \CarlBennett\MVC\Libraries\HTTPHeader;
6+
use \CarlBennett\MVC\Libraries\Pair;
77
use \SplObjectStorage;
88
use \UnexpectedValueException;
99

src/libraries/HTTPHeader.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/libraries/IP.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

src/libraries/Pair.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/libraries/Router.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
use \BNETDocs\Controllers\User\ResetPassword as UserResetPasswordController;
3737
use \BNETDocs\Controllers\User\View as UserViewController;
3838
use \BNETDocs\Libraries\BlizzardChecker;
39-
use \CarlBennett\MVC\Libraries\Common;
40-
use \BNETDocs\Libraries\Exceptions\ControllerNotFoundException;
4139
use \BNETDocs\Libraries\UserSession;
40+
use \CarlBennett\MVC\Libraries\Common;
41+
use \CarlBennett\MVC\Libraries\Exceptions\ControllerNotFoundException;
42+
use \CarlBennett\MVC\Libraries\HTTPHeader;
43+
use \CarlBennett\MVC\Libraries\Pair;
4244
use \DateTime;
4345
use \DateTimeZone;
4446
use \SplObjectStorage;

0 commit comments

Comments
 (0)