<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5446] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Restore Slack notifications for i18n imports.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/5446">5446</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/5446","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-30 16:20:16 +0000 (Sun, 30 Apr 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Restore Slack notifications for i18n imports.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybinimportplugintoglotpressphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclasscodeimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclientsclassslackphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-slack.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybinimportplugintoglotpressphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php 2017-04-30 16:03:05 UTC (rev 5445)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php 2017-04-30 16:20:16 UTC (rev 5446)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Plugin_Directory;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Exception;
+use WordPressdotorg\Plugin_Directory\Clients\Slack;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // This script should only be called in a CLI environment.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'cli' != php_sapi_name() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:', 'tag:', 'type:' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:', 'tag:', 'type:', 'no-slack' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Guess the default parameters:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $opts ) && $argc == 2 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +32,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $opts['type'], [ 'code', 'readme' ] ) ) {
+ fwrite( STDERR, "Invalid value for type argument: {$opts['type']}\n" );
+ die();
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bootstrap WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTP_HOST'] = parse_url( $opts['url'], PHP_URL_HOST );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = parse_url( $opts['url'], PHP_URL_PATH );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,6 +57,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $opts['type'];
</span><span class="cx" style="display: block; padding: 0 10px"> $start_time = microtime( 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$plugin = Plugin_Directory::get_plugin_post( $plugin_slug );
+if ( ! $plugin ) {
+ fwrite( STDERR, "[{$plugin_slug}] Plugin I18N Import Failed: Plugin doesn't exist.\n" );
+ exit( 1 );
+}
+
+// Prepare Slack notification.
+$send_slack = defined( 'PLUGIN_IMPORTS_SLACK_WEBHOOK' ) && ! isset( $opts['no-slack'] );
+if ( $send_slack ) {
+ $slack_client = new Slack( PLUGIN_IMPORTS_SLACK_WEBHOOK );
+ $slack_client->add_attachment( 'ts', time() );
+ $slack_client->add_attachment( 'fallback', "{$plugin->post_title} has been imported." );
+ $slack_client->add_attachment( 'title', "{$plugin->post_title} has been imported" );
+ $slack_client->add_attachment( 'title_link', "https://translate.wordpress.org/projects/wp-plugins/{$plugin_slug}" );
+ $fields = [
+ [
+ 'title' => 'Type',
+ 'value' => ( 'readme' === $type ) ? 'Readme' : 'Code',
+ 'short' => true,
+ ],
+ [
+ 'title' => 'Version',
+ 'value' => $tag,
+ 'short' => true,
+ ],
+ ];
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "Processing I18N Import for $plugin_slug...\n";
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'readme' === $type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,10 +95,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $importer->import_from_tag( $tag );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "OK. Took " . round( microtime(1) - $start_time, 2 ) . "s\n";
-} catch( \Exception $e ) {
- echo "Failed. Took " . round( microtime(1) - $start_time, 2 ) . "s\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $runtime = round( microtime( 1 ) - $start_time, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send Slack notification.
+ if ( $send_slack ) {
+ $fields[] = [
+ 'title' => 'Status',
+ 'value' => sprintf( '%s Successfully imported! (%ss)', $slack_client->get_success_emoji(), $runtime ),
+ 'short' => false,
+ ];
+ $fields[] = [
+ 'title' => 'Plugin',
+ 'value' => sprintf(
+ '<%1$s|%2$s> | <https://plugins.trac.wordpress.org/log/%3$s|Log> | <%4$s|SVN>',
+ get_permalink( $plugin ),
+ $plugin->post_title,
+ $plugin_slug,
+ $importer->get_plugin_svn_url( $tag )
+ ),
+ 'short' => false,
+ ];
+ $slack_client->add_attachment( 'fields', $fields );
+ $slack_client->set_status( 'success' );
+ $slack_client->send( '#meta-language-packs' );
+ }
+
+ echo "OK. Took {$runtime}s\n";
+} catch ( Exception $e ) {
+ $runtime = round( microtime( 1 ) - $start_time, 2 );
+
+ // Send Slack notification.
+ if ( $send_slack ) {
+ $fields[] = [
+ 'title' => 'Status',
+ 'value' => sprintf( '%s %s (%ss)', $slack_client->get_failure_emoji(), $e->getMessage(), $runtime ),
+ 'short' => false,
+ ];
+ $fields[] = [
+ 'title' => 'Plugin',
+ 'value' => sprintf(
+ '<%1$s|%2$s> | <https://plugins.trac.wordpress.org/log/%3$s|Log> | <%4$s|SVN>',
+ get_permalink( $plugin ),
+ $plugin->post_title,
+ $plugin_slug,
+ $importer->get_plugin_svn_url( $tag )
+ ),
+ 'short' => false,
+ ];
+ $slack_client->add_attachment( 'fields', $fields );
+ $slack_client->set_status( 'failure' );
+ $slack_client->send( '#meta-language-packs' );
+ }
+
+ echo "Failed. Took {$runtime}s\n";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( STDERR, "[{$plugin_slug}] Plugin I18N Import Failed: " . $e->getMessage() . "\n" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- exit(1);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ exit( 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclii18nclasscodeimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php 2017-04-30 16:03:05 UTC (rev 5445)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php 2017-04-30 16:20:16 UTC (rev 5446)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pot_file = "{$tmp_directory}/{$this->plugin}-code.pot";
</span><span class="cx" style="display: block; padding: 0 10px"> $makepot = new \MakePOT;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( "POT file couldn't be created." );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclientsclassslackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-slack.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-slack.php 2017-04-30 16:03:05 UTC (rev 5445)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-slack.php 2017-04-30 16:20:16 UTC (rev 5446)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,16 +20,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $attachment = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $attachment = [];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Holds the text property.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $text = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $text = [];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Holds Emoji codes for success.
+ *
+ * @var array
+ */
+ private $success_emoji = [
+ ':green_heart:', ':white_check_mark:', ':smiley:', ':ok: ',
+ ];
+
+ /**
+ * Holds Emoji codes for failure.
+ *
+ * @var array
+ */
+ private $failure_emoji = [
+ ':broken_heart:', ':umbrella_with_rain_drops:', ':cry:', ':sos:',
+ ];
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $webhook Slack webhook.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://api.slack.com/docs/attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key Key of the attachment property.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $value Value of the attachment property.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $value Value of the attachment property.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_attachment( $key, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->attachment[ $key ] = $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,6 +115,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns a random emoji for a failure message.
+ *
+ * @return string Emoji code.
+ */
+ public function get_failure_emoji() {
+ $index = array_rand( $this->failure_emoji, 1 );
+ return $this->failure_emoji[ $index ];
+ }
+
+ /**
+ * Returns a random emoji for a success message.
+ *
+ * @return string Emoji code.
+ */
+ public function get_success_emoji() {
+ $index = array_rand( $this->success_emoji, 1 );
+ return $this->success_emoji[ $index ];
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Publishes a Slack notifcation to a channel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $channel The channel to publish the notification to.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,30 +142,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function send( $channel ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = $this->get_text();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $text ) ) {
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $text ) ) {
+ $this->add_attachment( 'text', $text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->add_attachment( 'text', $text );
- $this->add_attachment( 'mrkdwn_in', array( 'text' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->add_attachment( 'mrkdwn_in', [ 'text', 'fields' ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $payload = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $payload = [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'icon_emoji' => ':wordpress:',
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => 'Plugin Imports',
</span><span class="cx" style="display: block; padding: 0 10px"> 'channel' => $channel,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachments' => $this->get_attachments(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = json_encode( $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = http_build_query( compact( 'payload' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $context = stream_context_create( array(
- 'http' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $context = stream_context_create( [
+ 'http' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'method' => 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'header' => 'Content-Type: application/x-www-form-urlencoded' . PHP_EOL,
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => $content,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flush();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Resets internal data variables.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function flush() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->text = array();
- $this->attachment = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->text = [];
+ $this->attachment = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>