Skip to content

[4.0] Convert the cli scripts #16516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2017
Merged

[4.0] Convert the cli scripts #16516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60f2def
Adapt cli scripts
laoneo Jun 4, 2017
34e0e8f
Make update script work
laoneo Jun 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cli/deletefiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
* @since 3.0
*/
class DeletefilesCli extends JApplicationCli
class DeletefilesCli extends \Joomla\CMS\Application\CliApplication
{
/**
* Entry point for CLI script
Expand All @@ -53,8 +53,8 @@ class DeletefilesCli extends JApplicationCli
protected function doExecute()
{
// Import the dependencies
jimport('joomla.filesystem.file');
jimport('joomla.filesystem.folder');
JLoader::import('joomla.filesystem.file');
JLoader::import('joomla.filesystem.folder');

// We need the update script
JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
Expand All @@ -66,4 +66,4 @@ protected function doExecute()

// Instantiate the application object, passing the class name to JCli::getInstance
// and use chaining to execute the application.
JApplicationCli::getInstance('DeletefilesCli')->execute();
\Joomla\CMS\Application\CliApplication::getInstance('DeletefilesCli')->execute();
4 changes: 2 additions & 2 deletions cli/garbagecron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @since 2.5
*/
class GarbageCron extends JApplicationCli
class GarbageCron extends \Joomla\CMS\Application\CliApplication
{
/**
* Entry point for the script
Expand All @@ -44,4 +44,4 @@ protected function doExecute()
}
}

JApplicationCli::getInstance('GarbageCron')->execute();
\Joomla\CMS\Application\CliApplication::getInstance('GarbageCron')->execute();
9 changes: 6 additions & 3 deletions cli/update_cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*
* @since 2.5
*/
class Updatecron extends JApplicationCli
class Updatecron extends \Joomla\CMS\Application\CliApplication
{
/**
* Entry point for the script
Expand All @@ -53,8 +53,11 @@ class Updatecron extends JApplicationCli
*/
protected function doExecute()
{
// Load an app which can be used later
JFactory::getApplication('site');
Copy link
Contributor

@wilsonge wilsonge Jun 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this here?


// Get the update cache time
$component = JComponentHelper::getComponent('com_installer');
$component = \Joomla\CMS\Component\ComponentHelper::getComponent('com_installer');

$params = $component->params;
$cache_timeout = $params->get('cachetimeout', 6, 'int');
Expand All @@ -68,4 +71,4 @@ protected function doExecute()
}
}

JApplicationCli::getInstance('Updatecron')->execute();
\Joomla\CMS\Application\CliApplication::getInstance('Updatecron')->execute();