Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/collection/tests/ArrTest.php
#	src/pipeline/composer.json
#	src/pipeline/tests/PipelineTest.php
#	src/support/src/Fluent.php
#	src/support/src/Traits/InteractsWithData.php
#	src/support/tests/FluentTest.php

Author: limingxinleo

composer.json

@@ -17,6 +17,7 @@
     },
     "require": {
         "php": ">=8.2",
+        "hyperf/macroable": "~3.1.0",
         "psr/container": "^1.0 || ^2.0"
     },
     "autoload": {
@@ -37,4 +38,4 @@
             "dev-master": "3.1-dev"
         }
     }
-}
+}

src/Pipeline.php

@@ -13,6 +13,7 @@
 namespace Hyperf\Pipeline;
 
 use Closure;
+use Hyperf\Macroable\Macroable;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -21,6 +22,8 @@
  */
 class Pipeline
 {
+    use Macroable;
+
     /**
      * The object being passed through the pipeline.
      */

tests/PipelineTest.php

@@ -330,6 +330,58 @@ function ($std) {
         }
     }
 
+    public function testPipelineMacro()
+    {
+        Pipeline::macro('customMethod', function ($value) {
+            return 'custom_' . $value;
+        });
+
+        $pipeline = new Pipeline($this->getContainer());
+        $this->assertTrue($pipeline->hasMacro('customMethod'));
+        $this->assertSame('custom_test', $pipeline->customMethod('test'));
+    }
+
+    public function testPipelineMacroWithThis()
+    {
+        Pipeline::macro('getPipes', function () {
+            return $this->pipes;
+        });
+
+        $pipeline = new Pipeline($this->getContainer());
+        $pipeline->through(['pipe1', 'pipe2']);
+
+        $this->assertEquals(['pipe1', 'pipe2'], $pipeline->getPipes());
+    }
+
+    public function testPipelineHasMacro()
+    {
+        Pipeline::macro('existingMacro', function () {
+            return 'exists';
+        });
+
+        $pipeline = new Pipeline($this->getContainer());
+
+        $this->assertTrue($pipeline->hasMacro('existingMacro'));
+        $this->assertFalse($pipeline->hasMacro('nonExistingMacro'));
+    }
+
+    public function testPipelineMacroOverwrite()
+    {
+        Pipeline::macro('testMacro', function () {
+            return 'first';
+        });
+
+        $pipeline = new Pipeline($this->getContainer());
+        $this->assertSame('first', $pipeline->testMacro());
+
+        Pipeline::macro('testMacro', function () {
+            return 'second';
+        });
+
+        $pipeline2 = new Pipeline($this->getContainer());
+        $this->assertSame('second', $pipeline2->testMacro());
+    }
+
     protected function getContainer()
     {
         $container = Mockery::mock(ContainerInterface::class);