merge conflicts

src/Drivers/Concerns/ValidatesArguments.php

@@ -6,7 +6,7 @@
 
 trait ValidatesArguments
 {
-    protected function ensureNumberBetween(int $value, int $min, int $max, string $label): void
+    protected function ensureNumberBetween(int|float $value, int|float $min, int|float $max, string $label): void
     {
         if ($value < $min || $value > $max) {
             throw InvalidManipulation::valueNotInRange($label, $value, $min, $max);

src/Drivers/GdImageDriver.php

@@ -245,4 +245,22 @@ public function resizeCanvas(
 
         return $this;
     }
+
+    public function gamma(float $gamma): ImageDriver
+    {
+        $this->ensureNumberBetween($gamma, 0.1, 9.99, 'gamma');
+
+        imagegammacorrect($this->image, 1, $gamma);
+
+        return $this;
+    }
+
+    public function contrast(float $level): ImageDriver
+    {
+        $this->ensureNumberBetween($level, -100, 100, 'contrast');
+
+        imagefilter($this->image, IMG_FILTER_CONTRAST, ($level * -1));
+
+        return $this;
+    }
 }

src/Drivers/ImagickImageDriver.php

@@ -195,4 +195,22 @@ public function getSize(): Size
     {
         return new Size($this->getWidth(), $this->getHeight());
     }
+
+    public function gamma(float $gamma): ImageDriver
+    {
+        $this->ensureNumberBetween($gamma, 0.1, 9.99, 'gamma');
+
+        $this->image->gammaImage($gamma);
+
+        return $this;
+    }
+
+    public function contrast(float $level): ImageDriver
+    {
+        $this->ensureNumberBetween($level, -100, 100, 'contrast');
+
+        $this->image->brightnessContrastImage(1, $level);
+
+        return $this;
+    }
 }

tests/Manipulations/ContrastTest.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Spatie\Image\Test\Manipulations;
+
+use Spatie\Image\Drivers\ImageDriver;
+use Spatie\Image\Exceptions\InvalidManipulation;
+
+it('can change the contrast of an image', function (ImageDriver $driver) {
+    $targetFile = $this->tempDir->path("{$driver->driverName()}/contrast.jpg");
+
+    $driver->load(getTestPhoto())->contrast(30)->save($targetFile);
+
+    expect($targetFile)->toBeFile();
+})->with('drivers');
+
+it('will throw an exception when passing an invalid contrast value', function (ImageDriver $driver) {
+    $driver->load(getTestPhoto())->brightness(101);
+})->with('drivers')->throws(InvalidManipulation::class);

tests/Manipulations/GammaTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spatie\Image\Test\Manipulations;
+
+use Spatie\Image\Drivers\ImageDriver;
+
+it('can apply gamma to an image', function (ImageDriver $driver) {
+    $targetFile = $this->tempDir->path("{$driver->driverName()}/gamma.jpg");
+
+    $driver->load(getTestJpg())->gamma(4.8)->save($targetFile);
+
+    expect($targetFile)->toBeFile();
+})->with('drivers');

tests/Pest.php

@@ -21,6 +21,11 @@ function getTestJpg(): string
     return getTestFile('test.jpg');
 }
 
+function getTestPhoto(): string
+{
+    return getTestFile('test-photo.jpg');
+}
+
 function getTestFile($fileName): string
 {
     return getTestSupportPath('testFiles/'.$fileName);