Skip to content

Commit 99d5507

Browse files
softforgesoftforge
authored
Merge pull request joomla#44446 from softforge/upmerges/2024-11-13
[6.0] Upmerges - 2024-11-13
2 parents b29150d + 88ccfc0 commit 99d5507

File tree

23 files changed

+117
-69
lines changed

23 files changed

+117
-69
lines changed

‎administrator/components/com_actionlogs/src/Model/ActionlogsModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Joomla\CMS\Factory;
1717
use Joomla\CMS\Form\Form;
1818
use Joomla\CMS\Language\Text;
19+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1920
use Joomla\CMS\MVC\Model\ListModel;
2021
use Joomla\Database\DatabaseIterator;
2122
use Joomla\Database\ParameterType;
@@ -36,13 +37,14 @@ class ActionlogsModel extends ListModel
3637
/**
3738
* Constructor.
3839
*
39-
* @param array $config An optional associative array of configuration settings.
40+
* @param array $config An optional associative array of configuration settings.
41+
* @param ?MVCFactoryInterface $factory The factory.
4042
*
4143
* @since 3.9.0
4244
*
4345
* @throws \Exception
4446
*/
45-
public function __construct($config = [])
47+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4648
{
4749
if (empty($config['filter_fields'])) {
4850
$config['filter_fields'] = [
@@ -56,7 +58,7 @@ public function __construct($config = [])
5658
];
5759
}
5860

59-
parent::__construct($config);
61+
parent::__construct($config, $factory);
6062
}
6163

6264
/**

‎administrator/components/com_banners/src/Model/BannersModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Joomla\Component\Banners\Administrator\Model;
1212

1313
use Joomla\CMS\Component\ComponentHelper;
14+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1415
use Joomla\CMS\MVC\Model\ListModel;
1516
use Joomla\CMS\Table\Table;
1617
use Joomla\Database\ParameterType;
@@ -30,11 +31,12 @@ class BannersModel extends ListModel
3031
/**
3132
* Constructor.
3233
*
33-
* @param array $config An optional associative array of configuration settings.
34+
* @param array $config An optional associative array of configuration settings.
35+
* @param ?MVCFactoryInterface $factory The factory.
3436
*
3537
* @since 1.6
3638
*/
37-
public function __construct($config = [])
39+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
3840
{
3941
if (empty($config['filter_fields'])) {
4042
$config['filter_fields'] = [
@@ -62,7 +64,7 @@ public function __construct($config = [])
6264
];
6365
}
6466

65-
parent::__construct($config);
67+
parent::__construct($config, $factory);
6668
}
6769

6870
/**

‎administrator/components/com_banners/src/Model/ClientsModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Joomla\Component\Banners\Administrator\Model;
1212

1313
use Joomla\CMS\Component\ComponentHelper;
14+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1415
use Joomla\CMS\MVC\Model\ListModel;
1516
use Joomla\Database\ParameterType;
1617
use Joomla\Database\QueryInterface;
@@ -29,11 +30,12 @@ class ClientsModel extends ListModel
2930
/**
3031
* Constructor.
3132
*
32-
* @param array $config An optional associative array of configuration settings.
33+
* @param array $config An optional associative array of configuration settings.
34+
* @param ?MVCFactoryInterface $factory The factory.
3335
*
3436
* @since 1.6
3537
*/
36-
public function __construct($config = [])
38+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
3739
{
3840
if (empty($config['filter_fields'])) {
3941
$config['filter_fields'] = [
@@ -47,7 +49,7 @@ public function __construct($config = [])
4749
];
4850
}
4951

50-
parent::__construct($config);
52+
parent::__construct($config, $factory);
5153
}
5254

5355
/**

‎administrator/components/com_banners/src/Model/TracksModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Joomla\CMS\Component\ComponentHelper;
1515
use Joomla\CMS\Factory;
1616
use Joomla\CMS\Language\Text;
17+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1718
use Joomla\CMS\MVC\Model\ListModel;
1819
use Joomla\Database\ParameterType;
1920
use Joomla\Database\QueryInterface;
@@ -43,11 +44,12 @@ class TracksModel extends ListModel
4344
/**
4445
* Constructor.
4546
*
46-
* @param array $config An optional associative array of configuration settings.
47+
* @param array $config An optional associative array of configuration settings.
48+
* @param ?MVCFactoryInterface $factory The factory.
4749
*
4850
* @since 1.6
4951
*/
50-
public function __construct($config = [])
52+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
5153
{
5254
if (empty($config['filter_fields'])) {
5355
$config['filter_fields'] = [
@@ -61,7 +63,7 @@ public function __construct($config = [])
6163
];
6264
}
6365

64-
parent::__construct($config);
66+
parent::__construct($config, $factory);
6567
}
6668

6769
/**

‎administrator/components/com_cache/src/Model/CacheModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Joomla\CMS\Event\Cache\AfterPurgeEvent;
1818
use Joomla\CMS\Factory;
1919
use Joomla\CMS\Language\Text;
20+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
2021
use Joomla\CMS\MVC\Model\ListModel;
2122
use Joomla\CMS\Pagination\Pagination;
2223
use Joomla\Utilities\ArrayHelper;
@@ -56,11 +57,12 @@ class CacheModel extends ListModel
5657
/**
5758
* Constructor.
5859
*
59-
* @param array $config An optional associative array of configuration settings.
60+
* @param array $config An optional associative array of configuration settings.
61+
* @param ?MVCFactoryInterface $factory The factory.
6062
*
6163
* @since 3.5
6264
*/
63-
public function __construct($config = [])
65+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
6466
{
6567
if (empty($config['filter_fields'])) {
6668
$config['filter_fields'] = [
@@ -71,7 +73,7 @@ public function __construct($config = [])
7173
];
7274
}
7375

74-
parent::__construct($config);
76+
parent::__construct($config, $factory);
7577
}
7678

7779
/**

‎administrator/components/com_contact/src/Model/ContactsModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
use Joomla\CMS\Factory;
1414
use Joomla\CMS\Language\Associations;
15+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1516
use Joomla\CMS\MVC\Model\ListModel;
1617
use Joomla\CMS\Table\Table;
1718
use Joomla\Database\ParameterType;
@@ -32,11 +33,12 @@ class ContactsModel extends ListModel
3233
/**
3334
* Constructor.
3435
*
35-
* @param array $config An optional associative array of configuration settings.
36+
* @param array $config An optional associative array of configuration settings.
37+
* @param ?MVCFactoryInterface $factory The factory.
3638
*
3739
* @since 1.6
3840
*/
39-
public function __construct($config = [])
41+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4042
{
4143
if (empty($config['filter_fields'])) {
4244
$config['filter_fields'] = [
@@ -66,7 +68,7 @@ public function __construct($config = [])
6668
}
6769
}
6870

69-
parent::__construct($config);
71+
parent::__construct($config, $factory);
7072
}
7173

7274
/**

‎administrator/components/com_content/src/Model/ArticlesModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Joomla\CMS\Factory;
1515
use Joomla\CMS\Language\Associations;
1616
use Joomla\CMS\Language\Text;
17+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1718
use Joomla\CMS\MVC\Model\ListModel;
1819
use Joomla\CMS\Plugin\PluginHelper;
1920
use Joomla\CMS\Table\Table;
@@ -37,12 +38,13 @@ class ArticlesModel extends ListModel
3738
/**
3839
* Constructor.
3940
*
40-
* @param array $config An optional associative array of configuration settings.
41+
* @param array $config An optional associative array of configuration settings.
42+
* @param ?MVCFactoryInterface $factory The factory.
4143
*
4244
* @since 1.6
4345
* @see \Joomla\CMS\MVC\Controller\BaseController
4446
*/
45-
public function __construct($config = [])
47+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4648
{
4749
if (empty($config['filter_fields'])) {
4850
$config['filter_fields'] = [
@@ -81,7 +83,7 @@ public function __construct($config = [])
8183
}
8284
}
8385

84-
parent::__construct($config);
86+
parent::__construct($config, $factory);
8587
}
8688

8789
/**

‎administrator/components/com_content/src/Model/FeaturedModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace Joomla\Component\Content\Administrator\Model;
1212

13+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1314
use Joomla\Database\QueryInterface;
1415

1516
// phpcs:disable PSR1.Files.SideEffects
@@ -26,12 +27,13 @@ class FeaturedModel extends ArticlesModel
2627
/**
2728
* Constructor.
2829
*
29-
* @param array $config An optional associative array of configuration settings.
30+
* @param array $config An optional associative array of configuration settings.
31+
* @param ?MVCFactoryInterface $factory The factory.
3032
*
3133
* @see \Joomla\CMS\MVC\Controller\BaseController
3234
* @since 1.6
3335
*/
34-
public function __construct($config = [])
36+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
3537
{
3638
if (empty($config['filter_fields'])) {
3739
$config['filter_fields'] = [
@@ -64,7 +66,7 @@ public function __construct($config = [])
6466
];
6567
}
6668

67-
parent::__construct($config);
69+
parent::__construct($config, $factory);
6870
}
6971

7072
/**

‎administrator/components/com_guidedtours/src/Model/StepsModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
use Joomla\CMS\Factory;
1414
use Joomla\CMS\Language\Text;
15+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1516
use Joomla\CMS\MVC\Model\ListModel;
1617
use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
1718
use Joomla\Database\ParameterType;
@@ -33,12 +34,13 @@ class StepsModel extends ListModel
3334
/**
3435
* Constructor.
3536
*
36-
* @param array $config An optional associative array of configuration settings.
37+
* @param array $config An optional associative array of configuration settings.
38+
* @param ?MVCFactoryInterface $factory The factory.
3739
*
3840
* @since 4.3.0
3941
* @see \Joomla\CMS\MVC\Controller\BaseController
4042
*/
41-
public function __construct($config = [])
43+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4244
{
4345
if (empty($config['filter_fields'])) {
4446
$config['filter_fields'] = [
@@ -56,7 +58,7 @@ public function __construct($config = [])
5658
];
5759
}
5860

59-
parent::__construct($config);
61+
parent::__construct($config, $factory);
6062
}
6163

6264
/**

‎administrator/components/com_guidedtours/src/Model/ToursModel.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Joomla\Component\Guidedtours\Administrator\Model;
1212

1313
use Joomla\CMS\Language\Text;
14+
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1415
use Joomla\CMS\MVC\Model\ListModel;
1516
use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
1617
use Joomla\Database\ParameterType;
@@ -32,12 +33,13 @@ class ToursModel extends ListModel
3233
/**
3334
* Constructor.
3435
*
35-
* @param array $config An optional associative array of configuration settings.
36+
* @param array $config An optional associative array of configuration settings.
37+
* @param ?MVCFactoryInterface $factory The factory.
3638
*
3739
* @see JController
3840
* @since 4.3.0
3941
*/
40-
public function __construct($config = [])
42+
public function __construct($config = [], ?MVCFactoryInterface $factory = null)
4143
{
4244
if (empty($config['filter_fields'])) {
4345
$config['filter_fields'] = [
@@ -56,7 +58,7 @@ public function __construct($config = [])
5658
];
5759
}
5860

59-
parent::__construct($config);
61+
parent::__construct($config, $factory);
6062
}
6163

6264
/**

0 commit comments

Comments
 (0)