Merge pull request #1 from tattersoftware/develop

MGatner · web-flow · commit 6f081617bc4b · 2019-07-02T11:29:58.000-04:00
Merge for release
diff --git a/bin/Alerts.php b/bin/Alerts.php
@@ -2,16 +2,14 @@
 
 /***
 *
-* This file contains example values to override or augment default library behavior.
+* This file contains example values to change the default library behavior.
 * Recommended usage:
 *	1. Copy the file to app/Config/Alerts.php
 *	2. Set any override variables
-*	3. Remove any lines to fallback to defaults
+*	3. Remove any lines to fallback to library defaults
 *
 ***/
 
-use CodeIgniter\Config\BaseConfig;
-
 class Alerts extends \Tatter\Alerts\Config\Alerts
 {
 	// prefix for SESSION variables and HTML classes, to prevent collision
diff --git a/src/Alerts.php b/src/Alerts.php
@@ -1,8 +1,8 @@
 <?php namespace Tatter\Alerts;
 
 /***
-* Name: Alerts
-* Author: Matthew Gatner
+* Name:    Alerts
+* Author:  Matthew Gatner
 * Contact: mgatner@tattersoftware.com
 * Created: 2019-02-13
 *
@@ -17,8 +17,8 @@
 * 	Use Config/Alerts.php to override default behavior
 *
 * @package CodeIgniter4-Alerts
-* @author Matthew Gatner
-* @link https://github.com/tattersoftware/codeigniter4-alerts
+* @author  Matthew Gatner
+* @link    https://github.com/tattersoftware/codeigniter4-alerts
 *
 ***/
 
@@ -116,6 +116,6 @@ public function display()
 	// should be injected into <head>
 	public function css()
 	{
-		return $this->view->setVar('prefix', $this->config->prefix)->render("Tatter\Alerts\Views\css");
+		return $this->view->setVar('prefix', $this->config->prefix)->render('Tatter\Alerts\Views\css');
 	}	
 }
diff --git a/src/Config/Services.php b/src/Config/Services.php
@@ -11,14 +11,10 @@ public static function alerts(BaseConfig $config = null, RendererInterface $view
 			return static::getSharedInstance('alerts', $config, $view);
 		endif;
 
-		// prioritizes user config in app/Config if found
-		if (empty($config)):
-			if (class_exists('\Config\Alerts')):
-				$config = new \Config\Alerts();
-			else:
-				$config = new \Tatter\Alerts\Config\Alerts();
-			endif;
-		endif;
+		// If no config was injected then load one
+		// Prioritizes app/Config if found
+		if (empty($config))
+			$config = config('Alerts');
 
 		return new \Tatter\Alerts\Alerts($config, $view);
 	}
diff --git a/src/Exceptions/AlertsException.php b/src/Exceptions/AlertsException.php
@@ -7,10 +7,10 @@ class AlertsException extends FrameworkException implements ExceptionInterface
 {
 	public static function forInvalidTemplate(string $template = null)
 	{
-		return new static("'{$template}' is not a valid Alerts template.");
+		return new static(lang('Alerts.invalidTemplate', [$template]));
 	}
 	public static function forMissingTemplateView(string $template = null)
 	{
-		return new static("Could not find template view file: '{$template}'.");
+		return new static(lang('Alerts.missingTemplateView', [$template]));
 	}
 }
diff --git a/src/Language/en/Alerts.php b/src/Language/en/Alerts.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+	'invalidTemplate'      => '"{0}" is not a valid Alerts template.',
+	'missingTemplateView'  => 'Could not find template view file: "{0}".',
+];

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,14 @@`
`2`	`2`
`3`	`3`	`/***`
`4`	`4`	`*`
`5`		`-* This file contains example values to override or augment default library behavior.`
	`5`	`+* This file contains example values to change the default library behavior.`
`6`	`6`	`* Recommended usage:`
`7`	`7`	`* 1. Copy the file to app/Config/Alerts.php`
`8`	`8`	`* 2. Set any override variables`
`9`		`-* 3. Remove any lines to fallback to defaults`
	`9`	`+* 3. Remove any lines to fallback to library defaults`
`10`	`10`	`*`
`11`	`11`	`***/`
`12`	`12`
`13`		`-use CodeIgniter\Config\BaseConfig;`
`14`		`-`
`15`	`13`	`class Alerts extends \Tatter\Alerts\Config\Alerts`
`16`	`14`	`{`
`17`	`15`	`// prefix for SESSION variables and HTML classes, to prevent collision`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php namespace Tatter\Alerts;`
`2`	`2`
`3`	`3`	`/***`
`4`		`-* Name: Alerts`
`5`		`-* Author: Matthew Gatner`
	`4`	`+* Name: Alerts`
	`5`	`+* Author: Matthew Gatner`
`6`	`6`	`* Contact: mgatner@tattersoftware.com`
`7`	`7`	`* Created: 2019-02-13`
`8`	`8`	`*`
`@@ -17,8 +17,8 @@`
`17`	`17`	`* Use Config/Alerts.php to override default behavior`
`18`	`18`	`*`
`19`	`19`	`* @package CodeIgniter4-Alerts`
`20`		`-* @author Matthew Gatner`
`21`		`-* @link https://github.com/tattersoftware/codeigniter4-alerts`
	`20`	`+* @author Matthew Gatner`
	`21`	`+* @link https://github.com/tattersoftware/codeigniter4-alerts`
`22`	`22`	`*`
`23`	`23`	`***/`
`24`	`24`
`@@ -116,6 +116,6 @@ public function display()`
`116`	`116`	`// should be injected into <head>`
`117`	`117`	`public function css()`
`118`	`118`	`{`
`119`		`- return $this->view->setVar('prefix', $this->config->prefix)->render("Tatter\Alerts\Views\css");`
	`119`	`+ return $this->view->setVar('prefix', $this->config->prefix)->render('Tatter\Alerts\Views\css');`
`120`	`120`	`}`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ class AlertsException extends FrameworkException implements ExceptionInterface`
`7`	`7`	`{`
`8`	`8`	`public static function forInvalidTemplate(string $template = null)`
`9`	`9`	`{`
`10`		`- return new static("'{$template}' is not a valid Alerts template.");`
	`10`	`+ return new static(lang('Alerts.invalidTemplate', [$template]));`
`11`	`11`	`}`
`12`	`12`	`public static function forMissingTemplateView(string $template = null)`
`13`	`13`	`{`
`14`		`- return new static("Could not find template view file: '{$template}'.");`
	`14`	`+ return new static(lang('Alerts.missingTemplateView', [$template]));`
`15`	`15`	`}`
`16`	`16`	`}`