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.

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

Jump to bottom

Fix composer path for yui compressor #39

Merged
merged 2 commits into from
Jan 4, 2022
Merged

Fix composer path for yui compressor #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ec5ba1
Avoid running java -jar on bin proxy generated by Composer >= 2.2.2 a…
gauthierm Jan 4, 2022
2da447e
Fix YUI compressor package namespace
gauthierm Jan 4, 2022
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
21 changes: 17 additions & 4 deletions Concentrate/Filter/Minifier/YUICompressor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,29 @@ protected function findJarFile()
{
$jarFile = '';

$paths = array(
// Support supported and deprecated YUI Compressor package namespaces.
$packages = [
'packagelist/yuicompressor-bin',
'packagist/yuicompressor-bin',
];

$paths = [
// Try to load jar if Concentrate is the root project.
__DIR__ . '/../../../vendor/bin',
__DIR__ . '/../../../vendor/$1/bin',

// Try to load jar if Concentrate is installed as a library for
// another root project.
__DIR__ . '/../../../../../bin',
);
__DIR__ . '/../../../../../$1/bin',
];

$fullPaths = [];
foreach ($paths as $path) {
foreach ($packages as $package) {
$fullPaths[] = str_replace('$1', $package, $path);
}
}

foreach ($fullPaths as $path) {
if (is_dir($path)) {
$dir = dir($path);
while (false !== ($entry = $dir->read())) {
Expand Down