Skip to content

Commit

Permalink
Used AdapterManager trait to extends Configurator
Browse files Browse the repository at this point in the history
  • Loading branch information
sallyx committed Nov 9, 2015
1 parent b1c8bf0 commit 82b727b
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 36 deletions.
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,6 +1,5 @@
language: php
php:
- 5.3
- 5.4
- 5.5
- 5.6
Expand Down
4 changes: 4 additions & 0 deletions Makefile
@@ -0,0 +1,4 @@
.PHONY: test

test:
./vendor/bin/tester -c tests/php-unix.ini tests/
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/Adapters/XmlAdapter.php
Expand Up @@ -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:
Expand Down Expand Up @@ -283,8 +283,7 @@ private function trim(&$value, $space)
if (is_string($val)) {
$val = trim($val);
}
}
);
});
return;
}

Expand Down Expand Up @@ -321,6 +320,7 @@ private function parseStringArray()
*/
class XMLElementWriter extends \SimpleXMLElement
{

/** Entity names */
const ENT_ITEM = 'item',
ENT_STATEMENT = 's',
Expand Down
45 changes: 45 additions & 0 deletions 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;
}

}
30 changes: 1 addition & 29 deletions src/Bootstrap/Configurator.php
Expand Up @@ -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;
}

0 comments on commit 82b727b

Please sign in to comment.