Skip to content

Commit 859f1b5

Browse files
d8vjorkd8vjork
committed
added tests and change Arr::query to Arr::queryString
1 parent 0a1d69d commit 859f1b5

File tree

7 files changed

+151
-6
lines changed

7 files changed

+151
-6
lines changed

‎src/Support/Arr.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function exceptValues(): Closure
2121
*
2222
* @param array|string $values
2323
*/
24-
return fn (array $array, $values): array => array_filter($array, fn ($value) => in_array($value, !static::wrap($values)));
24+
return fn (array $array, $values): array => array_filter($array, fn ($value) => !in_array($value, static::wrap($values)));
2525
}
2626

2727
public function onlyValues(): Closure
@@ -34,7 +34,7 @@ public function onlyValues(): Closure
3434
return fn (array $array, $values): array => array_filter($array, fn ($value) => in_array($value, static::wrap($values)));
3535
}
3636

37-
public function query(): Closure
37+
public function queryString(): Closure
3838
{
3939
/**
4040
* Convert the array into a query string.

‎src/Support/Collection.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Illuminate\Contracts\Support\Arrayable;
77
use Illuminate\Support\Arr;
88
use Illuminate\Support\Str;
9+
use PhpParser\Node\Expr\Instanceof_;
910

1011
/**
1112
* This is NOT supposed to be used alone, use the main from Laravel framework
@@ -23,9 +24,15 @@ public function toCsv(): Closure
2324
return function (): string {
2425
$csvContent = '';
2526

26-
$csvContent .= implode(',', array_keys((array) $this->first()))."\n";
27+
$headers = $this->flatMap(fn ($item) => array_keys($item instanceof Arrayable ? $item->toArray() : (array) $item))->unique();
2728

28-
$csvContent .= implode("\n", $this->map(fn ($result) => implode(',', array_values((array) $result)))->toArray());
29+
$csvContent .= implode(',', $headers->toArray())."\n";
30+
31+
$csvContent .= implode("\n", $this->map(function ($result) use ($headers): string {
32+
$resultAsArray = $result instanceof Arrayable ? $result->toArray() : (array) $result;
33+
34+
return $headers->map(fn (string $header): string => $resultAsArray[$header] ?? '')->join(',');
35+
})->toArray());
2936

3037
return $csvContent;
3138
};

‎tests/Fixtures/Models/Post.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ class Post extends Model
1111
*
1212
* @var string[]
1313
*/
14-
protected $fillable = ['id'];
14+
protected $fillable = ['id', 'title', 'content'];
1515
}

‎tests/Fixtures/Models/User.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class User extends Model
1111
*
1212
* @var string[]
1313
*/
14-
protected $fillable = ['id'];
14+
protected $fillable = ['id', 'name', 'email'];
1515

1616
/**
1717
* Get post that user owns.

‎tests/Support/ArrTest.php

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?php
2+
3+
namespace OpenSoutheners\ExtendedLaravel\Tests\Support;
4+
5+
use Illuminate\Support\Arr;
6+
use OpenSoutheners\ExtendedLaravel\Tests\TestCase;
7+
8+
class ArrTest extends TestCase
9+
{
10+
public function test_array_except_values()
11+
{
12+
$array = Arr::exceptValues([
13+
'hello' => 'world',
14+
'foo' => 'yes',
15+
'another' => 'world',
16+
'content' => 'Lorem ipsum dolor',
17+
], ['test', 'world']);
18+
19+
$this->assertCount(2, $array);
20+
$this->assertEmpty(array_diff($array, [
21+
'foo' => 'yes',
22+
'content' => 'Lorem ipsum dolor',
23+
]));
24+
}
25+
26+
public function test_array_only_values()
27+
{
28+
$array = Arr::onlyValues([
29+
'hello' => 'world',
30+
'foo' => 'yes',
31+
'another' => 'world',
32+
'content' => 'Lorem ipsum dolor',
33+
], ['test', 'world']);
34+
35+
$this->assertCount(2, $array);
36+
$this->assertEmpty(array_diff($array, [
37+
'hello' => 'world',
38+
'another' => 'world',
39+
]));
40+
}
41+
42+
public function test_array_query_string()
43+
{
44+
$originalQueryString = Arr::query([
45+
'filter' => [
46+
'hello' => ['world', 'mundo'],
47+
],
48+
'q' => 'hello world',
49+
]);
50+
51+
$queryString = Arr::queryString([
52+
'filter' => [
53+
'hello' => ['world', 'mundo'],
54+
],
55+
'q' => 'hello world',
56+
]);
57+
58+
$this->assertNotEquals($queryString, $originalQueryString);
59+
$this->assertIsString($queryString);
60+
$this->assertEquals('?filter%5Bhello%5D=world&filter%5Bhello%5D=mundo&q=hello+world', $queryString);
61+
}
62+
}

‎tests/Support/CollectionTest.php

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
3+
namespace OpenSoutheners\ExtendedLaravel\Tests\Support;
4+
5+
use Illuminate\Support\Collection;
6+
use OpenSoutheners\ExtendedLaravel\Tests\Fixtures\Models\Post;
7+
use OpenSoutheners\ExtendedLaravel\Tests\Fixtures\Models\User;
8+
use OpenSoutheners\ExtendedLaravel\Tests\TestCase;
9+
10+
class CollectionTest extends TestCase
11+
{
12+
public function test_collection_of_models_to_csv()
13+
{
14+
$postOne = new Post(['title' => 'Hello world', 'content' => 'Lorem ipsum dolor']);
15+
$postTwo = new Post(['title' => 'Hola mundo', 'content' => 'Lorem ipsum']);
16+
17+
$posts = Collection::make([$postOne, $postTwo]);
18+
19+
$this->assertEquals(
20+
"title,content\nHello world,Lorem ipsum dolor\nHola mundo,Lorem ipsum",
21+
$posts->toCsv()
22+
);
23+
}
24+
25+
public function test_collection_of_arrays_to_csv()
26+
{
27+
$collection = Collection::make([
28+
['hello' => 'world', 'foo' => 'bar'],
29+
['hello' => 'test', 'foo' => 'yes'],
30+
['another' => 'world', 'content' => 'Lorem ipsum dolor'],
31+
]);
32+
33+
$this->assertEquals(
34+
"hello,foo,another,content\nworld,bar,,\ntest,yes,,\n,,world,Lorem ipsum dolor",
35+
$collection->toCsv()
36+
);
37+
}
38+
39+
public function test_collection_of_users_to_string_using_template_join()
40+
{
41+
$userOne = new User(['name' => 'Ruben Robles', 'email' => '[email protected]']);
42+
$userTwo = new User(['name' => 'Taylor Otwell', 'email' => '[email protected]']);
43+
44+
$users = Collection::make([$userOne, $userTwo]);
45+
46+
$this->assertEquals(
47+
"Ruben Robles ([email protected]), Taylor Otwell ([email protected])",
48+
$users->templateJoin(':name (:email)', ', ')
49+
);
50+
}
51+
}

‎tests/Support/NumberTest.php

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
namespace OpenSoutheners\ExtendedLaravel\Tests\Support;
4+
5+
use Illuminate\Support\Number;
6+
use OpenSoutheners\ByteUnitConverter\ByteUnitConverter;
7+
use OpenSoutheners\ExtendedLaravel\Tests\TestCase;
8+
9+
class NumberTest extends TestCase
10+
{
11+
public function test_number_to_short()
12+
{
13+
$this->assertEquals('1K', Number::toShort(1000));
14+
15+
// FIXME: Round
16+
$this->assertEquals('1K', Number::toShort(1800));
17+
$this->assertEquals('1M', Number::toShort(1800000));
18+
}
19+
20+
public function test_number_to_byte_unit()
21+
{
22+
$this->assertInstanceOf(ByteUnitConverter::class, Number::toByteUnit(1000));
23+
$this->assertEquals('1 KB', (string) Number::toByteUnit(1000)->nearestUnit());
24+
}
25+
}

0 commit comments

Comments
 (0)