Merge branch '7.5' into 8.5

sebastianbergmann · sebastianbergmann · commit 7437a4a7d845 · 2021-08-03T08:05:19.000+02:00
diff --git a/src/extending-phpunit.rst b/src/extending-phpunit.rst
@@ -174,10 +174,10 @@ definition to the extension class:
 
         protected $config_value_2 = 0;
 
-        public function __construct(string $value1 = '', int $value2 = 0)
+        public function __construct(string $config_value_1 = '', int $config_value_2 = 0)
         {
-            $this->config_value_1 = $config_1;
-            $this->config_value_2 = $config_2;
+            $this->config_value_1 = $config_value_1;
+            $this->config_value_2 = $config_value_2;
         }
 
         public function executeBeforeFirstTest(): void

Original file line number	Diff line number	Diff line change
`@@ -174,10 +174,10 @@ definition to the extension class:`
`174`	`174`
`175`	`175`	`protected $config_value_2 = 0;`
`176`	`176`
`177`		`- public function __construct(string $value1 = '', int $value2 = 0)`
	`177`	`+ public function __construct(string $config_value_1 = '', int $config_value_2 = 0)`
`178`	`178`	`{`
`179`		`- $this->config_value_1 = $config_1;`
`180`		`- $this->config_value_2 = $config_2;`
	`179`	`+ $this->config_value_1 = $config_value_1;`
	`180`	`+ $this->config_value_2 = $config_value_2;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public function executeBeforeFirstTest(): void`