Skip to content

Commit 250d8db

Browse files
Bodge-ITBodge-IT
authored
Merge pull request #44678 from Bodge-IT/upmerges/2024-12-30
[6.0] Upmerges - 2024-12-30
2 parents 5043379 + 108f9cd commit 250d8db

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

‎administrator/components/com_scheduler/src/Controller/LogsController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* Logs list controller class.
2424
*
25-
* @since __DEPLOY_VERSION__
25+
* @since 5.3.0
2626
*/
2727
class LogsController extends AdminController
2828
{
@@ -31,7 +31,7 @@ class LogsController extends AdminController
3131
*
3232
* @var string
3333
*
34-
* @since __DEPLOY_VERSION__
34+
* @since 5.3.0
3535
*/
3636
protected $text_prefix = 'COM_SCHEDULER_LOGS';
3737

@@ -44,7 +44,7 @@ class LogsController extends AdminController
4444
*
4545
* @return \Joomla\CMS\MVC\Model\BaseDatabaseModel
4646
*
47-
* @since __DEPLOY_VERSION__
47+
* @since 5.3.0
4848
*/
4949
public function getModel($name = 'Logs', $prefix = 'Administrator', $config = ['ignore_request' => true])
5050
{
@@ -56,7 +56,7 @@ public function getModel($name = 'Logs', $prefix = 'Administrator', $config = ['
5656
*
5757
* @return void
5858
*
59-
* @since __DEPLOY_VERSION__
59+
* @since 5.3.0
6060
*/
6161
public function purge()
6262
{
@@ -81,7 +81,7 @@ public function purge()
8181
*
8282
* @return void
8383
*
84-
* @since __DEPLOY_VERSION__
84+
* @since 5.3.0
8585
*/
8686
public function delete(): void
8787
{

‎administrator/components/com_scheduler/src/Field/ExitCodeField.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
/**
2020
* A predefined list field with all possible states for a com_scheduler entry.
2121
*
22-
* @since __DEPLOY_VERSION__
22+
* @since 5.3.0
2323
*/
2424
class ExitCodeField extends PredefinedlistField
2525
{
2626
/**
2727
* The form field type.
2828
*
2929
* @var string
30-
* @since __DEPLOY_VERSION__
30+
* @since 5.3.0
3131
*/
3232
public $type = 'exitCode';
3333

3434
/**
3535
* Available states
3636
*
3737
* @var string[]
38-
* @since __DEPLOY_VERSION__
38+
* @since 5.3.0
3939
*/
4040
protected $predefinedOptions = [
4141
5 => 'COM_SCHEDULER_EXIT_CODE_FAILED',

‎administrator/components/com_scheduler/src/Model/LogsModel.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Supporting a list of logs.
2626
*
27-
* @since __DEPLOY_VERSION__
27+
* @since 5.3.0
2828
*/
2929
class LogsModel extends ListModel
3030
{
@@ -35,7 +35,7 @@ class LogsModel extends ListModel
3535
* @param MVCFactoryInterface $factory The factory.
3636
*
3737
* @see \JControllerLegacy
38-
* @since __DEPLOY_VERSION__
38+
* @since 5.3.0
3939
*/
4040
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4141
{
@@ -61,7 +61,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
6161
*
6262
* @return boolean result of operation
6363
*
64-
* @since __DEPLOY_VERSION__
64+
* @since 5.3.0
6565
*/
6666
public function purge()
6767
{
@@ -84,7 +84,7 @@ public function purge()
8484
*
8585
* @return void
8686
*
87-
* @since __DEPLOY_VERSION__
87+
* @since 5.3.0
8888
*/
8989
protected function populateState($ordering = 'a.id', $direction = 'desc')
9090
{
@@ -107,7 +107,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
107107
*
108108
* @return string A store id.
109109
*
110-
* @since __DEPLOY_VERSION__
110+
* @since 5.3.0
111111
*/
112112
protected function getStoreId($id = '')
113113
{
@@ -125,7 +125,7 @@ protected function getStoreId($id = '')
125125
*
126126
* @return \JDatabaseQuery
127127
*
128-
* @since __DEPLOY_VERSION__
128+
* @since 5.3.0
129129
*/
130130
protected function getListQuery()
131131
{
@@ -227,7 +227,7 @@ public function delete($pks)
227227
*
228228
* @return boolean True if the record may be deleted
229229
*
230-
* @since __DEPLOY_VERSION__
230+
* @since 5.3.0
231231
* @throws \Exception
232232
*/
233233
protected function canDelete($record): bool
@@ -245,7 +245,7 @@ protected function canDelete($record): bool
245245
*
246246
* @return void
247247
*
248-
* @since __DEPLOY_VERSION__
248+
* @since 5.3.0
249249
* @throws Exception
250250
*/
251251
public function logTask(array $data): void

‎administrator/components/com_scheduler/src/Table/LogsTable.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Logs Table class.
2323
*
24-
* @since __DEPLOY_VERSION__
24+
* @since 5.3.0
2525
*/
2626
class LogsTable extends Table
2727
{
@@ -31,7 +31,7 @@ class LogsTable extends Table
3131
* @param DatabaseDriver $db Database connector object
3232
* @param ?DispatcherInterface $dispatcher Event dispatcher for this table
3333
*
34-
* @since __DEPLOY_VERSION__
34+
* @since 5.3.0
3535
*/
3636
public function __construct(DatabaseDriver $db, ?DispatcherInterface $dispatcher = null)
3737
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected function _getAssetName(): string
172172
*
173173
* @return string
174174
*
175-
* @since __DEPLOY_VERSION__
175+
* @since 5.3.0
176176
*/
177177
protected function _getAssetTitle(): string
178178
{
@@ -191,7 +191,7 @@ protected function _getAssetTitle(): string
191191
*
192192
* @return integer
193193
*
194-
* @since __DEPLOY_VERSION__
194+
* @since 5.3.0
195195
*/
196196
protected function _getAssetParentId(?Table $table = null, $id = null): int
197197
{

‎administrator/components/com_scheduler/src/View/Logs/HtmlView.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,47 @@
2828
/**
2929
* View class for a list of logs.
3030
*
31-
* @since __DEPLOY_VERSION__
31+
* @since 5.3.0
3232
*/
3333
class HtmlView extends BaseHtmlView
3434
{
3535
/**
3636
* The search tools form
3737
*
3838
* @var Form
39-
* @since __DEPLOY_VERSION__
39+
* @since 5.3.0
4040
*/
4141
public $filterForm;
4242

4343
/**
4444
* The active search filters
4545
*
4646
* @var array
47-
* @since __DEPLOY_VERSION__
47+
* @since 5.3.0
4848
*/
4949
public $activeFilters = [];
5050

5151
/**
5252
* An array of items
5353
*
5454
* @var array
55-
* @since __DEPLOY_VERSION__
55+
* @since 5.3.0
5656
*/
5757
protected $items = [];
5858

5959
/**
6060
* The pagination object
6161
*
6262
* @var Pagination
63-
* @since __DEPLOY_VERSION__
63+
* @since 5.3.0
6464
*/
6565
protected $pagination;
6666

6767
/**
6868
* The model state
6969
*
7070
* @var Registry
71-
* @since __DEPLOY_VERSION__
71+
* @since 5.3.0
7272
*/
7373
protected $state;
7474

@@ -79,7 +79,7 @@ class HtmlView extends BaseHtmlView
7979
*
8080
* @return void
8181
*
82-
* @since __DEPLOY_VERSION__
82+
* @since 5.3.0
8383
* @throws \Exception
8484
*/
8585
public function display($tpl = null): void
@@ -106,7 +106,7 @@ public function display($tpl = null): void
106106
*
107107
* @return void
108108
*
109-
* @since __DEPLOY_VERSION__
109+
* @since 5.3.0
110110
*/
111111
protected function addToolbar(): void
112112
{

‎libraries/src/Event/Installer/BeforeUpdateSiteDownloadEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Class for update site events
1818
*
19-
* @since __DEPLOY_VERSION__
19+
* @since 5.3.0
2020
*/
2121
class BeforeUpdateSiteDownloadEvent extends BeforePackageDownloadEvent
2222
{

‎libraries/src/Router/Router.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class Router
8686
* flag can be set to true to mark the URL as erroneous.
8787
*
8888
* @var bool
89-
* @since __DEPLOY_VERSION__
89+
* @since 5.3.0
9090
*/
9191
protected $tainted = false;
9292

@@ -384,7 +384,7 @@ public function getRules()
384384
* can later do additional processing, like redirecting to the right URL.
385385
* If the URL is demonstrably wrong, it should still throw a 404 exception.
386386
*
387-
* @since __DEPLOY_VERSION__
387+
* @since 5.3.0
388388
*/
389389
public function setTainted()
390390
{
@@ -396,7 +396,7 @@ public function setTainted()
396396
*
397397
* @return bool
398398
*
399-
* @since __DEPLOY_VERSION__
399+
* @since 5.3.0
400400
*/
401401
public function isTainted()
402402
{

‎plugins/system/tasknotification/src/Extension/TaskNotification.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function notifySuccess(Event $event): void
209209
*
210210
* @return void
211211
*
212-
* @since __DEPLOY_VERSION__
212+
* @since 5.3.0
213213
* @throws \Exception
214214
*/
215215
public function notifyWillResume(Event $event): void

0 commit comments

Comments
 (0)