diff --git a/config/set/php85.php b/config/set/php85.php
index 527d229a581..a3125b37f88 100644
--- a/config/set/php85.php
+++ b/config/set/php85.php
@@ -4,6 +4,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php85\Rector\ArrayDimFetch\ArrayFirstLastRector;
+use Rector\Php85\Rector\ClassMethod\NullDebugInfoReturnRector;
 use Rector\Php85\Rector\FuncCall\RemoveFinfoBufferContextArgRector;
 use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector;
 use Rector\Removing\ValueObject\RemoveFuncCallArg;
@@ -14,7 +15,7 @@
 use Rector\Renaming\ValueObject\RenameClassAndConstFetch;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([ArrayFirstLastRector::class, RemoveFinfoBufferContextArgRector::class]);
+    $rectorConfig->rules([ArrayFirstLastRector::class, RemoveFinfoBufferContextArgRector::class, NullDebugInfoReturnRector::class]);
 
     $rectorConfig->ruleWithConfiguration(
         RemoveFuncCallArgRector::class,
diff --git a/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/explicit_null_return.php.inc b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/explicit_null_return.php.inc
new file mode 100644
index 00000000000..ff335572230
--- /dev/null
+++ b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/explicit_null_return.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\Fixture;
+
+final class ExplicitNullReturn
+{
+    public function __debugInfo(): ?array
+    {
+        return null;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\Fixture;
+
+final class ExplicitNullReturn
+{
+    public function __debugInfo(): ?array
+    {
+        return [];
+    }
+}
+
+?>
diff --git a/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/implicit_null_return.php.inc b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/implicit_null_return.php.inc
new file mode 100644
index 00000000000..0046487199b
--- /dev/null
+++ b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/implicit_null_return.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\Fixture;
+
+final class ImplicitNullReturn
+{
+    public function __debugInfo(): ?array
+    {
+        return;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\Fixture;
+
+final class ImplicitNullReturn
+{
+    public function __debugInfo(): ?array
+    {
+        return [];
+    }
+}
+
+?>
diff --git a/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/skip_different_method.php.inc b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/skip_different_method.php.inc
new file mode 100644
index 00000000000..9839326a596
--- /dev/null
+++ b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/Fixture/skip_different_method.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\Fixture;
+
+final class SkipDifferentMethod
+{
+    public function differentMethod()
+    {
+        return null;
+    }
+}
+
+?>
diff --git a/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/NullDebugInfoReturnRectorTest.php b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/NullDebugInfoReturnRectorTest.php
new file mode 100644
index 00000000000..4458581f490
--- /dev/null
+++ b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/NullDebugInfoReturnRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class NullDebugInfoReturnRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/config/configured_rule.php b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/config/configured_rule.php
new file mode 100644
index 00000000000..2f632ba1861
--- /dev/null
+++ b/rules-tests/Php85/Rector/MethodCall/NullDebugInfoReturnRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php85\Rector\ClassMethod\NullDebugInfoReturnRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(NullDebugInfoReturnRector::class);
+};
diff --git a/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php b/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php
new file mode 100644
index 00000000000..65f5dbf88ba
--- /dev/null
+++ b/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Php85\Rector\ClassMethod;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Function_;
+use PhpParser\Node\Stmt\Return_;
+use PhpParser\NodeVisitor;
+use Rector\PhpParser\Node\Value\ValueResolver;
+use Rector\Rector\AbstractRector;
+use Rector\ValueObject\PhpVersionFeature;
+use Rector\VersionBonding\Contract\MinPhpVersionInterface;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_debuginfo_returning_null
+ * @see \Rector\Tests\Php85\Rector\MethodCall\NullDebugInfoReturnRector\NullDebugInfoReturnRectorTest
+ */
+final class NullDebugInfoReturnRector extends AbstractRector implements MinPhpVersionInterface
+{
+    public function __construct(
+        private readonly ValueResolver $valueResolver,
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Replaces `null` return value with empty array in `__debugInfo` methods', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+new class
+{
+    public function __debugInfo() {
+        return null;
+    }
+};
+CODE_SAMPLE
+
+                ,
+                <<<'CODE_SAMPLE'
+new class
+{
+    public function __debugInfo() {
+        return [];
+    }
+};
+CODE_SAMPLE
+            ),
+        ]);
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [ClassMethod::class];
+    }
+
+    /**
+     * @param ClassMethod $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->isName($node, '__debugInfo')) {
+            return null;
+        }
+
+        $hasChanged = \false;
+        $this->traverseNodesWithCallable((array) $node->stmts, function (Node $node) use (&$hasChanged) {
+            if ($node instanceof Class_ || $node instanceof Function_ || $node instanceof Closure) {
+                return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+            }
+
+            if ($node instanceof Return_ && (! $node->expr instanceof Expr || $this->valueResolver->isNull(
+                $node->expr
+            ))) {
+                $hasChanged = \true;
+                $node->expr = new Array_();
+                return $node;
+            }
+
+            return null;
+        });
+
+        if ($hasChanged) {
+            return $node;
+        }
+
+        return null;
+    }
+
+    public function provideMinPhpVersion(): int
+    {
+        return PhpVersionFeature::DEPRECATED_NULL_DEBUG_INFO_RETURN;
+    }
+}
diff --git a/src/ValueObject/PhpVersionFeature.php b/src/ValueObject/PhpVersionFeature.php
index ff83bac1998..dcdbe245a2f 100644
--- a/src/ValueObject/PhpVersionFeature.php
+++ b/src/ValueObject/PhpVersionFeature.php
@@ -768,10 +768,16 @@ final class PhpVersionFeature
      * @var int
      */
     public const ARRAY_ANY = PhpVersion::PHP_84;
-
+    
     /**
      * @see https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_context_parameter_for_finfo_buffer
      * @var int
      */
-    public const DEPRECATE_FINFO_BUFFER_CONTEXT = PhpVersion::PHP_85;
+    public const DEPRECATE_FINFO_BUFFER_CONTEXT = PhpVersion::PHP_85; 
+
+    /**
+     * @see https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_debuginfo_returning_null
+     * @var int
+     */
+    public const DEPRECATED_NULL_DEBUG_INFO_RETURN = PhpVersion::PHP_85;
 }