6.x: rename conflicting underscored methods (#18707)

* rename conflicting underscored methods

* adjust method naming according to feedback

Author: LordSimal

src/Console/ConsoleOutput.php

@@ -221,7 +221,7 @@ public function write(array|string $message, int $newlines = 1): int
             $message = implode(static::LF, $message);
         }
 
-        return $this->_write($this->styleText($message . str_repeat(static::LF, $newlines)));
+        return $this->writeStream($this->styleText($message . str_repeat(static::LF, $newlines)));
     }
 
     /**
@@ -291,7 +291,7 @@ protected function replaceTags(array $matches): string
      * @param string $message Message to write.
      * @return int The number of bytes returned from writing to output.
      */
-    protected function _write(string $message): int
+    protected function writeStream(string $message): int
     {
         if (!isset($this->_output)) {
             return 0;

src/Form/Form.php

@@ -258,12 +258,12 @@ public function execute(array $data, array $options = []): bool
         $options += ['validate' => true];
 
         if ($options['validate'] === false) {
-            return $this->_execute($data);
+            return $this->process($data);
         }
 
         $validator = $options['validate'] === true ? static::DEFAULT_VALIDATOR : $options['validate'];
 
-        return $this->validate($data, $validator) && $this->_execute($data);
+        return $this->validate($data, $validator) && $this->process($data);
     }
 
     /**
@@ -274,7 +274,7 @@ public function execute(array $data, array $options = []): bool
      * @param array $data Form data.
      * @return bool
      */
-    protected function _execute(array $data): bool
+    protected function process(array $data): bool
     {
         return true;
     }

src/Http/Client.php

@@ -500,7 +500,7 @@ public function send(RequestInterface $request, array $options = []): Response
             $requestSent = false;
             if ($response === null) {
                 $requestSent = true;
-                $response = $this->_sendRequest($request, $event->getAdapterOptions());
+                $response = $this->processRequest($request, $event->getAdapterOptions());
             }
 
             /** @var \Cake\Http\Client\ClientEvent $event */
@@ -582,7 +582,7 @@ public static function addMockResponse(string $method, string $url, Response $re
      * @param array<string, mixed> $options Additional options to use.
      * @return \Cake\Http\Client\Response
      */
-    protected function _sendRequest(RequestInterface $request, array $options): Response
+    protected function processRequest(RequestInterface $request, array $options): Response
     {
         $responses = [];
         if (static::$_mockAdapter) {

src/Http/Client/Adapter/Stream.php

@@ -79,7 +79,7 @@ public function send(RequestInterface $request, array $options): array
 
         $this->buildContext($request, $options);
 
-        return $this->_send($request);
+        return $this->processRequest($request);
     }
 
     /**
@@ -238,7 +238,7 @@ protected function buildSslContext(RequestInterface $request, array $options): v
      * @return array Array of populated Response objects
      * @throws \Psr\Http\Client\NetworkExceptionInterface
      */
-    protected function _send(RequestInterface $request): array
+    protected function processRequest(RequestInterface $request): array
     {
         $deadline = false;
         if (isset($this->_contextOptions['timeout']) && $this->_contextOptions['timeout'] > 0) {

src/Http/ServerRequest.php

@@ -511,10 +511,10 @@ public function is(array|string $type, mixed ...$args): bool
             throw new InvalidArgumentException(sprintf('No detector set for type `%s`.', $type));
         }
         if ($args) {
-            return $this->_is($type, $args);
+            return $this->isType($type, $args);
         }
 
-        return $this->_detectorCache[$type] ??= $this->_is($type, $args);
+        return $this->_detectorCache[$type] ??= $this->isType($type, $args);
     }
 
     /**
@@ -534,7 +534,7 @@ public function clearDetectorCache(): void
      * @param array $args Array of custom detector arguments.
      * @return bool Whether the request is the type you are checking.
      */
-    protected function _is(string $type, array $args): bool
+    protected function isType(string $type, array $args): bool
     {
         $detect = static::$_detectors[$type];
         if ($detect instanceof Closure) {

src/I18n/Date.php

@@ -169,7 +169,7 @@ public static function parseDate(string $date, string|int|null $format = null):
             $format = [$format, IntlDateFormatter::NONE];
         }
 
-        return static::_parseDateTime($date, $format);
+        return static::processDateTime($date, $format);
     }
 
     /**

src/I18n/DateFormatTrait.php

@@ -130,7 +130,7 @@ protected function formatObject(
      * @param \DateTimeZone|string|null $tz The timezone for the instance
      * @return static|null
      */
-    protected static function _parseDateTime(
+    protected static function processDateTime(
         string $time,
         array|string $format,
         DateTimeZone|string|null $tz = null,

src/I18n/DateTime.php

@@ -284,7 +284,7 @@ public static function parseDateTime(
         $format ??= static::$_toStringFormat;
         $format = is_int($format) ? [$format, $format] : $format;
 
-        return static::_parseDateTime($time, $format, $tz);
+        return static::processDateTime($time, $format, $tz);
     }
 
     /**

src/I18n/Time.php

@@ -143,7 +143,7 @@ public static function parseTime(string $time, string|int|null $format = null):
             $format = [IntlDateFormatter::NONE, $format];
         }
 
-        return static::_parseDateTime($time, $format);
+        return static::processDateTime($time, $format);
     }
 
     /**

src/Mailer/Transport/SmtpTransport.php

@@ -122,7 +122,7 @@ public function __wakeup(): void
     public function connect(): void
     {
         if (!$this->connected()) {
-            $this->_connect();
+            $this->connectSmtp();
             $this->auth();
         }
     }
@@ -151,7 +151,7 @@ public function disconnect(): void
             return;
         }
 
-        $this->_disconnect();
+        $this->disconnectSmtp();
     }
 
     /**
@@ -196,7 +196,7 @@ public function send(Message $message): array
         $this->checkRecipient($message);
 
         if (!$this->connected()) {
-            $this->_connect();
+            $this->connectSmtp();
             $this->auth();
         } else {
             $this->smtpSend('RSET');
@@ -206,7 +206,7 @@ public function send(Message $message): array
         $this->sendData($message);
 
         if (!$this->_config['keepAlive']) {
-            $this->_disconnect();
+            $this->disconnectSmtp();
         }
 
         /** @var array{headers: string, message: string} */
@@ -286,7 +286,7 @@ protected function parseAuthType(): void
      * @return void
      * @throws \Cake\Network\Exception\SocketException
      */
-    protected function _connect(): void
+    protected function connectSmtp(): void
     {
         $this->generateSocket();
         if (!$this->_socket->connect()) {
@@ -565,7 +565,7 @@ protected function sendData(Message $message): void
      * @return void
      * @throws \Cake\Network\Exception\SocketException
      */
-    protected function _disconnect(): void
+    protected function disconnectSmtp(): void
     {
         $this->smtpSend('QUIT', false);
         $this->_socket->disconnect();