Merge pull request #5 from tattersoftware/qol

Quality of Life Changes

Author: MGatner

composer.json

@@ -1,5 +1,6 @@
 {
 	"name": "tatter/outbox",
+	"type": "library",
 	"description": "Email toolkit for CodeIgniter 4",
 	"keywords": [
 		"codeigniter",
@@ -19,30 +20,17 @@
 			"role": "Developer"
 		}
 	],
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "https://github.com/codeigniter4/CodeIgniter4"
-		}
-	],
-	"minimum-stability": "dev",
-	"prefer-stable": true,
 	"require": {
-		"php" : ">=7.2",
+		"php": ">=7.2",
+		"components/jquery": "^3.3",
 		"tatter/assets": "^2.2",
 		"tijsverkoyen/css-to-inline-styles": "^2.2",
-		"twbs/bootstrap": "^4.5",
-		"components/jquery": "^3.3"
+		"twbs/bootstrap": "^4.5"
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4": "dev-develop",
-		"codeigniter4/codeigniter4-standard": "^1.0",
-		"fzaninotto/faker": "^1.9@dev",
-		"mikey179/vfsstream": "^1.6",
 		"myth/auth": "dev-develop",
-		"phpstan/phpstan": "^0.12",
-		"phpunit/phpunit": "^8.5",
-		"squizlabs/php_codesniffer": "^3.5"
+		"tatter/tools": "^1.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -54,9 +42,17 @@
 			"Tests\\Support\\": "tests/_support"
 		}
 	},
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/codeigniter4/CodeIgniter4"
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"scripts": {
 		"analyze": "phpstan analyze",
-		"style": "phpcbf --standard=./vendor/codeigniter4/codeigniter4-standard/CodeIgniter4 src/ tests/",
+		"style": "phpcs --standard=./vendor/codeigniter4/codeigniter4-standard/CodeIgniter4 tests/ src/",
 		"test": "phpunit"
 	}
 }

examples/Outbox.php

@@ -19,12 +19,26 @@ class Outbox extends \Tatter\Outbox\Config\Outbox
 	 */
 	public $logging = true;
 
+	/**
+	 * Whether to include routes to the Templates Controller.
+	 *
+	 * @var boolean
+	 */
+	public $routeTemplates = false;
+
+	/**
+	 * Layout to use for template management.
+	 *
+	 * @var string
+	 */
+	public $layout = 'Tatter\Outbox\Views\layout';
+
 	/**
 	 * Default view for email templating.
 	 *
 	 * @var string
 	 */
-	public $template = 'Tatter\Outbox\Views\layout';
+	public $template = 'Tatter\Outbox\Views\template';
 
 	/**
 	 * Default CSS style view to apply to the template.

src/Config/Outbox.php

@@ -11,6 +11,13 @@ class Outbox extends BaseConfig
 	 */
 	public $logging = true;
 
+	/**
+	 * Whether to include routes to the Templates Controller.
+	 *
+	 * @var boolean
+	 */
+	public $routeTemplates = false;
+
 	/**
 	 * Layout to use for template management.
 	 *

src/Config/Routes.php

@@ -0,0 +1,15 @@
+<?php
+
+if (empty(config('Outbox')->routeTemplates))
+{
+	return;
+}
+
+// Routes to Email Templates
+$routes->group('emails', ['namespace' => '\Tatter\Outbox\Controllers'], function ($routes)
+{
+	$routes->get('templates/new/(:segment)', 'Templates::new/$1');
+	$routes->get('templates/send/(:segment)', 'Templates::send/$1');
+	$routes->post('templates/send/(:segment)', 'Templates::send_commit/$1');
+	$routes->presenter('templates', ['controller' => 'Templates']);
+});

src/Entities/Template.php

@@ -29,7 +29,7 @@ public function render($data = [], string $styles = null): string
 		}
 
 		// Replace tokens with $data values
-		$body = service('parser')->setData($data, 'raw')->renderString($this->attributes['body']);
+		$body = service('parser')->setData($data, 'raw')->renderString($this->attributes['body'], ['debug' => false]);
 
 		// If this has a parent Template then render it with this body
 		if ($parent = $this->getParent())

src/Outbox.php

@@ -26,7 +26,7 @@ public static function fromTemplate(Template $template, $data = [], string $styl
 		$email->wordWrap = false;
 
 		// Replace tokens with $data values
-		$email->setSubject(service('parser')->setData($data)->renderString($template->subject));
+		$email->setSubject(service('parser')->setData($data)->renderString($template->subject, ['debug' => false]));
 		$email->setMessage($template->render($data, $styles));
 
 		return $email;
@@ -53,7 +53,7 @@ public static function inline(array $data, string $template = null, string $styl
 	 		$styles = config('Outbox')->styles;
 	 	}
 
-		return (new CssToInlineStyles)->convert(view($template, $data), view($styles));
+		return (new CssToInlineStyles)->convert(view($template, $data, ['debug' => false]), view($styles, [], ['debug' => false]));
 	 }
 
 	/**