Permalink
Browse files

namespace fixes

  • Loading branch information...
1 parent 02af3cd commit a65dc8894bc78b12acdadd6593d4877fe27e1f74 @Stardog Stardog committed Feb 9, 2017
Showing with 12 additions and 12 deletions.
  1. +8 −8 src-phpws2/src/Http/Controller.php
  2. +1 −1 src/Request.php
  3. +1 −1 src/Server.php
  4. +2 −2 tests/Global/RequestTest.php
@@ -18,7 +18,7 @@
* @author Jeff Tickle <jtickle at tux dot appstate dot edu>
* @license http://opensource.org/licenses/lgpl-3.0.html
*/
-abstract class Controller implements \Controller {
+abstract class Controller implements \Canopy\Controller {
private $module;
@@ -37,25 +37,25 @@ public function execute(\Canopy\Request $request)
$this->onBeforeExecute($request);
switch ($request->getMethod()) {
- case \Request::GET:
+ case \Canopy\Request::GET:
$response = $this->get($request);
break;
- case \Request::HEAD:
+ case \Canopy\Request::HEAD:
$response = $this->head($request);
break;
- case \Request::POST:
+ case \Canopy\Request::POST:
$response = $this->post($request);
break;
- case \Request::PUT:
+ case \Canopy\Request::PUT:
$response = $this->put($request);
break;
- case \Request::DELETE:
+ case \Canopy\Request::DELETE:
$response = $this->delete($request);
break;
- case \Request::OPTIONS:
+ case \Canopy\Request::OPTIONS:
$response = $this->options($request);
break;
- case \Request::PATCH:
+ case \Canopy\Request::PATCH:
$response = $this->patch($request);
break;
default:
View
@@ -474,7 +474,7 @@ public function getCurrentToken()
* // prints "Beta"
* </code>
* @deprecated Use shiftCommand
- * @return \Request
+ * @return \Canopy\Request
*/
public function getNextRequest()
{
View
@@ -14,7 +14,7 @@ class Server
/**
* For now, the Request object is global. Eventually it will be swapped out
* for a framework version.
- * @return \Request
+ * @return \Canopy\Request
*/
public static function getCurrentRequest()
{
@@ -1,11 +1,11 @@
<?php
/**
- * Unit Test for \Request
+ * Unit Test for \Canopy\Request
* @author Jeff Tickle <jtickle at tux dot appstate dot edu>
*/
-use \Request;
+use \Canopy\Request;
class RequestTest extends PHPUnit_Framework_TestCase
{

0 comments on commit a65dc88

Please sign in to comment.