diff --git a/src/Colors/Rgb/Colorspace.php b/src/Colors/Rgb/Colorspace.php index a313cec3..60bbc455 100644 --- a/src/Colors/Rgb/Colorspace.php +++ b/src/Colors/Rgb/Colorspace.php @@ -75,7 +75,7 @@ class Colorspace implements ColorspaceInterface // add to each value $values = array_map(function ($value) use ($color, $chroma) { - return $value + ($color->value()->normalize() - $chroma); + return $value + $color->value()->normalize() - $chroma; }, $values); array_push($values, 1); // append alpha channel value diff --git a/src/Drivers/Gd/Modifiers/CropModifier.php b/src/Drivers/Gd/Modifiers/CropModifier.php index aa82fd6e..ab8a54b2 100644 --- a/src/Drivers/Gd/Modifiers/CropModifier.php +++ b/src/Drivers/Gd/Modifiers/CropModifier.php @@ -44,8 +44,8 @@ class CropModifier extends DriverSpecialized implements ModifierInterface $modified = Cloner::cloneEmpty($frame->native(), $resizeTo); // define offset - $offset_x = ($resizeTo->pivot()->x() + $this->offset_x); - $offset_y = ($resizeTo->pivot()->y() + $this->offset_y); + $offset_x = $resizeTo->pivot()->x() + $this->offset_x; + $offset_y = $resizeTo->pivot()->y() + $this->offset_y; // define target width & height $targetWidth = min($resizeTo->width(), $originalSize->width()); diff --git a/src/Drivers/Imagick/Modifiers/PixelateModifier.php b/src/Drivers/Imagick/Modifiers/PixelateModifier.php index 39a73d96..40759897 100644 --- a/src/Drivers/Imagick/Modifiers/PixelateModifier.php +++ b/src/Drivers/Imagick/Modifiers/PixelateModifier.php @@ -28,8 +28,8 @@ class PixelateModifier extends DriverSpecialized implements ModifierInterface $size = $frame->size(); $frame->native()->scaleImage( - (int) round(max(1, ($size->width() / $this->size))), - (int) round(max(1, ($size->height() / $this->size))) + (int) round(max(1, $size->width() / $this->size)), + (int) round(max(1, $size->height() / $this->size)) ); $frame->native()->scaleImage($size->width(), $size->height()); diff --git a/src/Drivers/Imagick/Modifiers/PlaceModifier.php b/src/Drivers/Imagick/Modifiers/PlaceModifier.php index de7357b4..6007693a 100644 --- a/src/Drivers/Imagick/Modifiers/PlaceModifier.php +++ b/src/Drivers/Imagick/Modifiers/PlaceModifier.php @@ -28,7 +28,7 @@ class PlaceModifier extends DriverSpecialized implements ModifierInterface if ($this->opacity < 100) { $watermark->core()->native()->evaluateImage( Imagick::EVALUATE_DIVIDE, - $this->opacity > 0 ? (100 / $this->opacity) : 1000, + $this->opacity > 0 ? 100 / $this->opacity : 1000, Imagick::CHANNEL_ALPHA, ); } diff --git a/src/Geometry/Polygon.php b/src/Geometry/Polygon.php index d537c9fd..6ecb8c9b 100644 --- a/src/Geometry/Polygon.php +++ b/src/Geometry/Polygon.php @@ -207,7 +207,7 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte if ($a->x() === $b->x()) { return 0; } - return ($a->x() < $b->x()) ? -1 : 1; + return $a->x() < $b->x() ? -1 : 1; }); return $points[0]; @@ -229,7 +229,7 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte if ($a->x() === $b->x()) { return 0; } - return ($a->x() > $b->x()) ? -1 : 1; + return $a->x() > $b->x() ? -1 : 1; }); return $points[0]; @@ -251,7 +251,7 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte if ($a->y() === $b->y()) { return 0; } - return ($a->y() > $b->y()) ? -1 : 1; + return $a->y() > $b->y() ? -1 : 1; }); return $points[0]; @@ -273,7 +273,7 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte if ($a->y() === $b->y()) { return 0; } - return ($a->y() < $b->y()) ? -1 : 1; + return $a->y() < $b->y() ? -1 : 1; }); return $points[0]; @@ -303,16 +303,16 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte switch (strtolower($position)) { case 'center': case 'middle': - $diff = ($this->centerPoint()->x() - $this->pivot()->x()); + $diff = $this->centerPoint()->x() - $this->pivot()->x(); break; case 'right': - $diff = ($this->mostRightPoint()->x() - $this->pivot()->x()); + $diff = $this->mostRightPoint()->x() - $this->pivot()->x(); break; default: case 'left': - $diff = ($this->mostLeftPoint()->x() - $this->pivot()->x()); + $diff = $this->mostLeftPoint()->x() - $this->pivot()->x(); break; } @@ -336,16 +336,16 @@ class Polygon implements IteratorAggregate, Countable, ArrayAccess, DrawableInte switch (strtolower($position)) { case 'center': case 'middle': - $diff = ($this->centerPoint()->y() - $this->pivot()->y()); + $diff = $this->centerPoint()->y() - $this->pivot()->y(); break; case 'top': - $diff = ($this->mostTopPoint()->y() - $this->pivot()->y()) - $this->height(); + $diff = $this->mostTopPoint()->y() - $this->pivot()->y() - $this->height(); break; default: case 'bottom': - $diff = ($this->mostBottomPoint()->y() - $this->pivot()->y()) + $this->height(); + $diff = $this->mostBottomPoint()->y() - $this->pivot()->y() + $this->height(); break; } diff --git a/src/Image.php b/src/Image.php index a659b05b..216e44f0 100644 --- a/src/Image.php +++ b/src/Image.php @@ -772,7 +772,7 @@ final class Image implements ImageInterface return $this->modify( new FillModifier( $color, - (is_null($x) || is_null($y)) ? null : new Point($x, $y), + is_null($x) || is_null($y) ? null : new Point($x, $y), ), ); } diff --git a/src/Typography/TextBlock.php b/src/Typography/TextBlock.php index c2eddb7e..3f6857d6 100644 --- a/src/Typography/TextBlock.php +++ b/src/Typography/TextBlock.php @@ -52,7 +52,7 @@ class TextBlock extends Collection if (mb_strlen((string) $a) === mb_strlen((string) $b)) { return 0; } - return (mb_strlen((string) $a) > mb_strlen((string) $b)) ? -1 : 1; + return mb_strlen((string) $a) > mb_strlen((string) $b) ? -1 : 1; }); return $lines[0];