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
2 changes: 1 addition & 1 deletion src/Drivers/DatabaseDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function getAll($features): array
$filtered = $records->where('name', $feature)->where('scope', Feature::serializeScope($scope));

if ($filtered->isNotEmpty()) {
return json_decode($filtered->value('value'), flags: JSON_OBJECT_AS_ARRAY | JSON_THROW_ON_ERROR); // @phpstan-ignore argument.type
return json_decode($filtered->first()->value, flags: JSON_OBJECT_AS_ARRAY | JSON_THROW_ON_ERROR);
}

return with($this->resolveValue($feature, $scope), function ($value) use ($feature, $scope, $inserts) {
Expand Down
35 changes: 35 additions & 0 deletions tests/Feature/ArrayDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,41 @@ public function test_it_can_resolve_feature_instance()
$this->assertInstanceOf(Lottery::class, $feature);
$this->assertSame('345', $feature());
}

public function test_can_retrieve_scalar_values_without_in_memory_cache(): void
{
$data = [
'one' => 1,
'ten' => 10,
'zero' => 0,
'minus-one' => -1,
'minus-ten' => -10,
'one-point-five' => 1.5,
'ten-point-five' => 10.5,
'zero-point-five' => 0.5,
'minus-one-point-five' => -1.5,
'minus-ten-point-five' => -10.5,
'bool-true' => true,
'bool-false' => false,
'null' => null,
];

$user = new User;

foreach ($data as $name => $expectedValue) {
$feature = 'scalar-feature:'.$name;
Feature::define($feature, fn(User $user) => $expectedValue);

$generated = Feature::for($user)->value($feature);

Feature::flushCache();

$retrieved = Feature::for($user)->value($feature);

$this->assertEquals($expectedValue, $generated);
$this->assertEquals($expectedValue, $retrieved);
}
}
}

class MyFeature
Expand Down
35 changes: 35 additions & 0 deletions tests/Feature/DatabaseDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,41 @@ public function test_can_retrieve_all_features_for_differing_scope_types(): void
$this->assertCount(8, DB::getQueryLog());
$this->assertCount(13, DB::table('features')->get());
}

public function test_can_retrieve_scalar_values_without_in_memory_cache(): void
{
$data = [
'one' => 1,
'ten' => 10,
'zero' => 0,
'minus-one' => -1,
'minus-ten' => -10,
'one-point-five' => 1.5,
'ten-point-five' => 10.5,
'zero-point-five' => 0.5,
'minus-one-point-five' => -1.5,
'minus-ten-point-five' => -10.5,
'bool-true' => true,
'bool-false' => false,
'null' => null,
];

$user = new User;

foreach ($data as $name => $expectedValue) {
$feature = 'scalar-feature:'.$name;
Feature::define($feature, fn(User $user) => $expectedValue);

$generated = Feature::for($user)->value($feature);

Feature::flushCache();

$retrieved = Feature::for($user)->value($feature);

$this->assertEquals($expectedValue, $generated);
$this->assertEquals($expectedValue, $retrieved);
}
}
}

class UnregisteredFeature
Expand Down