Skip to content

Commit 82b727b

Browse files
committed
Used AdapterManager trait to extends Configurator
1 parent b1c8bf0 commit 82b727b

File tree

6 files changed

+56
-36
lines changed

6 files changed

+56
-36
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.3
43
- 5.4
54
- 5.5
65
- 5.6

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.PHONY: test
2+
3+
test:
4+
./vendor/bin/tester -c tests/php-unix.ini tests/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Becomes:
7373
```
7474

7575
### Statement
76-
Of course you can use array from string in statement arguments.
76+
Of course you can use `array from string` as statement arguments.
7777
```xml
7878
<xxx statement="statement">
7979
<s><ent>fooo</ent><args array="string" delimiter=";">1;2;3</args></s>

src/Adapters/XmlAdapter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ public function getValue()
123123
if ($bool) {
124124
switch (strtolower($bool)) {
125125
case 'yes':
126-
// break intentionally omitted
126+
// break intentionally omitted
127127
case 'true':
128-
// break intentionally omitted
128+
// break intentionally omitted
129129
case 'on':
130-
// break intentionally omitted
130+
// break intentionally omitted
131131
case '1':
132132
return TRUE;
133133
default:
@@ -283,8 +283,7 @@ private function trim(&$value, $space)
283283
if (is_string($val)) {
284284
$val = trim($val);
285285
}
286-
}
287-
);
286+
});
288287
return;
289288
}
290289

@@ -321,6 +320,7 @@ private function parseStringArray()
321320
*/
322321
class XMLElementWriter extends \SimpleXMLElement
323322
{
323+
324324
/** Entity names */
325325
const ENT_ITEM = 'item',
326326
ENT_STATEMENT = 's',

src/Bootstrap/AdapterManager.php

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
3+
/**
4+
* Copyright (c) 2015 Petr Bilek (http://ww.sallyx.org)
5+
*/
6+
7+
namespace Sallyx\Nette;
8+
9+
/**
10+
* Use this trait to extend \Nette\Configurator
11+
* Add ability to add adapters
12+
*
13+
*/
14+
trait AdapterManager
15+
{
16+
17+
/**
18+
* @var array string => IAdapter|string
19+
*/
20+
private $adapters = array();
21+
22+
/**
23+
* @param string $extension
24+
* @param string|Nette\DI\Config\IAdapter $adapter
25+
* @return self
26+
*/
27+
public function addAdapter($extension, $adapter)
28+
{
29+
$this->adapters[strtolower($extension)] = $adapter;
30+
return $this;
31+
}
32+
33+
/**
34+
* @return DI\Config\Loader
35+
*/
36+
protected function createLoader()
37+
{
38+
$loader = parent::createLoader();
39+
foreach ($this->adapters as $extension => $adapter) {
40+
$loader->addAdapter($extension, $adapter);
41+
}
42+
return $loader;
43+
}
44+
45+
}

src/Bootstrap/Configurator.php

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,5 @@
1414
*/
1515
class Configurator extends Nette\Configurator
1616
{
17-
18-
/**
19-
* @var array string => IAdapter|string
20-
*/
21-
private $adapters = array();
22-
23-
/**
24-
* @param string $extension
25-
* @param string|Nette\DI\Config\IAdapter $adapter
26-
* @return self
27-
*/
28-
public function addAdapter($extension, $adapter)
29-
{
30-
$this->adapters[strtolower($extension)] = $adapter;
31-
return $this;
32-
}
33-
34-
/**
35-
* @return DI\Config\Loader
36-
*/
37-
protected function createLoader()
38-
{
39-
$loader = parent::createLoader();
40-
foreach ($this->adapters as $extension => $adapter) {
41-
$loader->addAdapter($extension, $adapter);
42-
}
43-
return $loader;
44-
}
45-
17+
use AdapterManager;
4618
}

0 commit comments

Comments
 (0)