fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 08:41:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Replce array_first_key() with array_key_first(), etc.

Browse source
This commit is contained in:
Kijin Sung 2025-07-12 12:24:20 +09:00
parent 1c92b1baf5
commit 4193edde25
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/Mail.php
View file

@ -585,7 +585,7 @@ class Mail
// Reset Message-ID in case send() is called multiple times.
$random = substr(hash('sha256', mt_rand() . microtime() . getmypid()), 0, 32);
$sender = $this->message->getFrom();
$sender_email = strval(array_first_key($sender));
$sender_email = strval(array_key_first($sender));
$id = $random . '@' . (preg_match('/^(.+)@([^@]+)$/', $sender_email, $matches) ? $matches[2] : 'swift.generated');
$this->message->getHeaders()->get('Message-ID')->setId($id);

2
common/framework/Password.php
View file

@ -112,7 +112,7 @@ class Password
{
unset($algos['argon2id']);
}
return array_first_key($algos);
return array_key_first($algos);
}
/**

2
common/framework/Router.php
View file

@ -608,7 +608,7 @@ class Router
return false;
}
arsort($reordered_routes);
$best_route = array_first_key($reordered_routes);
$best_route = array_key_first($reordered_routes);
return $best_route;
}
}

8
common/framework/drivers/mail/brevo.php
View file

@ -69,7 +69,7 @@ class Brevo extends Base implements \Rhymix\Framework\Drivers\MailInterface
$from = $message->message->getFrom();
$to = $message->message->getTo();
$data = [
'sender' => ['email' => array_first_key($from), 'name' => array_first($from)],
'sender' => ['email' => array_key_first($from), 'name' => array_first($from)],
'to' => array_map($format_callback, array_keys($to), array_values($to)),
'subject' => $message->message->getSubject(),
'htmlContent' => $message->message->getBody(),
@ -84,7 +84,7 @@ class Brevo extends Base implements \Rhymix\Framework\Drivers\MailInterface
}
if ($reply_to = $message->message->getReplyTo())
{
$data['replyTo'] = ['email' => array_first_key($reply_to)];
$data['replyTo'] = ['email' => array_key_first($reply_to)];
}
foreach ($message->getAttachments() as $attachment)
{
@ -93,7 +93,7 @@ class Brevo extends Base implements \Rhymix\Framework\Drivers\MailInterface
'name' => $attachment->display_filename ?: $attachment->cid,
];
}
// Prepare headers and options for Requests.
$headers = [
'api-key' => $this->_config['api_key'],
@ -103,7 +103,7 @@ class Brevo extends Base implements \Rhymix\Framework\Drivers\MailInterface
$options = [
'timeout' => 8,
];
// Send the API request.
$request = \Rhymix\Framework\HTTP::post(self::$_url, $data, $headers, [], $options);
$status_code = $request->getStatusCode();

4
common/framework/drivers/mail/sendgrid.php
View file

@ -108,7 +108,7 @@ class SendGrid extends Base implements \Rhymix\Framework\Drivers\MailInterface
$from = $message->message->getFrom();
if ($from)
{
$data['from']['email'] = array_first_key($from);
$data['from']['email'] = array_key_first($from);
if (array_first($from))
{
$data['from']['name'] = array_first($from);
@ -119,7 +119,7 @@ class SendGrid extends Base implements \Rhymix\Framework\Drivers\MailInterface
$replyTo = $message->message->getReplyTo();
if ($replyTo)
{
$data['reply_to']['email'] = array_first_key($from);
$data['reply_to']['email'] = array_key_first($from);
}
// Set the subject.

2
modules/admin/tpl/config_notification.html
View file

@ -220,7 +220,7 @@
{@ $conf_exists = config("sms.$driver_name.api_key")}
<select type="select" name="sms_{$driver_name}_{$conf_name}" id="sms_{$driver_name}_{$conf_name}">
<!--@foreach($driver_definition['api_urls'] as $api_url => $api_url_name)-->
<option value="{$api_url}" selected="selected"|cond="$conf_value === $api_url || (!$conf_value && $conf_exists && $api_url === array_last_key($driver_definition['api_urls']))">{$api_url_name}</option>
<option value="{$api_url}" selected="selected"|cond="$conf_value === $api_url || (!$conf_value && $conf_exists && $api_url === array_key_last($driver_definition['api_urls']))">{$api_url_name}</option>
<!--@endforeach-->
</select>
</div>

4
modules/advanced_mailer/advanced_mailer.controller.php
View file

@ -18,7 +18,7 @@ class Advanced_MailerController extends Advanced_Mailer
$recipients = $mail->message->getTo() ?: array();
if ($recipients)
{
$first_recipient = array_first_key($recipients);
$first_recipient = array_key_first($recipients);
if ($exception_driver = $this->getSendingMethodForEmailAddress($first_recipient, $config))
{
$driver_class = '\\Rhymix\\Framework\\Drivers\Mail\\' . $exception_driver;
@ -51,7 +51,7 @@ class Advanced_MailerController extends Advanced_Mailer
else
{
$sender = $mail->message->getFrom();
$original_sender_email = $sender ? array_first_key($sender) : null;
$original_sender_email = $sender ? array_key_first($sender) : null;
$original_sender_name = $sender ? array_first($sender) : null;
list($default_from, $default_name) = $this->getDefaultEmailIdentity();
if ($original_sender_email !== $default_from && $default_from)