joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Adds the namespacing to the compiler classes for the File, and Folder classes of Joomla.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2021-03-07 23:40:55 +02:00
parent 3c3951ae83
commit 552a2664ba
6 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
admin/helpers/compiler/b_Structure.php
View File

@ -12,6 +12,9 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
/**
* Structure class
*/
@ -1403,12 +1406,12 @@ class Structure extends Get
private function createFolder($path)
{
// check if the path exist
if (!JFolder::exists(
if (!Folder::exists(
$path
))
{
// create the path
JFolder::create(
Folder::create(
$path
);
// count the folder created
@ -1436,9 +1439,9 @@ class Structure extends Get
array(&$this->componentContext, &$this->libraries)
);
// creat the main component folder
if (!JFolder::exists($this->componentPath))
if (!Folder::exists($this->componentPath))
{
JFolder::create($this->componentPath);
Folder::create($this->componentPath);
// count the folder created
$this->folderCount++;
$this->indexHTML('');
@ -1736,9 +1739,9 @@ class Structure extends Get
))
{
// creat the main component folder
if (!JFolder::exists($this->componentPath))
if (!Folder::exists($this->componentPath))
{
JFolder::create($this->componentPath);
Folder::create($this->componentPath);
// count the folder created
$this->folderCount++;
$this->indexHTML('');
@ -1995,7 +1998,7 @@ class Structure extends Get
// now move the file
if ($details->type === 'file')
{
if (!JFile::exists($currentFullPath))
if (!File::exists($currentFullPath))
{
$this->app->enqueueMessage(
JText::_('<hr /><h3>File Path Error</h3>'), 'Error'
@ -2014,12 +2017,12 @@ class Structure extends Get
basename($packageFullPath), '', $packageFullPath
);
// check if path exist, if not creat it
if (!JFolder::exists($packageFullPath0nly))
if (!Folder::exists($packageFullPath0nly))
{
JFolder::create($packageFullPath0nly);
Folder::create($packageFullPath0nly);
}
// move the file to its place
JFile::copy($currentFullPath, $packageFullPath);
File::copy($currentFullPath, $packageFullPath);
// count the file created
$this->fileCount++;
// store the new files
@ -2054,7 +2057,7 @@ class Structure extends Get
}
elseif ($details->type === 'folder')
{
if (!JFolder::exists($currentFullPath))
if (!Folder::exists($currentFullPath))
{
$this->app->enqueueMessage(
JText::_('<hr /><h3>Folder Path Error</h3>'),
@ -2070,7 +2073,7 @@ class Structure extends Get
else
{
// move the folder to its place
JFolder::copy(
Folder::copy(
$currentFullPath, $packageFullPath, '', true
);
// count the folder created
@ -2359,13 +2362,13 @@ class Structure extends Get
if (!isset($this->extentionTrackingFilesMoved[$check]))
{
// check files exist
if (JFile::exists(
if (File::exists(
$this->componentPath . '/admin/models/fields/'
. $field['type_name'] . '.php'
))
{
// copy the custom field
JFile::copy(
File::copy(
$this->componentPath . '/admin/models/fields/'
. $field['type_name'] . '.php',
$path . '/fields/' . $field['type_name'] . '.php'
@ -2386,14 +2389,14 @@ class Structure extends Get
if (!isset($this->extentionTrackingFilesMoved[$check]))
{
// check files exist
if (JFile::exists(
if (File::exists(
$this->componentPath . '/admin/models/rules/'
. $this->validationLinkedFields[$field['field']]
. '.php'
))
{
// copy the custom field
JFile::copy(
File::copy(
$this->componentPath . '/admin/models/rules/'
. $this->validationLinkedFields[$field['field']]
. '.php', $path . '/rules/'
@ -2651,9 +2654,9 @@ class Structure extends Get
}
// setup the folder
if (!JFolder::exists($path))
if (!Folder::exists($path))
{
JFolder::create($path);
Folder::create($path);
$this->indexHTML($zipPath);
// count the folder created
$this->folderCount++;
@ -2683,10 +2686,10 @@ class Structure extends Get
{
$new = $item;
}
if (!JFile::exists($path . '/' . $new))
if (!File::exists($path . '/' . $new))
{
// move the file to its place
JFile::copy(
File::copy(
$this->templatePath . '/' . $item,
$path . '/' . $new
);
@ -3043,7 +3046,7 @@ class Structure extends Get
// use path if exist
if (strlen($path) > 0)
{
JFile::copy(
File::copy(
$this->templatePath . '/index.html',
$root . $path . '/index.html'
);
@ -3052,7 +3055,7 @@ class Structure extends Get
}
else
{
JFile::copy(
File::copy(
$this->templatePath . '/index.html', $root . '/index.html'
);
// count the file created