Skip to content

Commit

Permalink
This one goes out for Scrutinizer
Browse files Browse the repository at this point in the history
  • Loading branch information
@rosell-dk
rosell-dk committed Jun 17, 2019
1 parent 3d6fff7 commit 6f3e756
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions src-build/webp-convert.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2635,7 +2635,7 @@ class Cwebp extends AbstractConverter
if (defined('WEBPCONVERT_CWEBP_PATH')) {
$this->logLn('WEBPCONVERT_CWEBP_PATH was defined, so using that path and ignoring any other');
//$this->logLn('Value: "' . getenv('WEBPCONVERT_CWEBP_PATH') . '"');
return [WEBPCONVERT_CWEBP_PATH];
return [constant('WEBPCONVERT_CWEBP_PATH')];
}
if (!empty(getenv('WEBPCONVERT_CWEBP_PATH'))) {
$this->logLn(
Expand All @@ -2661,7 +2661,7 @@ class Cwebp extends AbstractConverter
// TODO: exec('whereis cwebp');
if ($this->options['try-supplied-binary-for-os']) {
$suppliedBinary = $this->getSuppliedBinaryPathForOS();
if ($suppliedBinary != false) {
if ($suppliedBinary !== false) {
$binaries[] = $suppliedBinary;
}
} else {
Expand Down Expand Up @@ -2889,7 +2889,7 @@ class Ewww extends AbstractConverter
return $this->options['api-key'];
}
if (defined('WEBPCONVERT_EWWW_API_KEY')) {
return WEBPCONVERT_EWWW_API_KEY;
return constant('WEBPCONVERT_EWWW_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_EWWW_API_KEY'))) {
return getenv('WEBPCONVERT_EWWW_API_KEY');
Expand Down Expand Up @@ -3875,7 +3875,7 @@ class GraphicsMagick extends AbstractConverter
private function getPath()
{
if (defined('WEBPCONVERT_GRAPHICSMAGICK_PATH')) {
return WEBPCONVERT_GRAPHICSMAGICK_PATH;
return constant('WEBPCONVERT_GRAPHICSMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH'))) {
return getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH');
Expand Down Expand Up @@ -4049,7 +4049,7 @@ class ImageMagick extends AbstractConverter
private function getPath()
{
if (defined('WEBPCONVERT_IMAGEMAGICK_PATH')) {
return WEBPCONVERT_IMAGEMAGICK_PATH;
return constant('WEBPCONVERT_IMAGEMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_IMAGEMAGICK_PATH'))) {
return getenv('WEBPCONVERT_IMAGEMAGICK_PATH');
Expand Down Expand Up @@ -4955,7 +4955,7 @@ class Wpc extends AbstractConverter
}
}
if (defined('WEBPCONVERT_WPC_API_KEY')) {
return WEBPCONVERT_WPC_API_KEY;
return constant('WEBPCONVERT_WPC_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_KEY'))) {
return getenv('WEBPCONVERT_WPC_API_KEY');
Expand All @@ -4974,7 +4974,7 @@ class Wpc extends AbstractConverter
return $this->options['api-url'];
}
if (defined('WEBPCONVERT_WPC_API_URL')) {
return WEBPCONVERT_WPC_API_URL;
return constant('WEBPCONVERT_WPC_API_URL');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_URL'))) {
return getenv('WEBPCONVERT_WPC_API_URL');
Expand Down
14 changes: 7 additions & 7 deletions src-build/webp-on-demand-2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2557,7 +2557,7 @@ class Cwebp extends AbstractConverter
if (defined('WEBPCONVERT_CWEBP_PATH')) {
$this->logLn('WEBPCONVERT_CWEBP_PATH was defined, so using that path and ignoring any other');
//$this->logLn('Value: "' . getenv('WEBPCONVERT_CWEBP_PATH') . '"');
return [WEBPCONVERT_CWEBP_PATH];
return [constant('WEBPCONVERT_CWEBP_PATH')];
}
if (!empty(getenv('WEBPCONVERT_CWEBP_PATH'))) {
$this->logLn(
Expand All @@ -2583,7 +2583,7 @@ class Cwebp extends AbstractConverter
// TODO: exec('whereis cwebp');
if ($this->options['try-supplied-binary-for-os']) {
$suppliedBinary = $this->getSuppliedBinaryPathForOS();
if ($suppliedBinary != false) {
if ($suppliedBinary !== false) {
$binaries[] = $suppliedBinary;
}
} else {
Expand Down Expand Up @@ -2811,7 +2811,7 @@ class Ewww extends AbstractConverter
return $this->options['api-key'];
}
if (defined('WEBPCONVERT_EWWW_API_KEY')) {
return WEBPCONVERT_EWWW_API_KEY;
return constant('WEBPCONVERT_EWWW_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_EWWW_API_KEY'))) {
return getenv('WEBPCONVERT_EWWW_API_KEY');
Expand Down Expand Up @@ -3797,7 +3797,7 @@ class GraphicsMagick extends AbstractConverter
private function getPath()
{
if (defined('WEBPCONVERT_GRAPHICSMAGICK_PATH')) {
return WEBPCONVERT_GRAPHICSMAGICK_PATH;
return constant('WEBPCONVERT_GRAPHICSMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH'))) {
return getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH');
Expand Down Expand Up @@ -3971,7 +3971,7 @@ class ImageMagick extends AbstractConverter
private function getPath()
{
if (defined('WEBPCONVERT_IMAGEMAGICK_PATH')) {
return WEBPCONVERT_IMAGEMAGICK_PATH;
return constant('WEBPCONVERT_IMAGEMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_IMAGEMAGICK_PATH'))) {
return getenv('WEBPCONVERT_IMAGEMAGICK_PATH');
Expand Down Expand Up @@ -4877,7 +4877,7 @@ class Wpc extends AbstractConverter
}
}
if (defined('WEBPCONVERT_WPC_API_KEY')) {
return WEBPCONVERT_WPC_API_KEY;
return constant('WEBPCONVERT_WPC_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_KEY'))) {
return getenv('WEBPCONVERT_WPC_API_KEY');
Expand All @@ -4896,7 +4896,7 @@ class Wpc extends AbstractConverter
return $this->options['api-url'];
}
if (defined('WEBPCONVERT_WPC_API_URL')) {
return WEBPCONVERT_WPC_API_URL;
return constant('WEBPCONVERT_WPC_API_URL');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_URL'))) {
return getenv('WEBPCONVERT_WPC_API_URL');
Expand Down
2 changes: 1 addition & 1 deletion src/Convert/Converters/Ewww.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private function getKey()
return $this->options['api-key'];
}
if (defined('WEBPCONVERT_EWWW_API_KEY')) {
return WEBPCONVERT_EWWW_API_KEY;
return constant('WEBPCONVERT_EWWW_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_EWWW_API_KEY'))) {
return getenv('WEBPCONVERT_EWWW_API_KEY');
Expand Down
2 changes: 1 addition & 1 deletion src/Convert/Converters/GraphicsMagick.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected function getUnsupportedDefaultOptions()
private function getPath()
{
if (defined('WEBPCONVERT_GRAPHICSMAGICK_PATH')) {
return WEBPCONVERT_GRAPHICSMAGICK_PATH;
return constant('WEBPCONVERT_GRAPHICSMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH'))) {
return getenv('WEBPCONVERT_GRAPHICSMAGICK_PATH');
Expand Down
2 changes: 1 addition & 1 deletion src/Convert/Converters/ImageMagick.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function getUnsupportedDefaultOptions()
private function getPath()
{
if (defined('WEBPCONVERT_IMAGEMAGICK_PATH')) {
return WEBPCONVERT_IMAGEMAGICK_PATH;
return constant('WEBPCONVERT_IMAGEMAGICK_PATH');
}
if (!empty(getenv('WEBPCONVERT_IMAGEMAGICK_PATH'))) {
return getenv('WEBPCONVERT_IMAGEMAGICK_PATH');
Expand Down
4 changes: 2 additions & 2 deletions src/Convert/Converters/Wpc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private function getApiKey()
}
}
if (defined('WEBPCONVERT_WPC_API_KEY')) {
return WEBPCONVERT_WPC_API_KEY;
return constant('WEBPCONVERT_WPC_API_KEY');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_KEY'))) {
return getenv('WEBPCONVERT_WPC_API_KEY');
Expand All @@ -110,7 +110,7 @@ private function getApiUrl()
return $this->options['api-url'];
}
if (defined('WEBPCONVERT_WPC_API_URL')) {
return WEBPCONVERT_WPC_API_URL;
return constant('WEBPCONVERT_WPC_API_URL');
}
if (!empty(getenv('WEBPCONVERT_WPC_API_URL'))) {
return getenv('WEBPCONVERT_WPC_API_URL');
Expand Down

0 comments on commit 6f3e756

Please sign in to comment.