Fix PHP 8.4 deprecations nullable objects

.php-cs-fixer.dist.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This document has been generated with
  * https://mlocati.github.io/php-cs-fixer-configurator/#version:3.1.0|configurator
@@ -224,6 +225,8 @@
         'whitespace_after_comma_in_array' => true,
         // Write conditions in Yoda style (`true`), non-Yoda style (`['equal' => false, 'identical' => false, 'less_and_greater' => false]`) or ignore those conditions (`null`) based on configuration.
         'yoda_style' => array('always_move_variable' => false, 'equal' => false, 'identical' => false, 'less_and_greater' => false),
+        // Make type definition of default null also nullable to avoid PHP 8.4 deprecations
+        'nullable_type_declaration_for_default_null_value' => true,
     ))
     ->setFinder(
         PhpCsFixer\Finder::create()

src/Filter/Advanced/Canvas.php

@@ -52,7 +52,7 @@ class Canvas implements FilterInterface
      * @param \Imagine\Image\PointInterface $placement
      * @param \Imagine\Image\Palette\Color\ColorInterface $background
      */
-    public function __construct(ImagineInterface $imagine, BoxInterface $size, PointInterface $placement = null, ColorInterface $background = null)
+    public function __construct(ImagineInterface $imagine, BoxInterface $size, ?PointInterface $placement = null, ?ColorInterface $background = null)
     {
         $this->imagine = $imagine;
         $this->size = $size;

src/Filter/Basic/Rotate.php

@@ -36,7 +36,7 @@ class Rotate implements FilterInterface
      * @param int $angle
      * @param \Imagine\Image\Palette\Color\ColorInterface $background
      */
-    public function __construct($angle, ColorInterface $background = null)
+    public function __construct($angle, ?ColorInterface $background = null)
     {
         $this->angle = $angle;
         $this->background = $background;

src/Filter/Transformation.php

@@ -60,7 +60,7 @@ final class Transformation implements FilterInterface, ManipulatorInterface
      *
      * @param \Imagine\Image\ImageInterface|null $imagine An ImagineInterface instance
      */
-    public function __construct(ImagineInterface $imagine = null)
+    public function __construct(?ImagineInterface $imagine = null)
     {
         $this->imagine = $imagine;
     }
@@ -215,7 +215,7 @@ public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDE
      *
      * @see \Imagine\Image\ManipulatorInterface::rotate()
      */
-    public function rotate($angle, ColorInterface $background = null)
+    public function rotate($angle, ?ColorInterface $background = null)
     {
         return $this->add(new Rotate($angle, $background));
     }

src/Gd/Image.php

@@ -239,7 +239,7 @@ final public function resize(BoxInterface $size, $filter = ImageInterface::FILTE
      *
      * @see \Imagine\Image\ManipulatorInterface::rotate()
      */
-    final public function rotate($angle, ColorInterface $background = null)
+    final public function rotate($angle, ?ColorInterface $background = null)
     {
         if ($background === null) {
             $background = $this->palette->color('fff');

src/Gd/Imagine.php

@@ -55,7 +55,7 @@ public static function getDriverInfo($required = true)
      *
      * @see \Imagine\Image\ImagineInterface::create()
      */
-    public function create(BoxInterface $size, ColorInterface $color = null)
+    public function create(BoxInterface $size, ?ColorInterface $color = null)
     {
         $width = $size->getWidth();
         $height = $size->getHeight();

src/Gmagick/Image.php

@@ -275,7 +275,7 @@ public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDE
      *
      * @see \Imagine\Image\ManipulatorInterface::rotate()
      */
-    public function rotate($angle, ColorInterface $background = null)
+    public function rotate($angle, ?ColorInterface $background = null)
     {
         try {
             if ($background === null) {

src/Gmagick/Imagine.php

@@ -81,7 +81,7 @@ public function open($path)
      *
      * @see \Imagine\Image\ImagineInterface::create()
      */
-    public function create(BoxInterface $size, ColorInterface $color = null)
+    public function create(BoxInterface $size, ?ColorInterface $color = null)
     {
         $width = $size->getWidth();
         $height = $size->getHeight();

src/Image/Box.php

@@ -99,7 +99,7 @@ public function increase($size)
      *
      * @see \Imagine\Image\BoxInterface::contains()
      */
-    public function contains(BoxInterface $box, PointInterface $start = null)
+    public function contains(BoxInterface $box, ?PointInterface $start = null)
     {
         $start = $start ? $start : new Point(0, 0);
 

src/Image/BoxInterface.php

@@ -57,7 +57,7 @@ public function increase($size);
      *
      * @return bool
      */
-    public function contains(BoxInterface $box, PointInterface $start = null);
+    public function contains(BoxInterface $box, ?PointInterface $start = null);
 
     /**
      * Gets current box square, useful for getting total number of pixels in a

src/Image/ImagineInterface.php

@@ -33,7 +33,7 @@ interface ImagineInterface extends ClassFactoryAwareInterface
      *
      * @return \Imagine\Image\ImageInterface
      */
-    public function create(BoxInterface $size, ColorInterface $color = null);
+    public function create(BoxInterface $size, ?ColorInterface $color = null);
 
     /**
      * Opens an existing image from $path.

src/Image/ManipulatorInterface.php

@@ -94,7 +94,7 @@ public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDE
      *
      * @return $this
      */
-    public function rotate($angle, ColorInterface $background = null);
+    public function rotate($angle, ?ColorInterface $background = null);
 
     /**
      * Pastes an image into a parent image

src/Imagick/Image.php

@@ -305,7 +305,7 @@ public function resize(BoxInterface $size, $filter = ImageInterface::FILTER_UNDE
      *
      * @see \Imagine\Image\ManipulatorInterface::rotate()
      */
-    public function rotate($angle, ColorInterface $background = null)
+    public function rotate($angle, ?ColorInterface $background = null)
     {
         if ($background === null) {
             $background = $this->palette->color('fff');

src/Imagick/Imagine.php

@@ -88,7 +88,7 @@ public function open($path)
      *
      * @see \Imagine\Image\ImagineInterface::create()
      */
-    public function create(BoxInterface $size, ColorInterface $color = null)
+    public function create(BoxInterface $size, ?ColorInterface $color = null)
     {
         $width = $size->getWidth();
         $height = $size->getHeight();

tests/tests/Constraint/IsImageEqual.php

@@ -59,7 +59,7 @@ class IsImageEqual extends Constraint
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($expected, $delta = 0.1, ImagineInterface $imagine = null, $buckets = 4)
+    public function __construct($expected, $delta = 0.1, ?ImagineInterface $imagine = null, $buckets = 4)
     {
         parent::__construct();
         $this->imagine = $imagine;

tests/tests/Filter/Advanced/CanvasTest.php

@@ -30,7 +30,7 @@ class CanvasTest extends FilterTestCase
      * @param PointInterface $placement
      * @param ColorInterface $background
      */
-    public function testShouldCanvasImageAndReturnResult(BoxInterface $size, PointInterface $placement = null, ColorInterface $background = null)
+    public function testShouldCanvasImageAndReturnResult(BoxInterface $size, ?PointInterface $placement = null, ?ColorInterface $background = null)
     {
         $placement = $placement ?: new Point(0, 0);
         $image = $this->getImage();

tests/tests/Image/Fill/Gradient/HorizontalTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Imagine package.
  *

tests/tests/Image/Fill/Gradient/VerticalTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Imagine package.
  *

tests/tests/ImagineTestCaseBase.php

@@ -37,7 +37,7 @@ abstract class ImagineTestCaseBase extends \PHPUnit\Framework\TestCase
      * @param \Imagine\Image\ImagineInterface|null $imagine
      * @param int $buckets
      */
-    public static function assertImageEquals($expected, $actual, $message = '', $delta = 0.1, ImagineInterface $imagine = null, $buckets = 4)
+    public static function assertImageEquals($expected, $actual, $message = '', $delta = 0.1, ?ImagineInterface $imagine = null, $buckets = 4)
     {
         $constraint = new IsImageEqual($expected, $delta, $imagine, $buckets);