Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@
}
],
"require": {
"php": ">=7.2",
"php": ">=7.4",
"transprime-research/piper": "^2.0"
},
"require-dev": {
"phpunit/phpunit": ">=8.0",
"squizlabs/php_codesniffer": "3.*",
"illuminate/support": ">=5.5"
"illuminate/support": ">=5.5",
"ext-json": "*",
"symfony/var-dumper": "^6.4"
},
"autoload": {
"psr-4": {
Expand Down
12 changes: 9 additions & 3 deletions src/Arrayed.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

namespace Transprime\Arrayed;

use Closure;
Expand All @@ -13,7 +15,7 @@ class Arrayed implements ArrayedInterface
{
use ArrayPrefix;

private $raw;
private array $raw;

private $result;

Expand All @@ -24,7 +26,7 @@ public function __construct(...$values)
$this->setResult(new Undefined());
}

private function argumentsToArray(...$values)
private function argumentsToArray(...$values): array
{
if (func_num_args() === 1 && is_array($values[0])) {
return $values[0];
Expand Down Expand Up @@ -186,7 +188,11 @@ private function getWorkableItem(bool $asArray = false)
return $this->raw;
}

return ($asArray && !is_array($this->result)) ? (array)$this->result : $this->result;
if ($asArray && !is_array($this->result)) {
return (array)$this->result;
}

return $this->result;
}

private static function makeArrayed($data)
Expand Down
37 changes: 37 additions & 0 deletions src/Traits/ArrayPrefix.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
<?php

declare(strict_types=1);

namespace Transprime\Arrayed\Traits;

use Transprime\Arrayed\Exceptions\ArrayedException;
use Transprime\Arrayed\Interfaces\ArrayedInterface;
use Transprime\Arrayed\Types\Undefined;

/**
* Trait ArrayPrefix
* @package Transprime\Arrayed\Traits
*
* @method self combine(array $values)
* @method mixed shift()
* @method mixed pop()
* @method self slice(int $offset, int $length = null, bool $preserve_keys = false)
*/
trait ArrayPrefix
Expand Down Expand Up @@ -77,6 +81,39 @@ public function keysExists(array $needles, bool $all = true): bool
: (!$intersect->empty());
}

/**
* @throws ArrayedException
* @return ArrayedInterface|mixed
*/
public function head(bool $preserveKeys = false)
{
return self::makeArrayed(
$this->when($this->getWorkableItem())
->slice(0, 1, $preserveKeys)
->values()
->offsetGet(0)
);
}

public function tail(): ArrayedInterface
{
return $this->when($this->getWorkableItem())
->slice(1);
}

private function when($truthyValue, $default = Undefined::class)
{
if ($truthyValue) {
return $this;
}

if ($default === Undefined::class || $default instanceof Undefined) {
throw new \InvalidArgumentException('Value cannot be resolved');
}

return $this->setResult($default);
}

/**
* Forward the calls to `array_*` that is not yet implemented
* <br>
Expand Down
60 changes: 60 additions & 0 deletions tests/ArrayPrefixTraitTest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

namespace Transprime\Arrayed\Tests;

use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -159,5 +161,63 @@ public function testUnImplementedArrayPrefixFunction()
array_combine($keys, $values),
arrayed($keys)->combine($values)->result()
);

// array_pop
$data = ['a' => 'b', 'c' => 'd'];

$this->assertEquals(
'd',
arrayed($data)->pop(),
);

// array_shift.
$this->assertEquals(
'b',
$arr = arrayed($data)->shift(),
);
}

public function testHead(): void
{
$data = ['a', 'b', 'c', 'd'];

$this->assertSame(
'a',
arrayed($data)->head(),
);

$data = ['a' => 'b', 'c' => 'd'];

$this->assertSame(
'b',
arrayed($data)->head(),
);

// Test empty.
$this->expectException(\InvalidArgumentException::class);

arrayed([])->head();
}

public function testTail(): void
{
$data = ['a', 'b', 'c', 'd'];

$this->assertSame(
['b', 'c', 'd'],
arrayed($data)->tail()->result(),
);

$data = ['a' => 'b', 'c' => 'd'];

$this->assertSame(
['c' => 'd'],
arrayed($data)->tail()->result(),
);

// Test empty.
$this->expectException(\InvalidArgumentException::class);

arrayed([])->tail();
}
}
6 changes: 4 additions & 2 deletions tests/ArrayedTest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

namespace Transprime\Arrayed\Tests;

use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -325,8 +327,8 @@ public function testJsonable()
{
$data = ['a' => 1, 'b' => 2];

$this->assertJson(arrayed($data));
$this->assertStringContainsString(arrayed($data), json_encode($data));
$this->assertJson((string) arrayed($data));
$this->assertStringContainsString((string) arrayed($data), json_encode($data));
$this->assertEquals(json_encode($data), arrayed($data));
$this->assertSame(json_encode($data), json_encode(arrayed($data)));
}
Expand Down