Merge branch 'dcon' into 'ditsuke/dcon'

administrator/components/com_scheduler/forms/filter_tasks.xml

@@ -52,14 +52,14 @@
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
-			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
-			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
-			<option value="a.state ASC">JSTATUS_ASC</option>
-			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="j.type_title ASC">COM_SCHEDULER_TASK_TYPE_ASC</option>
 			<option value="j.type_title DESC">COM_SCHEDULER_TASK_TYPE_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
 		</field>
 		<field
 			name="limit"

administrator/components/com_scheduler/services/provider.php

@@ -1,14 +1,15 @@
 <?php
 /**
- * Returns the service provider class for com_scheduler.
- *
  * @package    Joomla.Administrator
  * @subpackage com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license   GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Returns the service provider class for com_scheduler. */
+
+// Restrict direct access
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;

administrator/components/com_scheduler/src/Controller/DisplayController.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the default controller (DisplayController) for com_scheduler
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the default controller (DisplayController) for com_scheduler */
+
 namespace Joomla\Component\Scheduler\Administrator\Controller;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Controller/TaskController.php

@@ -1,18 +1,20 @@
 <?php
 /**
- * Declares the MVC controller for TaskModel.
- *
- * * : Model implicitly defaults to TaskModel through a call to parent::getModel()
- *
- * @todo : Check if the controller needs more overrides
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/**
+ * Implements the MVC controller for TaskModel.
+ *
+ * * : Model implicitly defaults to TaskModel through a call to parent::getModel()
+ *
+ * @todo : Check if the controller needs more overrides
+ */
+
 namespace Joomla\Component\Scheduler\Administrator\Controller;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Controller/TasksController.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the MVC controller for TasksView.
- *
  * @package         Joomla.Administrator
  * @subpackage      com_scheduler
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license         GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the MVC controller for TasksView. */
+
 namespace Joomla\Component\Scheduler\Administrator\Controller;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Event/ExecuteTaskEvent.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the ExecuteTaskEvent Event.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the ExecuteTaskEvent Event. */
+
 namespace Joomla\Component\Scheduler\Administrator\Event;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Extension/SchedulerComponent.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Implements the Scheduler component class
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the Scheduler component class. */
+
 namespace Joomla\Component\Scheduler\Administrator\Extension;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Field/TaskStateField.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares a list field with all possible states for a (cron)job entry.
- *
  * @package         Joomla.Administrator
  * @subpackage      com_scheduler
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license         GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Declares a list field with all possible states for a task entry. */
+
 namespace Joomla\Component\Scheduler\Administrator\Field;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Field/TaskTypeField.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the JobTypeField for listing all available job types.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Declares the TaskTypeField for listing all available task routines. */
+
 namespace Joomla\Component\Scheduler\Administrator\Field;
 
 // Restrict direct access
@@ -49,7 +49,7 @@ protected function getOptions(): array
 	{
 		$options = parent::getOptions();
 
-		// Get all available job types and sort by title
+		// Get all available task types and sort by title
 		$types = ArrayHelper::sortObjects(
 			SchedulerHelper::getTaskOptions()->options,
 			'title', 1

administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the helper class ExecRuleHelper.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the helper class ExecRuleHelper. */
+
 namespace Joomla\Component\Scheduler\Administrator\Helper;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Helper/SchedulerHelper.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Implements the SchedulerHelper class
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the SchedulerHelper class. */
+
 namespace Joomla\Component\Scheduler\Administrator\Helper;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Model/SelectModel.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the SelectModel MVC Model.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the MVC Model for SelectView. */
+
 namespace Joomla\Component\Scheduler\Administrator\Model;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Model/TaskModel.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the TaskModel MVC Model.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the MVC Model for TaskView. */
+
 namespace Joomla\Component\Scheduler\Administrator\Model;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Model/TasksModel.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the TasksModel MVC Model.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the MVC Model for TasksView. */
+
 namespace Joomla\Component\Scheduler\Administrator\Model;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Rule/ExecutionRulesRule.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the validation class for execution-rules.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the validation class for execution-rules. */
+
 namespace Joomla\Component\Scheduler\Administrator\Rule;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Table/TaskTable.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the main Table object for com_scheduler
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the Table class for com_scheduler.tasks. */
+
 namespace Joomla\Component\Scheduler\Administrator\Table;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Task/Status.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * @package         Joomla.
- * @subpackage      sub
+ * @package         Joomla.Administrator
+ * @subpackage      com_scheduler
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license         GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_scheduler/src/Task/Task.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Implements the Task class.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the Task class. */
+
 namespace Joomla\Component\Scheduler\Administrator\Task;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Task/TaskOption.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Implements the TaskOption class, used by com_scheduler to refer to plugin task routines.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the TaskOption class, used by com_scheduler to refer to plugin task routines. */
+
 namespace Joomla\Component\Scheduler\Administrator\Task;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Task/TaskOptions.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Implements the TaskOptions class used by com_scheduler as the subject arg for the `onTaskOptionsList` event.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
@@ -10,6 +8,8 @@
  *
  */
 
+/** Implements the TaskOptions class used by com_scheduler as the subject arg for the `onTaskOptionsList` event. */
+
 namespace Joomla\Component\Scheduler\Administrator\Task;
 
 // Restrict direct access

administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the TaskPluginTrait.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the TaskPluginTrait. */
+
 namespace Joomla\Component\Scheduler\Administrator\Traits;
 
 // Restrict direct access

administrator/components/com_scheduler/src/View/Select/HtmlView.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Declares the MVC View for Task type selection.
- *
  * @package       Joomla.Administrator
  * @subpackage    com_scheduler
  *
  * @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license       GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/** Implements the MVC View for Task type selection (SelectView). */
+
 namespace Joomla\Component\Scheduler\Administrator\View\Select;
 
 // Restrict direct access