Skip to content

Commit 1c30e1b

Browse files
Hackwarrichard67softforge
authored
[6.0] Updating dependencies (#45827)
* Updating dependencies for J6.0 * Update content hash in composer.lock * Updating joomla/mediawiki-api, joomla/oauth1 & joomla/oauth2 * Cleaning up phpstan configuration --------- Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Phil Walton <[email protected]>
1 parent d209806 commit 1c30e1b

File tree

17 files changed

+717
-858
lines changed

17 files changed

+717
-858
lines changed

‎administrator/components/com_config/src/Model/ApplicationModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Joomla\CMS\Event\Application\AfterSaveConfigurationEvent;
1919
use Joomla\CMS\Event\Application\BeforeSaveConfigurationEvent;
2020
use Joomla\CMS\Factory;
21-
use Joomla\CMS\Http\HttpFactory;
2221
use Joomla\CMS\Language\Text;
2322
use Joomla\CMS\Log\Log;
2423
use Joomla\CMS\Mail\Exception\MailDisabledException;
@@ -36,6 +35,7 @@
3635
use Joomla\Filesystem\Folder;
3736
use Joomla\Filesystem\Path;
3837
use Joomla\Filter\OutputFilter;
38+
use Joomla\Http\HttpFactory;
3939
use Joomla\Registry\Registry;
4040
use Joomla\Utilities\ArrayHelper;
4141
use PHPMailer\PHPMailer\Exception as phpMailerException;
@@ -364,7 +364,7 @@ public function save($data)
364364
CURLOPT_PROXYUSERPWD => null,
365365
]
366366
);
367-
$response = HttpFactory::getHttp($options)->get('https://' . $host . Uri::root(true) . '/', ['Host' => $host], 10);
367+
$response = (new HttpFactory())->getHttp($options)->get('https://' . $host . Uri::root(true) . '/', ['Host' => $host], 10);
368368

369369
// If available in HTTPS check also the status code.
370370
if (!\in_array($response->getStatusCode(), [200, 503, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 401], true)) {

‎administrator/components/com_installer/src/Model/LanguagesModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
namespace Joomla\Component\Installer\Administrator\Model;
1111

1212
use Joomla\CMS\Factory;
13-
use Joomla\CMS\Http\HttpFactory;
1413
use Joomla\CMS\Language\Text;
1514
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
1615
use Joomla\CMS\MVC\Model\ListModel;
16+
use Joomla\Http\HttpFactory;
1717
use Joomla\String\StringHelper;
1818

1919
// phpcs:disable PSR1.Files.SideEffects
@@ -135,7 +135,7 @@ protected function getLanguages()
135135
}
136136

137137
try {
138-
$response = HttpFactory::getHttp()->get($updateSite);
138+
$response = (new HttpFactory())->getHttp()->get($updateSite);
139139
} catch (\RuntimeException) {
140140
$response = null;
141141
}

‎administrator/components/com_joomlaupdate/src/Model/UpdateModel.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
use Joomla\CMS\Extension\ExtensionHelper;
1818
use Joomla\CMS\Factory;
1919
use Joomla\CMS\Filter\InputFilter;
20-
use Joomla\CMS\Http\Http;
21-
use Joomla\CMS\Http\HttpFactory;
2220
use Joomla\CMS\Installer\Installer;
2321
use Joomla\CMS\Language\Text;
2422
use Joomla\CMS\Log\Log;
@@ -38,6 +36,7 @@
3836
use Joomla\Database\ParameterType;
3937
use Joomla\Filesystem\Exception\FilesystemException;
4038
use Joomla\Filesystem\File;
39+
use Joomla\Http\HttpFactory;
4140
use Joomla\Registry\Registry;
4241
use Joomla\Utilities\ArrayHelper;
4342

@@ -388,7 +387,7 @@ public function download()
388387
$response = ['basename' => false, 'check' => null, 'version' => $updateInfo['latest']];
389388

390389
try {
391-
$head = HttpFactory::getHttp($httpOptions)->head($packageURL);
390+
$head = (new HttpFactory())->getHttp($httpOptions)->head($packageURL);
392391
} catch (\RuntimeException) {
393392
// Passing false here -> download failed message
394393
return $response;
@@ -399,7 +398,7 @@ public function download()
399398
$packageURL = (string) $head->getHeaders()['location'][0];
400399

401400
try {
402-
$head = HttpFactory::getHttp($httpOptions)->head($packageURL);
401+
$head = (new HttpFactory())->getHttp($httpOptions)->head($packageURL);
403402
} catch (\RuntimeException) {
404403
// Passing false here -> download failed message
405404
return $response;
@@ -566,7 +565,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
566565
$this->cleanCache('_system');
567566

568567
// Prepare connection
569-
$http = HttpFactory::getHttp();
568+
$http = (new HttpFactory())->getHttp();
570569

571570
$url = self::AUTOUPDATE_URL;
572571
$url .= ($targetState === AutoupdateRegisterState::Subscribe) ? '/register' : '/delete';
@@ -760,7 +759,7 @@ protected function downloadPackage($url, $target)
760759

761760
// Download the package
762761
try {
763-
$result = HttpFactory::getHttp([], ['curl', 'stream'])->get($url);
762+
$result = (new HttpFactory())->getHttp([], ['curl', 'stream'])->get($url);
764763
} catch (\RuntimeException) {
765764
return false;
766765
}
@@ -1848,7 +1847,7 @@ private function getCollectionDetailsUrls($updateSiteInfo, $joomlaTargetVersion)
18481847
{
18491848
$return = [];
18501849

1851-
$http = new Http();
1850+
$http = (new HttpFactory())->getHttp();
18521851

18531852
try {
18541853
$response = $http->get($updateSiteInfo['location']);

‎composer.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"config": {
1212
"optimize-autoloader": true,
1313
"platform": {
14-
"php": "8.1.0"
14+
"php": "8.3.0"
1515
},
1616
"vendor-dir": "libraries/vendor",
1717
"github-protocols": ["https"]
@@ -46,42 +46,42 @@
4646
}
4747
},
4848
"require": {
49-
"php": "^8.1.0",
50-
"joomla/application": "^3.0.4",
51-
"joomla/archive": "^3.0.4",
52-
"joomla/authentication": "^3.0.3",
53-
"joomla/console": "^3.0.3",
54-
"joomla/crypt": "^3.0.3",
55-
"joomla/data": "^3.0.3",
56-
"joomla/database": "^3.4",
57-
"joomla/di": "^3.1.1",
58-
"joomla/event": "^3.0.2",
59-
"joomla/filter": "^3.0.4",
60-
"joomla/filesystem": "^3.1.2",
61-
"joomla/http": "^3.1.2",
62-
"joomla/input": "~3.0",
63-
"joomla/language": "~3.0",
64-
"joomla/oauth1": "~3.0",
65-
"joomla/oauth2": "~3.0",
66-
"joomla/registry": "~3.0",
67-
"joomla/router": "~3.0",
68-
"joomla/session": "^3.0.3",
69-
"joomla/string": "^3.0.4",
70-
"joomla/uri": "~3.0",
71-
"joomla/utilities": "~3.0",
49+
"php": "^8.3.0",
50+
"joomla/application": "^4.0",
51+
"joomla/archive": "^4.0",
52+
"joomla/authentication": "^4.0",
53+
"joomla/console": "^4.0",
54+
"joomla/crypt": "^4.0",
55+
"joomla/data": "^4.0",
56+
"joomla/database": "^4.0",
57+
"joomla/di": "^4.0",
58+
"joomla/event": "^4.0",
59+
"joomla/filter": "^4.0",
60+
"joomla/filesystem": "^4.0",
61+
"joomla/http": "^4.0",
62+
"joomla/input": "^4.0",
63+
"joomla/language": "^4.0",
64+
"joomla/oauth1": "^4.0",
65+
"joomla/oauth2": "^4.0",
66+
"joomla/registry": "^4.0",
67+
"joomla/router": "^4.0",
68+
"joomla/session": "^4.0",
69+
"joomla/string": "^4.0",
70+
"joomla/uri": "^4.0",
71+
"joomla/utilities": "^4.0",
7272
"algo26-matthias/idna-convert": "^4.0.4",
7373
"defuse/php-encryption": "^2.4.0",
74-
"doctrine/inflector": "^1.4.4",
74+
"doctrine/inflector": "^2.0.10",
7575
"fig/link-util": "^1.2.0",
7676
"google/recaptcha": "^1.3.1",
77-
"laminas/laminas-diactoros": "^2.26.0",
77+
"laminas/laminas-diactoros": "^3.6.0",
7878
"paragonie/sodium_compat": "^1.21.1",
7979
"phpmailer/phpmailer": "^6.10.0",
8080
"psr/link": "~1.1.1",
81-
"symfony/console": "^6.4.23",
82-
"symfony/error-handler": "^6.4.23",
83-
"symfony/ldap": "^6.4.13",
84-
"symfony/options-resolver": "^6.4.16",
81+
"symfony/console": "^7",
82+
"symfony/error-handler": "^7",
83+
"symfony/ldap": "^7",
84+
"symfony/options-resolver": "^7",
8585
"symfony/polyfill-mbstring": "^1.32.0",
8686
"symfony/web-link": "^6.4.22",
8787
"symfony/yaml": "^6.4.23",
@@ -108,8 +108,8 @@
108108
"phpunit/phpunit": "^9.6.23",
109109
"friendsofphp/php-cs-fixer": "^3.84.0",
110110
"squizlabs/php_codesniffer": "^3.13.2",
111-
"joomla/mediawiki": "^3.0",
112-
"joomla/test": "~3.0",
111+
"joomla/mediawiki": "^4.0",
112+
"joomla/test": "~4.0",
113113
"phpstan/phpstan": "^2.1.19",
114114
"phpstan/phpstan-deprecation-rules": "^2.0.3"
115115
},

0 commit comments

Comments
 (0)