Use import cleanup

Add missing typehint
cakephp · Jun 21, 2014 · e780dda · e780dda
1 parent 749cb81
commit e780dda
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 29 deletions.
diff --git a/src/View/AjaxView.php b/src/View/AjaxView.php
@@ -14,8 +14,6 @@
  */
 namespace Cake\View;
 
-use Cake\Controller\Controller;
-use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use Cake\Network\Request;
 use Cake\Network\Response;

diff --git a/src/View/Cell.php b/src/View/Cell.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\View;
 
-use Cake\Core\App;
 use Cake\Event\EventManager;
 use Cake\Event\EventManagerTrait;
 use Cake\Model\ModelAwareTrait;

diff --git a/src/View/Form/EntityContext.php b/src/View/Form/EntityContext.php
@@ -19,7 +19,6 @@
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
-use Cake\Validation\Validator;
 use Cake\View\Form\ContextInterface;
 use Traversable;
 

diff --git a/src/View/Helper.php b/src/View/Helper.php
@@ -14,13 +14,11 @@
  */
 namespace Cake\View;
 
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Core\Plugin;
 use Cake\Event\EventListener;
 use Cake\Routing\Router;
-use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 
 /**

diff --git a/src/View/Helper/CacheHelper.php b/src/View/Helper/CacheHelper.php
@@ -17,6 +17,7 @@
 namespace Cake\View\Helper;
 
 use Cake\Core\Configure;
+use Cake\Event\Event;
 use Cake\Utility\Inflector;
 use Cake\View\Helper;
 
@@ -70,7 +71,7 @@ protected function _enabled() {
  * @param string $output The output for the file.
  * @return string Updated content.
  */
-	public function afterRenderFile($event, $viewFile, $output) {
+	public function afterRenderFile(Event $event, $viewFile, $output) {
 		if ($this->_enabled()) {
 			return $this->_parseContent($viewFile, $output);
 		}
@@ -83,7 +84,7 @@ public function afterRenderFile($event, $viewFile, $output) {
  * @param string $layoutFile Layout file name.
  * @return void
  */
-	public function afterLayout($event, $layoutFile) {
+	public function afterLayout(Event $event, $layoutFile) {
 		if ($this->_enabled()) {
 			$this->_View->assign(
 				'content',

diff --git a/src/View/Helper/FlashHelper.php b/src/View/Helper/FlashHelper.php
@@ -14,9 +14,7 @@
  */
 namespace Cake\View\Helper;
 
-use Cake\Network\Session;
 use Cake\View\Helper;
-use Cake\View\View;
 
 /**
  * FlashHelper class to render flash messages.

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -17,7 +17,6 @@
 use Cake\Core\Configure;
 use Cake\Error;
 use Cake\ORM\Entity;
-use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
@@ -29,7 +28,6 @@
 use Cake\View\Helper;
 use Cake\View\Helper\IdGeneratorTrait;
 use Cake\View\Helper\StringTemplateTrait;
-use Cake\View\StringTemplate;
 use Cake\View\View;
 use Cake\View\Widget\WidgetRegistry;
 use DateTime;

diff --git a/src/View/Helper/HtmlHelper.php b/src/View/Helper/HtmlHelper.php
@@ -14,11 +14,8 @@
  */
 namespace Cake\View\Helper;
 
-use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Error;
 use Cake\Network\Response;
-use Cake\Utility\Inflector;
 use Cake\View\Helper;
 use Cake\View\Helper\StringTemplateTrait;
 use Cake\View\View;

diff --git a/src/View/Helper/NumberHelper.php b/src/View/Helper/NumberHelper.php
@@ -16,7 +16,6 @@
 
 use Cake\Core\App;
 use Cake\Error;
-use Cake\Utility\Hash;
 use Cake\View\Helper;
 use Cake\View\View;
 

diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
@@ -14,9 +14,9 @@
  */
 namespace Cake\View\Helper;
 
+use Cake\Event\Event;
 use Cake\Utility\Inflector;
 use Cake\View\Helper;
-use Cake\View\View;
 
 /**
  * Pagination Helper class for easy generation of pagination links.
@@ -76,7 +76,7 @@ class PaginatorHelper extends Helper {
  * @param string $viewFile The view file being rendered.
  * @return void
  */
-	public function beforeRender($event, $viewFile) {
+	public function beforeRender(Event $event, $viewFile) {
 		$this->config(
 			'options.url',
 			array_merge($this->request->params['pass'], $this->request->query)

diff --git a/src/View/Helper/SessionHelper.php b/src/View/Helper/SessionHelper.php
@@ -14,10 +14,8 @@
  */
 namespace Cake\View\Helper;
 
-use Cake\Network\Session;
 use Cake\View\Helper;
 use Cake\View\Helper\StringTemplateTrait;
-use Cake\View\View;
 
 /**
  * Session Helper.

diff --git a/src/View/Helper/StringTemplateTrait.php b/src/View/Helper/StringTemplateTrait.php
@@ -63,7 +63,7 @@ public function formatTemplate($name, $data) {
  */
 	public function templater() {
 		if (empty($this->_templater)) {
-			$class = $this->config('templateClass') ?: '\Cake\View\StringTemplate';
+			$class = $this->config('templateClass') ?: 'Cake\View\StringTemplate';
 			$this->_templater = new $class;
 
 			$templates = $this->config('templates');

diff --git a/src/View/Helper/TextHelper.php b/src/View/Helper/TextHelper.php
@@ -16,7 +16,6 @@
 
 use Cake\Core\App;
 use Cake\Error;
-use Cake\Utility\Hash;
 use Cake\View\Helper;
 use Cake\View\View;
 

diff --git a/src/View/HelperRegistry.php b/src/View/HelperRegistry.php
@@ -15,7 +15,6 @@
 namespace Cake\View;
 
 use Cake\Core\App;
-use Cake\Event\EventManager;
 use Cake\Event\EventManagerTrait;
 use Cake\Utility\ObjectRegistry;
 use Cake\View\View;

diff --git a/src/View/JsonView.php b/src/View/JsonView.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\View;
 
-use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use Cake\Network\Request;

diff --git a/src/View/View.php b/src/View/View.php
@@ -15,7 +15,6 @@
 namespace Cake\View;
 
 use Cake\Cache\Cache;
-use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;

diff --git a/src/View/Widget/DateTime.php b/src/View/Widget/DateTime.php
@@ -14,9 +14,9 @@
  */
 namespace Cake\View\Widget;
 
-use Cake\Utility\Time;
 use Cake\View\Form\ContextInterface;
 use Cake\View\StringTemplate;
+use Cake\View\Widget\SelectBox;
 use Cake\View\Widget\WidgetInterface;
 
 /**
@@ -62,7 +62,7 @@ class DateTime implements WidgetInterface {
  * @param \Cake\View\StringTemplate $templates Templates list.
  * @param \Cake\View\Widget\SelectBox $selectBox Selectbox widget instance.
  */
-	public function __construct($templates, $selectBox) {
+	public function __construct(StringTemplate $templates, SelectBox $selectBox) {
 		$this->_select = $selectBox;
 		$this->_templates = $templates;
 	}

diff --git a/src/View/XmlView.php b/src/View/XmlView.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\View;
 
-use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use Cake\Network\Request;

diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\View\Helper;
 
 use Cake\Core\Configure;
+use Cake\Event\Event;
 use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
@@ -738,7 +739,7 @@ public function testPassedArgsMergingWithUrlOptions() {
 
 		$this->Paginator->request->params['pass'] = array(2);
 		$this->Paginator->request->query = array('page' => 1, 'foo' => 'bar', 'x' => 'y');
-		$this->Paginator->beforeRender(null, 'posts/index');
+		$this->Paginator->beforeRender(new Event('Foo.bar'), 'posts/index');
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(