Revert "updating Mailjet code samples for Send API v3.1 (GoogleCloudPlatform#432)" (GoogleCloudPlatform#441)

This reverts commit d2911c6.

Author: bshaffer

appengine/flexible/mailjet/app.php

@@ -40,34 +40,31 @@
     /** @var Mailjet\Client $mailjet */
     $mailjet = $app['mailjet'];
     $recipient = $request->get('recipient');
+
     # [START send_email]
     $body = [
-        'Messages' => [
+        'FromEmail' => "[email protected]",
+        'FromName' => "Testing Mailjet",
+        'Subject' => "Your email flight plan!",
+        'Text-part' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",
+        'Html-part' => "<h3>Dear passenger, welcome to Mailjet!</h3><br/>May the delivery force be with you!",
+        'Recipients' => [
             [
-                'From' => [
-                    'Email' => "[email protected]",
-                    'Name' => "Mailjet Pilot"
-                ],
-                'To' => [
-                    [
-                        'Email' => $recipient
-                    ]
-                ],
-                'Subject' => "Your email flight plan!",
-                'TextPart' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",
-                'HTMLPart' => "<h3>Dear passenger, welcome to Mailjet!</h3><br />May the delivery force be with you!"
+                'Email' => $recipient,
             ]
         ]
     ];
+
     // trigger the API call
-    $response = $mailjet->post(Mailjet\Resources::$Email, ['body' => $body], ['version' => 'v3.1']);
+    $response = $mailjet->post(Mailjet\Resources::$Email, ['body' => $body]);
     if ($response->success()) {
         // if the call succed, data will go here
         return sprintf(
             '<pre>%s</pre>',
             json_encode($response->getData(), JSON_PRETTY_PRINT)
         );
     }
+
     return 'Error: ' . print_r($response->getStatus(), true);
     # [END send_email]
 });

appengine/flexible/mailjet/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "silex/silex": "^1.3",
-        "mailjet/mailjet-apiv3-php": "^1.2",
+        "mailjet/mailjet-apiv3-php": "^1.1",
         "guzzlehttp/guzzle": "~6.1.0"
     },
     "require-dev": {

appengine/standard/mailjet/app.php

@@ -40,34 +40,31 @@
     /** @var Mailjet\Client $mailjet */
     $mailjet = $app['mailjet'];
     $recipient = $request->get('recipient');
+
     # [START send_email]
     $body = [
-        'Messages' => [
+        'FromEmail' => "[email protected]",
+        'FromName' => "Testing Mailjet",
+        'Subject' => "Your email flight plan!",
+        'Text-part' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",
+        'Html-part' => "<h3>Dear passenger, welcome to Mailjet!</h3><br/>May the delivery force be with you!",
+        'Recipients' => [
             [
-                'From' => [
-                    'Email' => "[email protected]",
-                    'Name' => "Mailjet Pilot"
-                ],
-                'To' => [
-                    [
-                        'Email' => $recipient
-                    ]
-                ],
-                'Subject' => "Your email flight plan!",
-                'TextPart' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",
-                'HTMLPart' => "<h3>Dear passenger, welcome to Mailjet!</h3><br />May the delivery force be with you!"
+                'Email' => $recipient,
             ]
         ]
     ];
+
     // trigger the API call
-    $response = $mailjet->post(Mailjet\Resources::$Email, ['body' => $body], ['version' => 'v3.1']);
+    $response = $mailjet->post(Mailjet\Resources::$Email, ['body' => $body]);
     if ($response->success()) {
         // if the call succed, data will go here
         return sprintf(
             '<pre>%s</pre>',
             json_encode($response->getData(), JSON_PRETTY_PRINT)
         );
     }
+
     return 'Error: ' . print_r($response->getStatus(), true);
     # [END send_email]
 });

appengine/standard/mailjet/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "silex/silex": "^1.3",
-        "mailjet/mailjet-apiv3-php": "^1.2",
+        "mailjet/mailjet-apiv3-php": "^1.1",
         "guzzlehttp/guzzle": "~6.1.0"
     },
     "require-dev": {