Feature/removed deprecation

README.md

@@ -4,6 +4,8 @@
 
 # SparkPost PHP Library
 
+## This fork is maintained internally due to inactivity in the upstream repository. Only used within Lightfoot projects.
+
 [![Travis CI](https://travis-ci.org/SparkPost/php-sparkpost.svg?branch=master)](https://travis-ci.org/SparkPost/php-sparkpost)
 [![Coverage Status](https://coveralls.io/repos/SparkPost/php-sparkpost/badge.svg?branch=master&service=github)](https://coveralls.io/github/SparkPost/php-sparkpost?branch=master)
 [![Downloads](https://img.shields.io/packagist/dt/sparkpost/sparkpost.svg?maxAge=3600)](https://packagist.org/packages/sparkpost/sparkpost)

composer.json

@@ -8,24 +8,33 @@
     }
   ],
   "minimum-stability": "stable",
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  },
   "scripts": {
     "test": "XDEBUG_MODE=coverage ./vendor/bin/phpunit",
     "fix-style": "php-cs-fixer fix ."
   },
   "require": {
-    "php": "^7.1 || ^8.0",
+    "php": "^7.4 || ^8.0",
     "php-http/httplug": "^1.0 || ^2.0",
+    "psr/http-factory": "^1.0",
+    "nyholm/psr7": "^1.0",
     "php-http/message": "^1.0",
     "php-http/client-implementation": "^1.0",
-    "php-http/discovery": "^1.0"
+    "php-http/discovery": "^1.0",
+      "ext-json": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0 || ^9.0",
-    "php-http/guzzle6-adapter": "^1.0",
+    "rector/rector": "^1.0",
+    "php-http/guzzle7-adapter": "^1.0",
     "mockery/mockery": "^1.3",
     "nyholm/nsa": "^1.0",
     "php-coveralls/php-coveralls": "^2.4",
-    "friendsofphp/php-cs-fixer": "^2.18"
+    "friendsofphp/php-cs-fixer": "^3.9"
   },
   "autoload": {
     "psr-4": {

examples/bootstrap.php

@@ -1,3 +1,3 @@
 <?php
 
-require_once dirname(__FILE__).'/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';

examples/debug/index.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -30,13 +30,13 @@
     print_r($response->getRequest());
 
     echo "Response:\n";
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
     echo "Request:\n";
     print_r($e->getRequest());
 
     echo "Exception:\n";
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/message-events/get_message_events.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -20,9 +20,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/message-events/get_message_events_with_retry_logic.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -23,11 +23,11 @@
  */
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 
     if ($e->getCode() >= 500 && $e->getCode() <= 599) {
         echo "Wow, this failed epically";

examples/templates/create_template.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -22,16 +22,16 @@
 // Valid short template content examples
 $plain_text = 'Write your text message part here.';
 
-$html = <<<HTML
+$html = <<<HTML_WRAP
 <!DOCTYPE html>
 <html lang="en">
 <body>
   <p><strong>Write your HTML message part here</strong></p>
 </body>
 </html>
-HTML;
+HTML_WRAP;
 
-$amp_html = <<<HTML
+$amp_html = <<<HTML_WRAP
 <!doctype html>
 <html ⚡4email>
 <head>
@@ -43,25 +43,25 @@
 Hello World! Let's get started using AMP HTML together!
 </body>
 </html>
-HTML;
+HTML_WRAP;
 
 $promise = $sparky->request('POST', 'templates', [
-  'name' => $template_name,
-  'id' => $template_id,
-  'content' => [
-    'from' => "from@$sending_domain",
-    'subject' => 'Your Subject',
-    'text' => $plain_text,
-    'html' => $html,
-    'amp_html' => $amp_html,
-  ],
+    'name' => $template_name,
+    'id' => $template_id,
+    'content' => [
+        'from' => "from@$sending_domain",
+        'subject' => 'Your Subject',
+        'text' => $plain_text,
+        'html' => $html,
+        'amp_html' => $amp_html,
+    ],
 ]);
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/templates/delete_template.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -19,9 +19,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/templates/get_all_templates.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -17,9 +17,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/templates/get_template.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -19,9 +19,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/templates/preview_template.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -23,9 +23,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/templates/update_template.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Templates;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -23,9 +23,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/transmissions/create_transmission.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Transmissions;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -40,9 +40,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/transmissions/create_transmission_with_attachment.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Transmissions;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -13,10 +13,10 @@
 // In these examples, fetch API key from environment variable
 $sparky = new SparkPost($httpClient, ["key" => getenv('SPARKPOST_API_KEY')]);
 
-$filePath = dirname(__FILE__).'/';
+$filePath = __DIR__ . '/';
 $fileName = 'sparkpost.png';
-$fileType = mime_content_type($filePath.$fileName);
-$fileData = base64_encode(file_get_contents($filePath.$fileName));
+$fileType = mime_content_type($filePath . $fileName);
+$fileData = base64_encode(file_get_contents($filePath . $fileName));
 
 // put your own sending domain and test recipient address here
 $sending_domain = "steve2-test.trymsys.net";
@@ -52,9 +52,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }

examples/transmissions/create_transmission_with_cc_and_bcc.php

@@ -2,7 +2,7 @@
 
 namespace Examples\Transmissions;
 
-require dirname(__FILE__).'/../bootstrap.php';
+require __DIR__ . '/../bootstrap.php';
 
 use SparkPost\SparkPost;
 use GuzzleHttp\Client;
@@ -58,9 +58,9 @@
 
 try {
     $response = $promise->wait();
-    echo $response->getStatusCode()."\n";
-    print_r($response->getBody())."\n";
+    echo $response->getStatusCode() . "\n";
+    print_r($response->getBody()) . "\n";
 } catch (\Exception $e) {
-    echo $e->getCode()."\n";
-    echo $e->getMessage()."\n";
+    echo $e->getCode() . "\n";
+    echo $e->getMessage() . "\n";
 }