composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3123 - Refactor Directories

Browse Source
This commit is contained in:
Eric
2020-12-02 13:18:01 +01:00
parent d1b12ee04b
commit 15aa9e508c
259 changed files with 862 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/application/WebPage/AjaxPage.php
View File

@@ -5,8 +5,8 @@
*/
use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Base\iUIBlock;
use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock;
use Combodo\iTop\Renderer\BlockRenderer;
class AjaxPage extends WebPage implements iTabbedPage

2
sources/application/WebPage/CLIPage.php
View File

@@ -16,7 +16,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
use \Combodo\iTop\Application\UI\iUIBlock;
use \Combodo\iTop\Application\UI\Base\iUIBlock;
/**
* CLI page

2
sources/application/WebPage/CSVPage.php
View File

@@ -16,7 +16,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
use \Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Base\iUIBlock;
/**
* Simple web page with no includes or fancy formatting, useful to generateXML documents

2
sources/application/WebPage/Page.php
View File

@@ -4,7 +4,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Base\iUIBlock;
/**

18
sources/application/WebPage/TabManager.php
View File

@@ -4,9 +4,9 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab;
use Combodo\iTop\Application\UI\Layout\TabContainer\TabContainer;
use Combodo\iTop\Application\UI\Base\iUIBlock;
use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab;
use Combodo\iTop\Application\UI\Base\Layout\TabContainer\TabContainer;
/**
@@ -37,7 +37,7 @@ class TabManager
* @param string $sTabContainer
* @param string $sPrefix
*
* @return \Combodo\iTop\Application\UI\iUIBlock
* @return \Combodo\iTop\Application\UI\Base\iUIBlock
*/
public function AddTabContainer(string $sTabContainer, $sPrefix = ''): TabContainer
{
@@ -168,7 +168,7 @@ class TabManager
* @param string|null $sTabTitle
*
* @return string
* @throws \Combodo\iTop\Application\UI\UIException
* @throws \Combodo\iTop\Application\UI\Base\UIException
*/
public function SetCurrentTab(string $sTabCode = '', string $sTabTitle = null): ?string
{
@@ -201,13 +201,13 @@ class TabManager
*
* @return string
*
* @throws \Combodo\iTop\Application\UI\UIException
* @throws \Combodo\iTop\Application\UI\Base\UIException
* @since 2.0.3
*/
public function AddAjaxTab(string $sTabCode, string $sUrl, bool $bCache = true, string $sTabTitle = null): string
{
// Set the content of the tab
/** @var \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\AjaxTab $oTab */
/** @var \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab $oTab */
$oTab = $this->InitTab($this->m_sCurrentTabContainer, $sTabCode, static::ENUM_TAB_TYPE_AJAX, $sTabTitle);
$oTab->SetUrl($sUrl)
->SetCache($bCache);
@@ -312,8 +312,8 @@ class TabManager
* @param string $sTabType
* @param string|null $sTabTitle
*
* @return \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab
* @throws \Combodo\iTop\Application\UI\UIException
* @return \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab
* @throws \Combodo\iTop\Application\UI\Base\UIException
* @since 2.7.0
*/
protected function InitTab(string $sTabContainer, string $sTabCode, string $sTabType = self::DEFAULT_TAB_TYPE, string $sTabTitle = null): Tab

20
sources/application/WebPage/WebPage.php
View File

@@ -18,12 +18,12 @@
*/
use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\UI\Component\Html\Html;
use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu;
use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuFactory;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\Component\Html\Html;
use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory;
use Combodo\iTop\Application\UI\Base\iUIBlock;
use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use Combodo\iTop\Renderer\BlockRenderer;
@@ -312,9 +312,9 @@ class WebPage implements Page
/**
* Add a UIBlock in the page by dispatching its parts in the right places (CSS, JS, HTML)
*
* @param \Combodo\iTop\Application\UI\iUIBlock $oBlock
* @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock
*
* @return \Combodo\iTop\Application\UI\iUIBlock block added
* @return \Combodo\iTop\Application\UI\Base\iUIBlock block added
* @since 3.0.0
*/
public function AddUiBlock(?iUIBlock $oBlock): ?iUIBlock
@@ -706,7 +706,7 @@ class WebPage implements Page
}
/**
* @param \Combodo\iTop\Application\UI\iUIBlock $oBlock
* @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock
*
* @throws \ReflectionException
* @throws \Twig\Error\LoaderError
@@ -1035,7 +1035,7 @@ class WebPage implements Page
* @param string $sId
* @param array $aActions
*
* @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu|null
* @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu|null
*/
public function GetPopoverMenu(string $sId, array $aActions): ?PopoverMenu
{

2
sources/application/WebPage/XMLPage.php
View File

@@ -16,7 +16,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
use \Combodo\iTop\Application\UI\iUIBlock;
use \Combodo\iTop\Application\UI\Base\iUIBlock;
/**
* Class XMLPage

4
sources/application/WebPage/iTabbedPage.php
View File

@@ -1,6 +1,6 @@
<?php
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock;
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
@@ -12,7 +12,7 @@ interface iTabbedPage
* @param string $sTabContainer
* @param string $sPrefix
*
* @param \Combodo\iTop\Application\UI\Layout\iUIContentBlock|null $oParentBlock
* @param \Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock|null $oParentBlock
*
* @return mixed
*/

32
sources/application/WebPage/iTopWebPage.php
View File

@@ -19,17 +19,17 @@
use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs;
use Combodo\iTop\Application\UI\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Layout\NavigationMenu\NavigationMenuFactory;
use Combodo\iTop\Application\UI\Layout\PageContent\PageContent;
use Combodo\iTop\Application\UI\Layout\PageContent\PageContentFactory;
use Combodo\iTop\Application\UI\Layout\TopBar\TopBar;
use Combodo\iTop\Application\UI\Layout\TopBar\TopBarFactory;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\Base\iUIBlock;
use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenuFactory;
use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContent;
use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory;
use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBar;
use Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
use Combodo\iTop\Renderer\BlockRenderer;
/**
@@ -555,7 +555,7 @@ JS
* Return the navigation menu layout (id, menu groups, ...)
*
* @internal
* @return \Combodo\iTop\Application\UI\Layout\NavigationMenu\NavigationMenu
* @return \Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenu
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @throws \DictExceptionMissingString
@@ -573,7 +573,7 @@ JS
*
* @internal
*
* @param \Combodo\iTop\Application\UI\Layout\PageContent\PageContent $oLayout
* @param \Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContent $oLayout
*
* @return $this
* @since 3.0.0
@@ -589,7 +589,7 @@ JS
* Return the content layout (main content, [side content,] manually added content, ...)
*
* @internal
* @return \Combodo\iTop\Application\UI\Layout\PageContent\PageContent
* @return \Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContent
* @since 3.0.0
*/
protected function GetContentLayout()
@@ -822,7 +822,7 @@ EOF;
}
/**
* @param \Combodo\iTop\Application\UI\iUIBlock $oBlock
* @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock
*
* @throws \ReflectionException
* @throws \Twig\Error\LoaderError
@@ -907,7 +907,7 @@ EOF;
// - Retrieve layouts linked files
// Note: Adding them now instead of in the template allow us to remove duplicates and lower the browser parsing time
/** @var \Combodo\iTop\Application\UI\UIBlock|string $oLayout */
/** @var \Combodo\iTop\Application\UI\Base\UIBlock|string $oLayout */
foreach ($aData['aLayouts'] as $oLayout) {
if (!$oLayout instanceof UIBlock) {
continue;