Skip to content

Commit 4fab93d

Browse files
committed
update doc blocks
1 parent 9674467 commit 4fab93d

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

src/Flatten.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
namespace Sarhan\Flatten;
44

55
/**
6-
* @author Alaa Sarhan <sarhan.alaa@gmail.com>
7-
* @license LGPL
6+
* Flattens values, possibly traversables, into a one-dimensional array, recursively.
87
*/
98
class Flatten
109
{
@@ -50,13 +49,13 @@ public function __construct(
5049
}
5150

5251
/**
53-
* Flattens a variable, possibly traversable, into a one-dimensional array, recursively.
54-
*
52+
* Flattens a traversable or array into a 1-dimensional array.
53+
*
5554
* Each key (fully-qualified key or FQK) in the returned one-dimensional array is the join of all keys leading to
56-
* each (non-traversable) value, in all dimensions, separated by a given separator.
57-
*
58-
* An initial prefix can be optionally provided, but it will not be separated with the specified separator.
55+
* each (non-traversable) value, in all dimensions, separated by the configured separator.
5956
*
57+
* The configured prefix will be appended to all FQKs, but it will not be separated with the configured separator.
58+
*
6059
* @param mixed $var
6160
* @return array 1-dimensional array containing all values from all possible traversable dimensions in given input.
6261
*/

test/FlattenTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public function scalarProvider()
2323
* @covers Flatten::flatten
2424
* @dataProvider scalarProvider
2525
*/
26-
public function testFlattenScalar($var, $expectedOutput)
26+
public function testFlattenScalar($input, $expectedOutput)
2727
{
28-
$output = $this->flattenToArray($var);
28+
$output = $this->flattenToArray($input);
2929

3030
$this->assertEquals($expectedOutput, $output);
3131
}
@@ -46,9 +46,9 @@ public function scalarSeparatorPrefixProvider()
4646
* @covers Flatten::flatten
4747
* @dataProvider scalarSeparatorPrefixProvider
4848
*/
49-
public function testFlattenScalarWithSeparatorAndPrefix($var, $separator, $prefix, $expectedOutput)
49+
public function testFlattenScalarWithSeparatorAndPrefix($input, $separator, $prefix, $expectedOutput)
5050
{
51-
$output = $this->flattenToArray($var, $separator, $prefix);
51+
$output = $this->flattenToArray($input, $separator, $prefix);
5252

5353
$this->assertEquals($expectedOutput, $output);
5454
}
@@ -78,9 +78,9 @@ public function arraysProvider()
7878
* @covers Flatten::flatten
7979
* @dataProvider arraysProvider
8080
*/
81-
public function testFlattenArrays($var, $expectedOutput)
81+
public function testFlattenArrays($input, $expectedOutput)
8282
{
83-
$output = $this->flattenToArray($var);
83+
$output = $this->flattenToArray($input);
8484

8585
$this->assertEquals($expectedOutput, $output);
8686
}
@@ -114,9 +114,9 @@ public function traversablesProvider()
114114
* @covers Flatten::flatten
115115
* @dataProvider traversablesProvider
116116
*/
117-
public function testFlattenTraversable($var, $expectedOutput)
117+
public function testFlattenTraversable($input, $expectedOutput)
118118
{
119-
$output = $this->flattenToArray($var);
119+
$output = $this->flattenToArray($input);
120120
$this->assertEquals($expectedOutput, $output);
121121
}
122122

@@ -155,9 +155,9 @@ public function traversablesSeparatorPrefixProvider()
155155
* @covers Flatten::flatten
156156
* @dataProvider traversablesSeparatorPrefixProvider
157157
*/
158-
public function testFlattenTraversableWithSeparatorAndPrefix($var, $separator, $prefix, $expectedOutput)
158+
public function testFlattenTraversableWithSeparatorAndPrefix($input, $separator, $prefix, $expectedOutput)
159159
{
160-
$output = $this->flattenToArray($var, $separator, $prefix);
160+
$output = $this->flattenToArray($input, $separator, $prefix);
161161
$this->assertEquals($expectedOutput, $output);
162162
}
163163

@@ -214,18 +214,18 @@ public function flattenWithFlagsProvidor()
214214
* @covers Flatten::flatten
215215
* @dataProvider flattenWithFlagsProvidor
216216
*/
217-
public function testFlattenWithFlags($var, $separator, $prefix, $flags, $expectedOutput)
217+
public function testFlattenWithFlags($input, $separator, $prefix, $flags, $expectedOutput)
218218
{
219-
$output = $this->flattenToArray($var, $separator, $prefix, $flags);
219+
$output = $this->flattenToArray($input, $separator, $prefix, $flags);
220220
$this->assertEquals($expectedOutput, $output);
221221
}
222222

223223
private function flattenToArray(
224-
$var,
224+
$input,
225225
$separator = Flatten::DEFAULT_SEPARATOR,
226226
$prefix = Flatten::DEFAULT_PREFIX,
227227
$flags = Flatten::DEFAULT_FLAGS
228228
) {
229-
return iterator_to_array((new Flatten($separator, $prefix, $flags))->flatten($var));
229+
return iterator_to_array((new Flatten($separator, $prefix, $flags))->flatten($input));
230230
}
231231
}

0 commit comments

Comments
 (0)