Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] Fix Composer Deprecation Notices #31804

Merged
merged 12 commits into from
Jan 27, 2021
10 changes: 6 additions & 4 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -6280,6 +6280,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
}
}

$this->fixFilenameCasing();

if ($suppressOutput === false && \count($status['folders_errors']))
{
echo implode('<br/>', $status['folders_errors']);
Expand All @@ -6290,8 +6292,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
echo implode('<br/>', $status['files_errors']);
}

$this->fixFilenameCasing();

return $status;
}

Expand Down Expand Up @@ -7155,9 +7155,11 @@ private function convertBlogLayouts()
protected function fixFilenameCasing()
{
$files = array(
// 3.10 changes
'libraries/src/Filesystem/Support/Stringcontroller.php' => 'libraries/src/Filesystem/Support/StringController.php',
'libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php' => 'libraries/vendor/paragonie/sodium_compat/src/Core/XSalsa20.php',
'media/mod_languages/images/si_LK.gif' => 'media/mod_languages/images/si_lk.gif',
'libraries/src/Form/Rule/SubFormRule.php' => 'libraries/src/Form/Rule/SubformRule.php',
// __DEPLOY_VERSION__
'media/vendor/skipto/js/skipTo.js' => 'media/vendor/skipto/js/skipto.js',
);

foreach ($files as $old => $expected)
Expand Down