Projects / li3_lab

diff --git a/config/routes.php b/config/routes.php index 9ef3661..3948f23 100644 --- a/config/routes.php +++ b/config/routes.php @@ -6,7 +6,7 @@ * @license http://opensource.org/licenses/bsd-license.php The BSD License */ -use \lithium\http\Router; +use \lithium\net\http\Router; Router::connect('/lab', array( 'plugin' => 'li3_lab', 'controller' => 'home', 'action' => 'index' diff --git a/controllers/PluginsController.php b/controllers/PluginsController.php index 640ed91..48f49a1 100644 --- a/controllers/PluginsController.php +++ b/controllers/PluginsController.php @@ -27,9 +27,6 @@ class PluginsController extends \lithium\action\Controller { 'limit' => '10', ); $latest = Plugin::all($params); - if ($this->request->type == 'json') { - $this->render(array('json' => $latest->data())); - } return compact('latest'); } diff --git a/extensions/command/Lab.php b/extensions/command/Lab.php index 16256ce..f94069a 100644 --- a/extensions/command/Lab.php +++ b/extensions/command/Lab.php @@ -8,7 +8,7 @@ namespace li3_lab\extensions\command; -use \lithium\http\Service; +use \lithium\net\http\Service; use \Phar; /** * Client for adding, creating, updating li3 plugins @@ -64,7 +64,7 @@ class Lab extends \lithium\console\Command { * @package default */ protected $_classes = array( - 'service' => '\lithium\http\Service', + 'service' => '\lithium\net\http\Service', 'response' => '\lithium\console\Response' ); diff --git a/models/Plugin.php b/models/Plugin.php index f610921..10702d2 100644 --- a/models/Plugin.php +++ b/models/Plugin.php @@ -66,7 +66,7 @@ class Plugin extends \lithium\data\Model { } }); $self = static::_instance(); - Validator::add('isUnique', function ($data, $params, $options) use ($self){ + Validator::add('isUnique', function ($data, $params, $options) use ($self) { $plugin = $self::find('first', array( 'conditions' => array( 'design' => 'by_field', 'view' => 'name', diff --git a/tests/mocks/extensions/command/MockService.php b/tests/mocks/extensions/command/MockService.php index 95ea713..46d3993 100644 --- a/tests/mocks/extensions/command/MockService.php +++ b/tests/mocks/extensions/command/MockService.php @@ -8,7 +8,7 @@ namespace li3_lab\tests\mocks\extensions\command; -class MockService extends \lithium\http\Service { +class MockService extends \lithium\net\http\Service { public function send($method, $path = null, $data = array(), $options = array()) { if ($path == 'lab/plugins') {