Skip to content

[4.0] Fix Composer Deprecation Notices #31804

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.

Sign up for GitHub

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

Merged
wilsonge merged 12 commits into from
Jan 27, 2021
Merged

[4.0] Fix Composer Deprecation Notices #31804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
37db01b
Cherry pick #a6107058b70246fc165f9b22eff74661518b9072 from @SharkyKZ
SharkyKZ Sep 28, 2020
e35e3f5
Fix composer deprecations
bembelimen Dec 30, 2020
1df8bba
Add to CLI command
wilsonge Jan 2, 2021
f2fc5e2
Sync case of filename with Joomla! 3.x solution
bembelimen Jan 5, 2021
1bc78e7
Revert
wilsonge Jan 6, 2021
2bb23da
Revert
wilsonge Jan 6, 2021
f0cadd3
Fix casing of skipto
wilsonge Jan 15, 2021
f72b5bc
Fix for OSX (#126)
richard67 Jan 25, 2021
127582e
Merge branch '4.0-dev' into 4.0/29794
richard67 Jan 27, 2021
85ee3ae
Update administrator/components/com_admin/script.php
wilsonge Jan 27, 2021
781686d
Merge branch '4.0-dev' into 4.0/29794
wilsonge Jan 27, 2021
4a72124
Simplify
wilsonge Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions administrator/components/com_admin/script.php
View file
Open in desktop
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
0 libraries/src/Form/Rule/SubFormRule.php → libraries/src/Form/Rule/SubformRule.php
View file
Open in desktop
File renamed without changes.