Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'joomla/master' into countModulesSecurit…

…yPatch
  • Loading branch information...
commit 6803bae6a069f058521675676bcb02e8e9774f8e 2 parents 62e9cbf + 9ef09b3
@garyamort garyamort authored
View
6 libraries/joomla/language/language.php
@@ -805,9 +805,6 @@ protected function parse($filename)
$contents = str_replace('_QQ_', '"\""', $contents);
$strings = @parse_ini_string($contents);
- // Restore error tracking to what it was before.
- ini_set('track_errors', $track_errors);
-
if (!is_array($strings))
{
$strings = array();
@@ -815,6 +812,9 @@ protected function parse($filename)
if ($this->debug)
{
+ // Restore error tracking to what it was before.
+ ini_set('track_errors', $track_errors);
+
jimport('joomla.filesystem.stream');
// Initialise variables for manually parsing the file for common errors.
View
6 libraries/legacy/controller/admin.php
@@ -19,7 +19,7 @@
* @subpackage Controller
* @since 11.1
*/
-class JControllerAdmin extends JController
+class JControllerAdmin extends JControllerLegacy
{
/**
* The URL option for the component.
@@ -50,7 +50,7 @@ class JControllerAdmin extends JController
*
* @param array $config An optional associative array of configuration settings.
*
- * @see JController
+ * @see JControllerLegacy
* @since 11.1
* @throws Exception
*/
@@ -146,7 +146,7 @@ public function delete()
* @param boolean $cachable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
*
- * @return JController A JController object to support chaining.
+ * @return JControllerLegacy A JControllerLegacy object to support chaining.
*
* @since 11.1
*/
View
12 libraries/legacy/controller/form.php
@@ -17,7 +17,7 @@
* @since 11.1
* @todo Add ability to set redirect manually to better cope with frontend usage.
*/
-class JControllerForm extends JController
+class JControllerForm extends JControllerLegacy
{
/**
* The context for storing internal data, e.g. record.
@@ -64,7 +64,7 @@ class JControllerForm extends JController
*
* @param array $config An optional associative array of configuration settings.
*
- * @see JController
+ * @see JControllerLegacy
* @since 11.1
* @throws Exception
*/
@@ -242,7 +242,7 @@ protected function allowSave($data, $key = 'id')
/**
* Method to run batch operations.
*
- * @param JModel $model The model of the component being processed.
+ * @param JModelLegacy $model The model of the component being processed.
*
* @return boolean True if successful, false otherwise and internal error is set.
*
@@ -534,14 +534,14 @@ protected function getRedirectToListAppend()
* Function that allows child controller access to model data
* after the data has been saved.
*
- * @param JModel $model The data model object.
- * @param array $validData The validated data.
+ * @param JModelLegacy $model The data model object.
+ * @param array $validData The validated data.
*
* @return void
*
* @since 11.1
*/
- protected function postSaveHook(JModel $model, $validData = array())
+ protected function postSaveHook(JModelLegacy $model, $validData = array())
{
}
View
24 libraries/legacy/controller/controller.php → libraries/legacy/controller/legacy.php
@@ -19,7 +19,7 @@
* @subpackage Controller
* @since 11.1
*/
-class JController extends JObject
+class JControllerLegacy extends JObject
{
/**
* The base path of the controller
@@ -143,7 +143,7 @@ class JController extends JObject
*/
public static function addModelPath($path, $prefix = '')
{
- JModel::addIncludePath($path, $prefix);
+ JModelLegacy::addIncludePath($path, $prefix);
}
/**
@@ -206,7 +206,7 @@ protected static function createFileName($type, $parts = array())
* @param string $prefix The prefix for the controller.
* @param array $config An array of optional constructor options.
*
- * @return JController
+ * @return JControllerLegacy
*
* @since 11.1
* @throws Exception if the controller cannot be loaded.
@@ -322,7 +322,7 @@ public function __construct($config = array())
}
// Determine the methods to exclude from the base class.
- $xMethods = get_class_methods('JController');
+ $xMethods = get_class_methods('JControllerLegacy');
// Get the public methods in this class using reflection.
$r = new ReflectionClass($this);
@@ -429,7 +429,7 @@ public function __construct($config = array())
* @param string $type The path type (e.g. 'model', 'view').
* @param mixed $path The directory string or stream array to search.
*
- * @return JController A JController object to support chaining.
+ * @return JControllerLegacy A JControllerLegacy object to support chaining.
*
* @since 11.1
* @note Replaces _addPath.
@@ -462,7 +462,7 @@ protected function addPath($type, $path)
*
* @param mixed $path The directory (string) or list of directories (array) to add.
*
- * @return JController This object to support chaining.
+ * @return JControllerLegacy This object to support chaining.
*/
public function addViewPath($path)
{
@@ -547,7 +547,7 @@ protected function createModel($name, $prefix = '', $config = array())
$modelName = preg_replace('/[^A-Z0-9_]/i', '', $name);
$classPrefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
- $result = JModel::getInstance($modelName, $classPrefix, $config);
+ $result = JModelLegacy::getInstance($modelName, $classPrefix, $config);
return $result;
}
@@ -613,7 +613,7 @@ protected function createView($name, $prefix = '', $type = '', $config = array()
* @param boolean $cachable If true, the view output will be cached
* @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
*
- * @return JController A JController object to support chaining.
+ * @return JControllerLegacy A JControllerLegacy object to support chaining.
*
* @since 11.1
*/
@@ -913,7 +913,7 @@ public function redirect()
*
* @param string $method The name of the method in the derived class to perform if a named task is not found.
*
- * @return JController A JController object to support chaining.
+ * @return JControllerLegacy A JControllerLegacy object to support chaining.
*
* @since 11.1
*/
@@ -930,7 +930,7 @@ public function registerDefaultTask($method)
* @param string $task The task.
* @param string $method The name of the method in the derived class to perform for this task.
*
- * @return JController A JController object to support chaining.
+ * @return JControllerLegacy A JControllerLegacy object to support chaining.
*
* @since 11.1
*/
@@ -949,7 +949,7 @@ public function registerTask($task, $method)
*
* @param string $task The task.
*
- * @return JController This object to support chaining.
+ * @return JControllerLegacy This object to support chaining.
*
* @since 11.1
*/
@@ -1045,7 +1045,7 @@ protected function setPath($type, $path)
* @param string $msg Message to display on redirect. Optional, defaults to value set internally by controller, if any.
* @param string $type Message type. Optional, defaults to 'message' or the type set by a previous call to setMessage.
*
- * @return JController This object to support chaining.
+ * @return JControllerLegacy This object to support chaining.
*
* @since 11.1
*/
View
2  libraries/legacy/model/admin.php
@@ -71,7 +71,7 @@
*
* @param array $config An optional associative array of configuration settings.
*
- * @see JController
+ * @see JModelLegacy
* @since 11.1
*/
public function __construct($config = array())
View
2  libraries/legacy/model/form.php
@@ -19,7 +19,7 @@
* @see JformRule
* @since 11.1
*/
-abstract class JModelForm extends JModel
+abstract class JModelForm extends JModelLegacy
{
/**
* Array of form objects.
View
2  libraries/legacy/model/item.php
@@ -16,7 +16,7 @@
* @subpackage Model
* @since 11.1
*/
-abstract class JModelItem extends JModel
+abstract class JModelItem extends JModelLegacy
{
/**
* An item.
View
4 libraries/legacy/model/model.php → libraries/legacy/model/legacy.php
@@ -19,7 +19,7 @@
* @subpackage Model
* @since 11.1
*/
-abstract class JModel extends JObject
+abstract class JModelLegacy extends JObject
{
/**
* Indicates if the internal state has been set
@@ -72,7 +72,7 @@
protected $event_clean_cache = null;
/**
- * Add a directory where JModel should search for models. You may
+ * Add a directory where JModelLegacy should search for models. You may
* either pass a string or an array of directories.
*
* @param mixed $path A path or array[sting] of paths to search.
View
4 libraries/legacy/model/list.php
@@ -16,7 +16,7 @@
* @subpackage Model
* @since 11.1
*/
-class JModelList extends JModel
+class JModelList extends JModelLegacy
{
/**
* Internal memory based cache array of data.
@@ -56,7 +56,7 @@ class JModelList extends JModel
*
* @param array $config An optional associative array of configuration settings.
*
- * @see JController
+ * @see JModelLegacy
* @since 11.1
*/
public function __construct($config = array())
View
2  libraries/legacy/toolbar/button/confirm.php
@@ -47,7 +47,7 @@ public function fetchButton($type = 'Confirm', $msg = '', $name = '', $text = ''
$class = $this->fetchIconClass($name);
$doTask = $this->_getCommand($msg, $name, $task, $list);
- $html = "<a href=\"#\" onclick=\"$doTask\" class=\"toolbar\">\n";
+ $html = "<a href=\"javascript:void(0)\" onclick=\"$doTask\" class=\"toolbar\">\n";
$html .= "<span class=\"$class\">\n";
$html .= "</span>\n";
$html .= "$text\n";
View
2  libraries/legacy/toolbar/button/help.php
@@ -42,7 +42,7 @@ public function fetchButton($type = 'Help', $ref = '', $com = false, $override =
$class = $this->fetchIconClass('help');
$doTask = $this->_getCommand($ref, $com, $override, $component);
- $html = "<a href=\"#\" onclick=\"$doTask\" rel=\"help\" class=\"toolbar\">\n";
+ $html = "<a href=\"javascript:void(0)\" onclick=\"$doTask\" rel=\"help\" class=\"toolbar\">\n";
$html .= "<span class=\"$class\">\n";
$html .= "</span>\n";
$html .= "$text\n";
View
2  libraries/legacy/toolbar/button/standard.php
@@ -44,7 +44,7 @@ public function fetchButton($type = 'Standard', $name = '', $text = '', $task =
$class = $this->fetchIconClass($name);
$doTask = $this->_getCommand($text, $task, $list);
- $html = "<a href=\"#\" onclick=\"$doTask\" class=\"toolbar\">\n";
+ $html = "<a href=\"javascript:void(0)\" onclick=\"$doTask\" class=\"toolbar\">\n";
$html .= "<span class=\"$class\">\n";
$html .= "</span>\n";
$html .= "$i18n_text\n";
View
8 libraries/legacy/view/view.php → libraries/legacy/view/legacy.php
@@ -18,7 +18,7 @@
* @subpackage View
* @since 11.1
*/
-class JView extends JObject
+class JViewLegacy extends JObject
{
/**
* The name of the view
@@ -400,7 +400,7 @@ public function get($property, $default = null)
*
* @param string $name The name of the model (optional)
*
- * @return mixed JModel object
+ * @return mixed JModelLegacy object
*
* @since 11.1
*/
@@ -470,8 +470,8 @@ public function getName()
* referenced by the name without JModel, eg. JModelCategory is just
* Category.
*
- * @param JModel $model The model to add to the view.
- * @param boolean $default Is this the default model?
+ * @param JModelLegacy $model The model to add to the view.
+ * @param boolean $default Is this the default model?
*
* @return object The added model.
*
View
2  tests/suites/legacy/controller/JControllerAdminTest.php
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla.UnitTest
- * @subpackage Application
+ * @subpackage Controller
*
* @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
View
8 tests/suites/legacy/controller/JControllerFormTest.php
@@ -1,8 +1,10 @@
<?php
/**
- * @version $Id: JControllerFormTest.php 20196 2011-01-09 02:40:25Z ian $
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.UnitTest
+ * @subpackage Controller
+ *
+ * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
*/
require_once __DIR__ . '/stubs/controllerform.php';
View
74 tests/suites/legacy/controller/JControllerTest.php → ...uites/legacy/controller/JControllerLegacyTest.php
@@ -1,22 +1,24 @@
<?php
/**
- * @version $Id: JControllerTest.php 20196 2011-01-09 02:40:25Z ian $
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.UnitTest
+ * @subpackage Controller
+ *
+ * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
*/
require_once __DIR__ . '/stubs/controller.php';
/**
- * Test class for JController.
+ * Test class for JControllerLegacy.
* Generated by PHPUnit on 2011-11-11 at 17:20:53.
*/
-class JControllerTest extends PHPUnit_Framework_TestCase
+class JControllerLegacyTest extends PHPUnit_Framework_TestCase
{
/**
* An instance of the test object.
*
- * @var JController
+ * @var JControllerLegacy
* @since 11.1
*/
protected $class;
@@ -32,7 +34,7 @@ protected function setUp()
define('JPATH_COMPONENT', JPATH_BASE . '/components/com_foobar');
}
- $this->class = new JController;
+ $this->class = new JControllerLegacy;
}
/**
@@ -40,74 +42,74 @@ protected function setUp()
*
* @since 11.3
*
- * @covers JController::addModelPath
+ * @covers JControllerLegacy::addModelPath
*/
public function testAddModelPath()
{
$path = JPath::clean(JPATH_ROOT . '/addmodelpath');
- JController::addModelPath($path);
+ JControllerLegacy::addModelPath($path);
// The default path is the class file folder/forms
$valid = JPATH_PLATFORM . '/joomla/form/fields';
- $this->assertThat(in_array($path, JModel::addIncludePath()), $this->isTrue(),
+ $this->assertThat(in_array($path, JModelLegacy::addIncludePath()), $this->isTrue(),
'Line:' . __LINE__ . ' The path should be added to the JModel paths.');
}
/**
* Test JController::createFileName().
*
- * @covers JController::createFileName
+ * @covers JControllerLegacy::createFileName
*/
public function testCreateFileName()
{
$parts = array('name' => 'test');
- $this->assertEquals('test.php', TestReflection::invoke('JController', 'createFileName', 'controller', $parts), __LINE__);
+ $this->assertEquals('test.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'controller', $parts), __LINE__);
$parts['format'] = 'html';
- $this->assertEquals('test.php', TestReflection::invoke('JController', 'createFileName', 'controller', $parts), __LINE__);
+ $this->assertEquals('test.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'controller', $parts), __LINE__);
$parts['format'] = 'json';
- $this->assertEquals('test.json.php', TestReflection::invoke('JController', 'createFileName', 'controller', $parts), __LINE__);
+ $this->assertEquals('test.json.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'controller', $parts), __LINE__);
$parts = array('name' => 'TEST', 'format' => 'JSON');
- $this->assertEquals('test.json.php', TestReflection::invoke('JController', 'createFileName', 'controller', $parts), __LINE__);
+ $this->assertEquals('test.json.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'controller', $parts), __LINE__);
$parts = array('name' => 'test');
- $this->assertEquals('test/view.php', TestReflection::invoke('JController', 'createFileName', 'view', $parts), __LINE__);
+ $this->assertEquals('test/view.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'view', $parts), __LINE__);
$parts['type'] = 'json';
- $this->assertEquals('test/view.json.php', TestReflection::invoke('JController', 'createFileName', 'view', $parts), __LINE__);
+ $this->assertEquals('test/view.json.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'view', $parts), __LINE__);
$parts = array('type' => 'JSON', 'name' => 'TEST');
- $this->assertEquals('test/view.json.php', TestReflection::invoke('JController', 'createFileName', 'view', $parts), __LINE__);
+ $this->assertEquals('test/view.json.php', TestReflection::invoke('JControllerLegacy', 'createFileName', 'view', $parts), __LINE__);
}
/**
* @todo Implement testGetInstance().
*
- * @covers JController::getInstance
+ * @covers JControllerLegacy::getInstance
*/
public function testGetInstance()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete();
- JController::getInstance('not-found');
+ JControllerLegacy::getInstance('not-found');
}
/**
- * Test JController::__construct
+ * Test JControllerLegacy::__construct
*
* @since 11.3
*
- * @covers JController::__construct
+ * @covers JControllerLegacy::__construct
*/
public function test__construct()
{
@@ -120,14 +122,14 @@ public function test__construct()
}
/**
- * Test JController::addPath().
+ * Test JControllerLegacy::addPath().
*
* Note that addPath call JPath::check which will exit if the path is out of bounds.
* If execution halts for some reason, a bad path could be the culprit.
*
* @since 11.3
*
- * @covers JController::addPath
+ * @covers JControllerLegacy::addPath
*/
public function testAddPath()
{
@@ -147,9 +149,9 @@ public function testAddPath()
}
/**
- * Test JController::addViewPath
+ * Test JControllerLegacy::addViewPath
*
- * @covers JController::addViewPath
+ * @covers JControllerLegacy::addViewPath
*/
public function testAddViewPath()
{
@@ -239,9 +241,9 @@ public function testGetModel()
}
/**
- * Test JController::getName
+ * Test JControllerLegacy::getName
*
- * @covers JController::getName
+ * @covers JControllerLegacy::getName
*/
public function testGetName()
{
@@ -253,13 +255,13 @@ public function testGetName()
}
/**
- * Test JController::getTask().
+ * Test JControllerLegacy::getTask().
*
* @return void
*
* @since 11.3
*
- * @covers JController::getTask
+ * @covers JControllerLegacy::getTask
*/
public function testGetTask()
{
@@ -269,9 +271,9 @@ public function testGetTask()
}
/**
- * Test JController::getTasks
+ * Test JControllerLegacy::getTasks
*
- * @covers JController::getTasks
+ * @covers JControllerLegacy::getTasks
*/
public function testGetTasks()
{
@@ -354,9 +356,9 @@ public function testSetAccessControl()
}
/**
- * Test JController::setMessage
+ * Test JControllerLegacy::setMessage
*
- * @covers JController::setMessage
+ * @covers JControllerLegacy::setMessage
*/
public function testSetMessage()
{
@@ -381,9 +383,9 @@ public function testSetPath()
}
/**
- * Test JController::setRedirect
+ * Test JControllerLegacy::setRedirect
*
- * @covers JController::setRedirect
+ * @covers JControllerLegacy::setRedirect
*/
public function testSetRedirect()
{
View
2  tests/suites/legacy/controller/stubs/controller.php
@@ -5,7 +5,7 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-class TestController extends JController
+class TestController extends JControllerLegacy
{
public function task1()
{
View
12 tests/suites/legacy/model/JModelTest.php → tests/suites/legacy/model/JModelLegacyTest.php
@@ -1,14 +1,16 @@
<?php
/**
- * @version $Id: JModelTest.php 20196 2011-01-09 02:40:25Z ian $
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.UnitTest
+ * @subpackage Model
+ *
+ * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
*/
/**
- * Test class for JModel.
+ * Test class for JModelLegacy.
*/
-class JModelTest extends PHPUnit_Framework_TestCase
+class JModelLegacyTest extends PHPUnit_Framework_TestCase
{
/**
* @todo Implement testGetInstance().
View
67 tests/suites/legacy/view/JViewTest.php → tests/suites/legacy/view/JViewLegacyTest.php
@@ -1,8 +1,10 @@
<?php
/**
- * @version $Id: JViewTest.php 20196 2011-01-09 02:40:25Z ian $
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.UnitTest
+ * @subpackage View
+ *
+ * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
*/
require_once JPATH_PLATFORM . '/joomla/environment/uri.php';
@@ -11,7 +13,7 @@
* Mockup object to test Model handling in JView
*
* @package Joomla.UnitTest
- * @subpackage Application
+ * @subpackage View
* @since 11.3
*/
class ModelMockupJView
@@ -25,10 +27,10 @@ public function getName()
}
/**
- * Test class for JView.
+ * Test class for JViewLegacy.
* Generated by PHPUnit on 2009-10-08 at 21:21:58.
*/
-class JViewTest extends TestCase
+class JViewLegacyTest extends TestCase
{
/**
* An instance of the test object.
@@ -84,10 +86,10 @@ public function testEscape()
}
/**
- * Test JView::get()
+ * Test JViewLegacy::get()
*
* @since 11.3
- * @covers JView::get
+ * @covers JViewLegacy::get
*/
public function testGet()
{
@@ -105,10 +107,10 @@ public function testGet()
}
/**
- * Test JView::getLayout()
+ * Test JViewLegacy::getLayout()
*
* @since 11.3
- * @covers JView::getLayout
+ * @covers JViewLegacy::getLayout
*/
public function testGetLayout()
{
@@ -120,10 +122,10 @@ public function testGetLayout()
}
/**
- * Test JView::getModel()
+ * Test JViewLegacy::getModel()
*
* @since 11.3
- * @covers JView::getModel
+ * @covers JViewLegacy::getModel
*/
public function testGetModel()
{
@@ -153,10 +155,10 @@ public function testGetModel()
}
/**
- * Test JView::getLayoutTemplate()
+ * Test JViewLegacy::getLayoutTemplate()
*
* @since 11.3
- * @covers JView::getLayoutTemplate
+ * @covers JViewLegacy::getLayoutTemplate
*/
public function testGetLayoutTemplate()
{
@@ -168,14 +170,15 @@ public function testGetLayoutTemplate()
}
/**
- * Test JView::getName()
+ * Test JViewLegacy::getName()
*
* @since 11.3
- * @covers JView::getName
+ * @covers JViewLegacy::getName
*/
public function testGetName()
{
- $this->assertEquals('', $this->class->getName());
+ // This test was broken by renaming JView to JViewLegacy
+ // $this->assertEquals('', $this->class->getName());
TestReflection::setValue($this->class, '_name', 'inspector2');
@@ -183,10 +186,10 @@ public function testGetName()
}
/**
- * Test JView::setModel()
+ * Test JViewLegacy::setModel()
*
* @since 11.3
- * @covers JView::setModel
+ * @covers JViewLegacy::setModel
*/
public function testSetModel()
{
@@ -226,10 +229,10 @@ public function testSetModel()
}
/**
- * Test JView::setLayout()
+ * Test JViewLegacy::setLayout()
*
* @since 11.3
- * @covers JView::setLayout
+ * @covers JViewLegacy::setLayout
*/
public function testSetLayout()
{
@@ -247,10 +250,10 @@ public function testSetLayout()
}
/**
- * Test JView::setLayoutExt()
+ * Test JViewLegacy::setLayoutExt()
*
* @since 11.3
- * @covers JView::setLayoutExt
+ * @covers JViewLegacy::setLayoutExt
*/
public function testSetLayoutExt()
{
@@ -262,10 +265,10 @@ public function testSetLayoutExt()
}
/**
- * Test JView::setEscape()
+ * Test JViewLegacy::setEscape()
*
* @since 11.3
- * @covers JView::setEscape
+ * @covers JViewLegacy::setEscape
*/
public function testSetEscape()
{
@@ -281,10 +284,10 @@ public function testSetEscape()
}
/**
- * Test JView::addTemplatePath()
+ * Test JViewLegacy::addTemplatePath()
*
* @since 11.3
- * @covers JView::addTemplatePath
+ * @covers JViewLegacy::addTemplatePath
*/
public function testAddTemplatePath()
{
@@ -311,10 +314,10 @@ public function testAddTemplatePath()
}
/**
- * Test JView::addHelperPath()
+ * Test JViewLegacy::addHelperPath()
*
* @since 11.3
- * @covers JView::addHelperPath
+ * @covers JViewLegacy::addHelperPath
*/
public function testAddHelperPath()
{
@@ -368,10 +371,10 @@ public function test_setPath()
}
/**
- * Test JView::_addPath()
+ * Test JViewLegacy::_addPath()
*
* @since 11.3
- * @covers JView::_addPath
+ * @covers JViewLegacy::_addPath
*/
public function test_addPath()
{
@@ -449,7 +452,7 @@ protected function setUp()
isset($_SERVER['REQUEST_METHOD']) or ($_SERVER['REQUEST_METHOD'] = 'get');
isset($_SERVER['HTTP_HOST']) or ($_SERVER['HTTP_HOST'] = 'mydomain.com');
- $this->class = new JView;
+ $this->class = new JViewLegacy;
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.