From 82b727bcd2b80b932b4c97a2a00df9abe25b0d27 Mon Sep 17 00:00:00 2001
From: sallyx <sallyx@centrum.cz>
Date: Mon, 9 Nov 2015 17:17:03 +0100
Subject: [PATCH] Used AdapterManager trait to extends Configurator

---
 .travis.yml                      |  1 -
 Makefile                         |  4 +++
 README.md                        |  2 +-
 src/Adapters/XmlAdapter.php      | 10 +++----
 src/Bootstrap/AdapterManager.php | 45 ++++++++++++++++++++++++++++++++
 src/Bootstrap/Configurator.php   | 30 +--------------------
 6 files changed, 56 insertions(+), 36 deletions(-)
 create mode 100644 Makefile
 create mode 100644 src/Bootstrap/AdapterManager.php

diff --git a/.travis.yml b/.travis.yml
index ae469b4..48b6540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3ee16c7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	./vendor/bin/tester -c tests/php-unix.ini tests/
diff --git a/README.md b/README.md
index d7573aa..44a53fc 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Becomes:
 ```
 
 ### Statement
-Of course you can use array from string in statement arguments.
+Of course you can use `array from string` as statement arguments.
 ```xml
 <xxx statement="statement">
 <s><ent>fooo</ent><args array="string" delimiter=";">1;2;3</args></s>
diff --git a/src/Adapters/XmlAdapter.php b/src/Adapters/XmlAdapter.php
index 86e9812..3480547 100644
--- a/src/Adapters/XmlAdapter.php
+++ b/src/Adapters/XmlAdapter.php
@@ -123,11 +123,11 @@ public function getValue()
 		if ($bool) {
 			switch (strtolower($bool)) {
 				case 'yes':
-// break intentionally omitted
+				// break intentionally omitted
 				case 'true':
-// break intentionally omitted
+				// break intentionally omitted
 				case 'on':
-// break intentionally omitted
+				// break intentionally omitted
 				case '1':
 					return TRUE;
 				default:
@@ -283,8 +283,7 @@ private function trim(&$value, $space)
 				if (is_string($val)) {
 					$val = trim($val);
 				}
-			}
-			);
+			});
 			return;
 		}
 
@@ -321,6 +320,7 @@ private function parseStringArray()
  */
 class XMLElementWriter extends \SimpleXMLElement
 {
+
 	/** Entity names */
 	const ENT_ITEM = 'item',
 		ENT_STATEMENT = 's',
diff --git a/src/Bootstrap/AdapterManager.php b/src/Bootstrap/AdapterManager.php
new file mode 100644
index 0000000..7c13f49
--- /dev/null
+++ b/src/Bootstrap/AdapterManager.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Copyright (c) 2015 Petr Bilek (http://ww.sallyx.org)
+ */
+
+namespace Sallyx\Nette;
+
+/**
+ * Use this trait to extend \Nette\Configurator
+ * Add ability to add adapters
+ *
+ */
+trait AdapterManager
+{
+
+	/**
+	 * @var array  string => IAdapter|string
+	 */
+	private $adapters = array();
+
+	/**
+	 * @param string $extension
+	 * @param string|Nette\DI\Config\IAdapter $adapter
+	 * @return self
+	 */
+	public function addAdapter($extension, $adapter)
+	{
+		$this->adapters[strtolower($extension)] = $adapter;
+		return $this;
+	}
+
+	/**
+	 * @return DI\Config\Loader
+	 */
+	protected function createLoader()
+	{
+		$loader = parent::createLoader();
+		foreach ($this->adapters as $extension => $adapter) {
+			$loader->addAdapter($extension, $adapter);
+		}
+		return $loader;
+	}
+
+}
diff --git a/src/Bootstrap/Configurator.php b/src/Bootstrap/Configurator.php
index d104373..09c564b 100644
--- a/src/Bootstrap/Configurator.php
+++ b/src/Bootstrap/Configurator.php
@@ -14,33 +14,5 @@
  */
 class Configurator extends Nette\Configurator
 {
-
-	/**
-	 * @var array  string => IAdapter|string
-	 */
-	private $adapters = array();
-
-	/**
-	 * @param string $extension
-	 * @param string|Nette\DI\Config\IAdapter $adapter
-	 * @return self
-	 */
-	public function addAdapter($extension, $adapter)
-	{
-		$this->adapters[strtolower($extension)] = $adapter;
-		return $this;
-	}
-
-	/**
-	 * @return DI\Config\Loader
-	 */
-	protected function createLoader()
-	{
-		$loader = parent::createLoader();
-		foreach ($this->adapters as $extension => $adapter) {
-			$loader->addAdapter($extension, $adapter);
-		}
-		return $loader;
-	}
-
+	use AdapterManager;
 }