Skip to content

Janis / btflags

Go to a project
Toggle navigation
Toggle navigation pinning
0d9dd429 by Joshua Tundag
Options

fix

1 parent 058c30e1
Inline Side-by-side
Showing 2 changed files with 19 additions and 3 deletions
src/BTFlags/FlagManager.php
......@@ -194,7 +194,7 @@ class FlagManager {
if(!$flags) return [];
$filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){
if(isset($f['both_usable']) && $f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag;
return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag);
return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name'] == $flag));
}));
return count($filteredFlags) ? $filteredFlags[0] : null;
}
......
tests/FlagsTest.php
......@@ -7,6 +7,22 @@ final class FlagsTest extends TestCase
protected function setUp(){
$this->flags = [
[
"name" => "source",
"is_encrypted" => false,
"is_filtered" => false,
"encrypted_name" => "ecruos",
"accepted_values" => [
[
"value" => null,
"encrypted_value" => null
]
],
"combined_values" => "",
"has_default" => true,
"default" => "n/a",
"both_usable" => true,
],
[
"name" => "mode",
"is_encrypted" => false,
"is_filtered" => false,
......@@ -30,13 +46,13 @@ final class FlagsTest extends TestCase
}
public function testGetFlags(){
$flag = '15D61712450A686A7F365ADF4FEF581F';
$flag = 'mode';
$encrypted = false;
$flags = $this->flags;
if(!$flags) return [];
$filteredFlags = array_values(array_filter($flags, function($f) use ($flag, $encrypted){
if(isset($f['both_usable']) && $f['both_usable']) return $f['encrypted_name'] == $flag || $f['name'] == $flag;
return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name']) == $flag);
return (($encrypted && $f['encrypted_name'] == $flag) || (!$encrypted && $f['name'] == $flag));
}));
$foundFlag = count($filteredFlags) ? $filteredFlags[0] : null;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!