diff --git a/src/Task/cssheader.php b/src/Task/cssheader.php index 61818b9..5fbd047 100644 --- a/src/Task/cssheader.php +++ b/src/Task/cssheader.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use dcCore; use Dotclear\Helper\Html\Form\{ @@ -27,13 +27,13 @@ use Dotclear\Helper\Html\Form\{ Textarea }; use Dotclear\Helper\Html\Html; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; use Exception; /** * Improve action module php header */ -class cssheader extends Action +class cssheader extends AbstractTask { /** @var string Exemple of header */ private static $exemple = << [], 'js' => []]; diff --git a/src/Task/dcstore.php b/src/Task/dcstore.php index a5482b8..7838d05 100644 --- a/src/Task/dcstore.php +++ b/src/Task/dcstore.php @@ -12,10 +12,9 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use DOMDocument; -use Dotclear\Plugin\improve\Action; use Dotclear\Helper\File\Files; use Dotclear\Helper\Html\Form\{ Div, @@ -28,12 +27,13 @@ use Dotclear\Helper\Html\Form\{ }; use Dotclear\Helper\Html\XmlTag; use Dotclear\Helper\Text; +use Dotclear\Plugin\improve\AbstractTask; use Exception; /** * Improve action module dcstore.xml */ -class dcstore extends Action +class dcstore extends AbstractTask { /** @var string Settings dcstore zip url pattern */ private $pattern = ''; diff --git a/src/Task/endoffile.php b/src/Task/endoffile.php index b856dd9..aa35b0a 100644 --- a/src/Task/endoffile.php +++ b/src/Task/endoffile.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use Dotclear\Helper\Html\Form\{ Checkbox, @@ -23,12 +23,12 @@ use Dotclear\Helper\Html\Form\{ Note, Para }; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; /** * Improve action module end of file */ -class endoffile extends Action +class endoffile extends AbstractTask { protected function init(): bool { diff --git a/src/Task/gitshields.php b/src/Task/gitshields.php index 1fb0a9e..043a47d 100644 --- a/src/Task/gitshields.php +++ b/src/Task/gitshields.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use dcCore; use Dotclear\Helper\Html\Form\{ @@ -25,12 +25,12 @@ use Dotclear\Helper\Html\Form\{ Note, Para }; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; /** * Improve action module Github shields.io */ -class gitshields extends Action +class gitshields extends AbstractTask { /** @var string Username of git repo */ private $username = ''; diff --git a/src/Task/licensefile.php b/src/Task/licensefile.php index 76d313d..bbe796b 100644 --- a/src/Task/licensefile.php +++ b/src/Task/licensefile.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use Dotclear\Helper\File\Files; use Dotclear\Helper\Html\Form\{ @@ -24,13 +24,13 @@ use Dotclear\Helper\Html\Form\{ Para, Select }; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; use Exception; /** * Improve action module license file */ -class licensefile extends Action +class licensefile extends AbstractTask { /** @var array Possible license filenames */ protected static $license_filenames = [ diff --git a/src/Task/newline.php b/src/Task/newline.php index 7f07a2f..c18541c 100644 --- a/src/Task/newline.php +++ b/src/Task/newline.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use Dotclear\Helper\Html\Form\{ Div, @@ -24,14 +24,14 @@ use Dotclear\Helper\Html\Form\{ Para }; use Dotclear\Plugin\improve\{ - Action, + AbstractTask, Core }; /** * Improve action module new line */ -class newline extends Action +class newline extends AbstractTask { protected function init(): bool { diff --git a/src/Task/phpcsfixer.php b/src/Task/phpcsfixer.php index b3abd8f..3b1087d 100644 --- a/src/Task/phpcsfixer.php +++ b/src/Task/phpcsfixer.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use dcCore; use dcPage; @@ -29,7 +29,7 @@ use Dotclear\Helper\Html\Form\{ }; use Dotclear\Helper\Html\Html; use Dotclear\Plugin\improve\{ - Action, + AbstractTask, My }; use Exception; @@ -37,7 +37,7 @@ use Exception; /** * Improve action module PHP CS Fixer */ -class phpcsfixer extends Action +class phpcsfixer extends AbstractTask { /** @var array Type of runtime errors */ protected static $errors = [ @@ -123,7 +123,7 @@ class phpcsfixer extends Action ]), ])->render() . ( !self::$user_ui_colorsyntax ? '' : - dcPage::jsModuleLoad(My::id() . '/inc/module/phpcsfixer/phpcsfixer.improve.js') . + dcPage::jsModuleLoad(My::id() . '/src/Task/phpcsfixer/phpcsfixer.improve.js') . dcPage::jsRunCodeMirror('editor', 'file_content', 'dotclear', self::$user_ui_colorsyntax_theme) ); } diff --git a/src/Task/phpheader.php b/src/Task/phpheader.php index c850ca4..9bc7070 100644 --- a/src/Task/phpheader.php +++ b/src/Task/phpheader.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use dcCore; use Dotclear\Helper\Html\Form\{ @@ -27,13 +27,13 @@ use Dotclear\Helper\Html\Form\{ Textarea }; use Dotclear\Helper\Html\Html; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; use Exception; /** * Improve action module php header */ -class phpheader extends Action +class phpheader extends AbstractTask { /** @var string Exemple of header */ private static $exemple = <<render() . ( !self::$user_ui_colorsyntax ? '' : - dcPage::jsModuleLoad(My::id() . '/inc/module/phpstan/phpstan.improve.js') . + dcPage::jsModuleLoad(My::id() . '/src/Task/phpstan/phpstan.improve.js') . dcPage::jsRunCodeMirror('editor', 'file_content', 'dotclear', self::$user_ui_colorsyntax_theme) ); } diff --git a/src/Task/po2php.php b/src/Task/po2php.php index 56591d3..6d2b2d4 100644 --- a/src/Task/po2php.php +++ b/src/Task/po2php.php @@ -12,15 +12,15 @@ */ declare(strict_types=1); -namespace Dotclear\Plugin\improve\Module; +namespace Dotclear\Plugin\improve\Task; use Dotclear\Helper\L10n; -use Dotclear\Plugin\improve\Action; +use Dotclear\Plugin\improve\AbstractTask; /** * Improve action module dcstore.xml */ -class po2php extends Action +class po2php extends AbstractTask { /** @var string License bloc */ private $license = <<