← All changes
|
vendor/rosell-dk/webp-convert/src/Convert/Converters/Cwebp.php
+5
-4
3.2.3
→
trunk
View file →
| @@ -1,8 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace WebPConvert\Convert\Converters; |
| 4 | 4 | |
| 5 | +use ExecWithFallback\ExecWithFallback; | |
| 6 | +use LocateBinaries\LocateBinaries; | |
| 7 | + | |
| 5 | 8 | use WebPConvert\Convert\Converters\AbstractConverter; |
| 6 | 9 | use WebPConvert\Convert\Converters\BaseTraits\WarningLoggerTrait; |
| 7 | 10 | use WebPConvert\Convert\Converters\ConverterTraits\EncodingAutoTrait; |
| 8 | 11 | use WebPConvert\Convert\Converters\ConverterTraits\ExecTrait; |
| @@ -8,11 +11,9 @@ | ||
| 8 | 11 | use WebPConvert\Convert\Converters\ConverterTraits\ExecTrait; |
| 9 | 12 | use WebPConvert\Convert\Exceptions\ConversionFailed\ConverterNotOperational\SystemRequirementsNotMetException; |
| 10 | 13 | use WebPConvert\Convert\Exceptions\ConversionFailedException; |
| 11 | 14 | use WebPConvert\Convert\Exceptions\ConversionFailed\ConverterNotOperationalException; |
| 12 | -use WebPConvert\Helpers\BinaryDiscovery; | |
| 13 | 15 | use WebPConvert\Options\OptionFactory; |
| 14 | -use ExecWithFallback\ExecWithFallback; | |
| 15 | 16 | |
| 16 | 17 | /** |
| 17 | 18 | * Convert images to webp by calling cwebp binary. |
| 18 | 19 | * |
| @@ -745,9 +746,9 @@ | ||
| 745 | 746 | // try-discovering-cwebp |
| 746 | 747 | $startTime = self::startTimer(); |
| 747 | 748 | $this->logDiscoverAction('try-discovering-cwebp', 'using "which -a cwebp" command.'); |
| 748 | 749 | if ($this->options['try-discovering-cwebp']) { |
| 749 | - $moreBinaries = BinaryDiscovery::discoverInstalledBinaries('cwebp'); | |
| 750 | + $moreBinaries = LocateBinaries::locateInstalledBinaries('cwebp'); | |
| 750 | 751 | $this->logBinariesFound($moreBinaries, $startTime); |
| 751 | 752 | $binaries = array_merge($binaries, $moreBinaries); |
| 752 | 753 | } |
| 753 | 754 | |
| @@ -754,9 +755,9 @@ | ||
| 754 | 755 | // 'try-common-system-paths' |
| 755 | 756 | $startTime = self::startTimer(); |
| 756 | 757 | $this->logDiscoverAction('try-common-system-paths', 'by peeking in common system paths'); |
| 757 | 758 | if ($this->options['try-common-system-paths']) { |
| 758 | - $moreBinaries = BinaryDiscovery::discoverInCommonSystemPaths('cwebp'); | |
| 759 | + $moreBinaries = LocateBinaries::locateInCommonSystemPaths('cwebp'); | |
| 759 | 760 | $this->logBinariesFound($moreBinaries, $startTime); |
| 760 | 761 | $binaries = array_merge($binaries, $moreBinaries); |
| 761 | 762 | } |
| 762 | 763 | |