Move StringTemplateTrait to more appropriate namespace.

src/View/Helper/FormHelper.php

@@ -28,7 +28,7 @@ use Cake\View\Form\EntityContext;
 use Cake\View\Form\NullContext;
 use Cake\View\Helper;
 use Cake\View\Helper\IdGeneratorTrait;
-use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplateTrait;
 use Cake\View\View;
 use Cake\View\Widget\WidgetRegistry;
 use DateTime;

src/View/Helper/HtmlHelper.php

@@ -17,7 +17,7 @@ namespace Cake\View\Helper;
 use Cake\Core\Configure;
 use Cake\Network\Response;
 use Cake\View\Helper;
-use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplateTrait;
 use Cake\View\View;
 
 /**

src/View/Helper/PaginatorHelper.php

@@ -16,6 +16,7 @@ namespace Cake\View\Helper;
 
 use Cake\Utility\Inflector;
 use Cake\View\Helper;
+use Cake\View\StringTemplateTrait;
 use Cake\View\View;
 
 /**

src/View/Helper/SessionHelper.php

@@ -15,7 +15,7 @@
 namespace Cake\View\Helper;
 
 use Cake\View\Helper;
-use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplateTrait;
 
 /**
  * Session Helper.

src/View/Helper/TimeHelper.php

@@ -16,7 +16,7 @@ namespace Cake\View\Helper;
 
 use Cake\I18n\Time;
 use Cake\View\Helper;
-use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplateTrait;
 
 /**
  * Time Helper class for easy use of time data.

src/View/Helper/StringTemplateTrait.php

@@ -12,7 +12,7 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Helper;
+namespace Cake\View;
 
 /**
  * Adds string template functionality to any class by providing methods to

tests/TestCase/View/Helper/StringTemplateTraitTest.php

@@ -12,12 +12,11 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\View\Helper;
+namespace Cake\Test\TestCase\View;
 
 use Cake\Core\InstanceConfigTrait;
 use Cake\TestSuite\TestCase;
-use Cake\View\Helper\StringTemplate;
-use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplateTrait;
 
 /**
  * TestStringTemplate