Attempt to fix png conversion on Heroku by prepending xml tag (#160)

* refactor: Minor formatting adjustments

* fix: prepend xml tag when converting svg

Author: DenverCoder1

src/card.php

@@ -1,4 +1,6 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Convert date from Y-M-D to more human-readable format
@@ -295,7 +297,8 @@ function generateErrorCard(string $message, array $params = null): string
  *
  * @param string $svg The SVG for the card to display
  */
-function echoAsSvg(string $svg): void {
+function echoAsSvg(string $svg): void
+{
     // set content type to SVG image
     header("Content-Type: image/svg+xml");
 
@@ -310,10 +313,11 @@ function echoAsSvg(string $svg): void {
  *
  * @throws ImagickException
  */
-function echoAsPng(string $svg): void {
+function echoAsPng(string $svg): void
+{
     // trim off all whitespaces to make it a valid SVG string
     $svg = trim($svg);
-
+    
     // remove style and animations
     $svg = preg_replace('/(<style>\X*<\/style>)/m', '', $svg);
     $svg = preg_replace('/(opacity: 0;)/m', 'opacity: 1;', $svg);
@@ -325,7 +329,7 @@ function echoAsPng(string $svg): void {
     $imagick->setBackgroundColor(new ImagickPixel('transparent'));
 
     // add svg image
-    $imagick->readImageBlob($svg);
+    $imagick->readImageBlob('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $svg);
     $imagick->setImageFormat('png');
 
     // echo PNG data

src/demo/preview.php

@@ -1,4 +1,6 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
 
 require_once "../card.php";
 

src/index.php

@@ -1,4 +1,6 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
 
 
 // load functions
@@ -15,9 +17,9 @@
 
 // if environment variables are not loaded, display error
 if (!$_SERVER["TOKEN"] || !$_SERVER["USERNAME"]) {
-    $message = file_exists(dirname(__DIR__.'.env',1))
-    ? "Missing token or username in config. Check Contributing.md for details."
-    : ".env was not found. Check Contributing.md for details.";
+    $message = file_exists(dirname(__DIR__ . '.env', 1))
+        ? "Missing token or username in config. Check Contributing.md for details."
+        : ".env was not found. Check Contributing.md for details.";
 
     $card = generateErrorCard($message);
     if ($requestedType === "png") {

src/stats.php

@@ -1,4 +1,6 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * Get all HTTP request responses for user's contributions

tests/OptionsTest.php

@@ -1,4 +1,7 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 // load functions
@@ -56,7 +59,7 @@ public function testThemesHaveValidParameters(): void
         foreach ($themes as $theme => $colors) {
             // check that there are no extra keys in the theme
             $this->assertEquals(
-                array_diff_key($colors, $this->defaultTheme), 
+                array_diff_key($colors, $this->defaultTheme),
                 array(),
                 "The theme '$theme' contains invalid parameters."
             );

tests/RenderTest.php

@@ -1,4 +1,7 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 // load functions

tests/StatsTest.php

@@ -1,8 +1,11 @@
-<?php declare (strict_types = 1);
+<?php
+
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 // load functions
-require_once dirname(__DIR__, 1).'/vendor/autoload.php';
+require_once dirname(__DIR__, 1) . '/vendor/autoload.php';
 require_once "src/stats.php";
 
 // load .env
@@ -13,8 +16,8 @@
 // if environment variables are not loaded, display error
 if (!$_SERVER["TOKEN"] || !$_SERVER["USERNAME"]) {
     $message = file_exists(dirname(__DIR__ . '.env', 1))
-    ? "Missing token or username in config. Check Contributing.md for details."
-    : ".env was not found. Check Contributing.md for details.";
+        ? "Missing token or username in config. Check Contributing.md for details."
+        : ".env was not found. Check Contributing.md for details.";
 
     die($message);
 }