diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index 3c3725f13..d9a35fe1f 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -4,6 +4,8 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ +use Combodo\iTop\Application\WebPage\WebPage; + define('ADMIN_PROFILE_NAME', 'Administrator'); define('PORTAL_PROFILE_NAME', 'Portal user'); diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php index 1c890baad..75bab6d15 100644 --- a/addons/userrights/userrightsprofile.db.class.inc.php +++ b/addons/userrights/userrightsprofile.db.class.inc.php @@ -17,6 +17,8 @@ * You should have received a copy of the GNU Affero General Public License */ +use Combodo\iTop\Application\WebPage\WebPage; + define('ADMIN_PROFILE_NAME', 'Administrator'); define('PORTAL_PROFILE_NAME', 'Portal user'); diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php index 50413fabc..030c4f8a1 100644 --- a/addons/userrights/userrightsprojection.class.inc.php +++ b/addons/userrights/userrightsprojection.class.inc.php @@ -17,6 +17,8 @@ * You should have received a copy of the GNU Affero General Public License */ +use Combodo\iTop\Application\WebPage\WebPage; + define('ADMIN_PROFILE_ID', 1); class UserRightsBaseClass extends cmdbAbstractObject diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index ea0ef04ea..c5ffbe23b 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -7,6 +7,7 @@ // cannot notify depreciation for now as this is still load in autoloader //DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader'); +use Combodo\iTop\Application\WebPage\AjaxPage; /** * Class ajax_page diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php index 13a9ecdf7..b3fde51ae 100644 --- a/application/applicationextension.inc.php +++ b/application/applicationextension.inc.php @@ -19,6 +19,8 @@ */ use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\WebPage\iTopWebPage; +use Combodo\iTop\Application\WebPage\WebPage; use Symfony\Component\DependencyInjection\Container; require_once(APPROOT.'application/newsroomprovider.class.inc.php'); @@ -270,14 +272,14 @@ interface iPreferencesExtension { /** * @api - * @param \WebPage $oPage + * @param WebPage $oPage * */ public function DisplayPreferences(WebPage $oPage); /** * @api - * @param \WebPage $oPage + * @param WebPage $oPage * @param string $sOperation * * @return bool true if the operation has been used diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index bb6f0356c..8ed4f7eef 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -42,6 +42,9 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetViewTable; use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetViewTable; use Combodo\iTop\Application\UI\Links\Set\LinkSetUIBlockFactory; +use Combodo\iTop\Application\WebPage\AjaxPage; +use Combodo\iTop\Application\WebPage\iTopWebPage; +use Combodo\iTop\Application\WebPage\WebPage; use Combodo\iTop\Renderer\BlockRenderer; use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer; use Combodo\iTop\Renderer\Console\ConsoleFormRenderer; @@ -285,7 +288,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param \cmdbAbstractObject $oObj * @param array $aParams * @@ -354,7 +357,7 @@ JS * @param int $iKey The identifier of the object * @param string $sMessageId Your id or one of the well-known ids: 'create', 'update' and 'apply_stimulus' * @param string $sMessage The HTML message (must be correctly escaped) - * @param string $sSeverity Any of the \WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants + * @param string $sSeverity Any of the WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants * @param float $fRank Ordering of the message: smallest displayed first (can be negative) * @param bool $bMustNotExist Do not alter any existing message (considering the id) * @@ -376,7 +379,7 @@ JS } /** - * @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page! + * @param WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page! * When writing to the page, markup will be put above the real header of the panel. * To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned. * @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead @@ -554,7 +557,7 @@ HTML /** * Display properties tab of an object * - * @param \WebPage $oPage + * @param WebPage $oPage * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead * @param string $sPrefix * @param array $aExtraParams @@ -593,7 +596,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param $sAttCode * * @throws \Exception @@ -634,7 +637,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead * * @throws \CoreException @@ -861,7 +864,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead * @param string $sPrefix * @param array $aExtraParams @@ -1065,7 +1068,7 @@ HTML /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param bool $bEditMode Note that this parameter is no longer used in this method, {@see static::$sDisplayMode} is used instead, but we cannot remove it as it part of the base interface (iDisplay)... * * @throws \ApplicationException @@ -1112,7 +1115,7 @@ HTML } // Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage. - /** @var \iTopWebPage $oPage */ + /** @var iTopWebPage $oPage */ $aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode); if (false === empty($aHeadersBlocks['subtitle'])) { $oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']); @@ -1147,7 +1150,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * * @throws \ArchivedObjectException * @throws \CoreException @@ -1170,7 +1173,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param \CMDBObjectSet $oSet * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()} * @@ -1232,7 +1235,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param \DBObjectSet $oSet * @param array $aExtraParams * @@ -1404,7 +1407,7 @@ HTML } /** - * @param \WebPage $oPage + * @param WebPage $oPage * @param \CMDBObjectSet $oSet * @param array $aExtraParams key used : *