Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hashing transformer fix #42

Merged
merged 1 commit into from
Oct 13, 2022
Merged

Hashing transformer fix #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/Model/Interpreter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ public function executeAttributes(array $attributes, string $propertyName, Attri
foreach ($attributes as $attribute) {
if ($attribute['type'] === $type) {
$interim = $attribute['instance']($this->currentModel->toArray(), $direction, $propertyName);
$this->currentModel->{$propertyName} = $interim[$propertyName];
if(isset($interim[$propertyName])){
$this->currentModel->{$propertyName} = $interim[$propertyName];
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Model/Transformers/Hash.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public function __invoke(array $inputOutput, Direction $direction, string $prope
$inputOutput[$property] = $this->fakePassword;
} elseif ($direction === Direction::IN && isset($inputOutput[$property]) && $inputOutput[$property] !== $this->fakePassword) {
$inputOutput[$property] = password_hash($inputOutput['password'], PASSWORD_DEFAULT);
} else {
unset($inputOutput[$property]);
}
return $inputOutput;
}
Expand Down
Binary file modified tests/Mocks/database.db
View file
Open in desktop
Binary file not shown.
70 changes: 36 additions & 34 deletions tests/clover.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1665493206">
<project timestamp="1665493206">
<coverage generated="1665626790">
<project timestamp="1665626790">
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\CoreInterfaces\RequestInterface.php">
<metrics loc="12" ncloc="12" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
</file>
Expand Down Expand Up @@ -641,7 +641,7 @@
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Model\Interpreter.php">
<class name="Neoan\Model\Interpreter" namespace="global">
<metrics complexity="36" methods="11" coveredmethods="10" conditionals="0" coveredconditionals="0" statements="58" coveredstatements="57" elements="69" coveredelements="67"/>
<metrics complexity="37" methods="11" coveredmethods="10" conditionals="0" coveredconditionals="0" statements="59" coveredstatements="58" elements="70" coveredelements="68"/>
</class>
<line num="26" type="method" name="__construct" visibility="public" complexity="1" crap="1" count="24"/>
<line num="28" type="stmt" count="24"/>
Expand All @@ -667,52 +667,53 @@
<line num="68" type="stmt" count="17"/>
<line num="69" type="stmt" count="1"/>
<line num="71" type="stmt" count="1"/>
<line num="76" type="method" name="executeAttributes" visibility="public" complexity="3" crap="3" count="20"/>
<line num="76" type="method" name="executeAttributes" visibility="public" complexity="4" crap="4" count="20"/>
<line num="78" type="stmt" count="20"/>
<line num="79" type="stmt" count="20"/>
<line num="80" type="stmt" count="16"/>
<line num="81" type="stmt" count="16"/>
<line num="86" type="method" name="generateInsertUpdate" visibility="public" complexity="2" crap="2" count="16"/>
<line num="88" type="stmt" count="16"/>
<line num="89" type="stmt" count="16"/>
<line num="82" type="stmt" count="16"/>
<line num="88" type="method" name="generateInsertUpdate" visibility="public" complexity="2" crap="2" count="16"/>
<line num="90" type="stmt" count="16"/>
<line num="91" type="stmt" count="16"/>
<line num="92" type="stmt" count="16"/>
<line num="95" type="method" name="generateSelect" visibility="public" complexity="4" crap="4" count="16"/>
<line num="97" type="stmt" count="16"/>
<line num="98" type="stmt" count="16"/>
<line num="94" type="stmt" count="16"/>
<line num="97" type="method" name="generateSelect" visibility="public" complexity="4" crap="4" count="16"/>
<line num="99" type="stmt" count="16"/>
<line num="100" type="stmt" count="16"/>
<line num="101" type="stmt" count="16"/>
<line num="102" type="stmt" count="2"/>
<line num="104" type="stmt" count="16"/>
<line num="105" type="stmt" count="16"/>
<line num="110" type="stmt" count="16"/>
<line num="111" type="stmt" count="16"/>
<line num="102" type="stmt" count="16"/>
<line num="103" type="stmt" count="16"/>
<line num="104" type="stmt" count="2"/>
<line num="106" type="stmt" count="16"/>
<line num="107" type="stmt" count="16"/>
<line num="112" type="stmt" count="16"/>
<line num="116" type="method" name="addToSelectorString" visibility="private" complexity="2" crap="2" count="16"/>
<line num="118" type="stmt" count="16"/>
<line num="121" type="method" name="getTableName" visibility="public" complexity="2" crap="2" count="20"/>
<line num="123" type="stmt" count="20"/>
<line num="124" type="stmt" count="20"/>
<line num="127" type="stmt" count="3"/>
<line num="113" type="stmt" count="16"/>
<line num="114" type="stmt" count="16"/>
<line num="118" type="method" name="addToSelectorString" visibility="private" complexity="2" crap="2" count="16"/>
<line num="120" type="stmt" count="16"/>
<line num="123" type="method" name="getTableName" visibility="public" complexity="2" crap="2" count="20"/>
<line num="125" type="stmt" count="20"/>
<line num="126" type="stmt" count="20"/>
<line num="128" type="stmt" count="3"/>
<line num="132" type="method" name="attributeCheck" visibility="private" complexity="6" crap="6.02" count="16"/>
<line num="134" type="stmt" count="16"/>
<line num="129" type="stmt" count="3"/>
<line num="133" type="method" name="attributeCheck" visibility="private" complexity="6" crap="6.02" count="16"/>
<line num="135" type="stmt" count="16"/>
<line num="136" type="stmt" count="16"/>
<line num="137" type="stmt" count="16"/>
<line num="139" type="stmt" count="16"/>
<line num="138" type="stmt" count="16"/>
<line num="140" type="stmt" count="16"/>
<line num="141" type="stmt" count="16"/>
<line num="142" type="stmt" count="16"/>
<line num="143" type="stmt" count="16"/>
<line num="144" type="stmt" count="0"/>
<line num="145" type="stmt" count="16"/>
<line num="147" type="stmt" count="16"/>
<line num="144" type="stmt" count="16"/>
<line num="145" type="stmt" count="0"/>
<line num="146" type="stmt" count="16"/>
<line num="148" type="stmt" count="16"/>
<line num="152" type="method" name="getPrimaryKey" visibility="public" complexity="1" crap="1" count="16"/>
<line num="154" type="stmt" count="16"/>
<metrics loc="157" ncloc="149" classes="1" methods="11" coveredmethods="10" conditionals="0" coveredconditionals="0" statements="58" coveredstatements="57" elements="69" coveredelements="67"/>
<line num="149" type="stmt" count="16"/>
<line num="153" type="method" name="getPrimaryKey" visibility="public" complexity="1" crap="1" count="16"/>
<line num="155" type="stmt" count="16"/>
<metrics loc="158" ncloc="150" classes="1" methods="11" coveredmethods="10" conditionals="0" coveredconditionals="0" statements="59" coveredstatements="58" elements="70" coveredelements="68"/>
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Model\Model.php">
<class name="Neoan\Model\Model" namespace="global">
Expand Down Expand Up @@ -843,15 +844,16 @@
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Model\Transformers\Hash.php">
<class name="Neoan\Model\Transformers\Hash" namespace="global">
<metrics complexity="6" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="5" elements="6" coveredelements="6"/>
<metrics complexity="6" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="7" coveredelements="7"/>
</class>
<line num="13" type="method" name="__invoke" visibility="public" complexity="6" crap="6" count="16"/>
<line num="15" type="stmt" count="16"/>
<line num="16" type="stmt" count="16"/>
<line num="17" type="stmt" count="16"/>
<line num="18" type="stmt" count="16"/>
<line num="20" type="stmt" count="16"/>
<metrics loc="22" ncloc="22" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="5" elements="6" coveredelements="6"/>
<line num="20" type="stmt" count="2"/>
<line num="22" type="stmt" count="16"/>
<metrics loc="24" ncloc="24" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="7" coveredelements="7"/>
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\NeoanApp.php">
<class name="Neoan\NeoanApp" namespace="global">
Expand Down Expand Up @@ -1312,6 +1314,6 @@
<line num="60" type="stmt" count="21"/>
<metrics loc="62" ncloc="62" classes="2" methods="7" coveredmethods="7" conditionals="0" coveredconditionals="0" statements="16" coveredstatements="16" elements="23" coveredelements="23"/>
</file>
<metrics files="60" loc="2851" ncloc="2731" classes="45" methods="220" coveredmethods="208" conditionals="0" coveredconditionals="0" statements="771" coveredstatements="757" elements="991" coveredelements="965"/>
<metrics files="60" loc="2854" ncloc="2734" classes="45" methods="220" coveredmethods="208" conditionals="0" coveredconditionals="0" statements="773" coveredstatements="759" elements="993" coveredelements="967"/>
</project>
</coverage>