Skip to content

Commit

Permalink
Merge pull request #36 from sroehrl/bugfixes
Browse files Browse the repository at this point in the history 
Addresses issue #31 : remove query strings from parameters
  • Loading branch information
@sroehrl
sroehrl authored Aug 28, 2022
2 parents d870904 + a759564 commit 0fb92c1
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 49 deletions.
5 changes: 3 additions & 2 deletions src/Request/Request.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,11 @@ private function processQueryParametersFromRequestUri(): void
// extract query-params
$query = $_SERVER['QUERY_STRING'] ?? '';
parse_str($query, self::$instance->queryParts);
self::$instance->requestUri = $_SERVER['REQUEST_URI'];
if ($query !== '') {
self::$instance->requestUri = mb_substr($_SERVER['REQUEST_URI'], 0, -1 * (mb_strlen($query)));
self::$instance->requestUri = mb_substr($_SERVER['REQUEST_URI'], 0, -1 * (mb_strlen($query)+1));
}
self::$instance->requestUri = $_SERVER['REQUEST_URI'];

}

private function processRequestUriSanitation(): void
Expand Down
3 changes: 1 addition & 2 deletions src/Routing/Route.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ private function executePotentialRouteMatch(string $expression, array $parameter
if($hit){
array_shift($matches);
foreach ($matches as $i => $value){
$querySplit = explode('?', str_replace('/','',$value));
Request::setParameter($parameters[$i], $querySplit[0]);
Request::setParameter($parameters[$i], str_replace('/','',$value));
}
return true;
}
Expand Down
Binary file modified tests/Mocks/database.db
View file
Binary file not shown.
89 changes: 44 additions & 45 deletions tests/clover.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1661625314">
<project timestamp="1661625314">
<coverage generated="1661697904">
<project timestamp="1661697904">
<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 @@ -930,29 +930,29 @@
<line num="132" type="stmt" count="5"/>
<line num="133" type="stmt" count="5"/>
<line num="134" type="stmt" count="5"/>
<line num="135" type="stmt" count="1"/>
<line num="137" type="stmt" count="5"/>
<line num="140" type="method" name="processRequestUriSanitation" visibility="private" complexity="1" crap="1" count="5"/>
<line num="142" type="stmt" count="5"/>
<line num="135" type="stmt" count="5"/>
<line num="136" type="stmt" count="1"/>
<line num="141" type="method" name="processRequestUriSanitation" visibility="private" complexity="1" crap="1" count="5"/>
<line num="143" type="stmt" count="5"/>
<line num="144" type="stmt" count="5"/>
<line num="147" type="method" name="createUrlParts" visibility="private" complexity="1" crap="1" count="5"/>
<line num="149" type="stmt" count="5"/>
<line num="152" type="method" name="parseInput" visibility="private" complexity="3" crap="3.03" count="4"/>
<line num="154" type="stmt" count="4"/>
<line num="145" type="stmt" count="5"/>
<line num="148" type="method" name="createUrlParts" visibility="private" complexity="1" crap="1" count="5"/>
<line num="150" type="stmt" count="5"/>
<line num="153" type="method" name="parseInput" visibility="private" complexity="3" crap="3.03" count="4"/>
<line num="155" type="stmt" count="4"/>
<line num="156" type="stmt" count="4"/>
<line num="157" type="stmt" count="0"/>
<line num="158" type="stmt" count="4"/>
<line num="159" type="stmt" count="3"/>
<line num="161" type="stmt" count="4"/>
<line num="164" type="method" name="parseRequestHeaders" visibility="private" complexity="3" crap="3" count="4"/>
<line num="166" type="stmt" count="4"/>
<line num="157" type="stmt" count="4"/>
<line num="158" type="stmt" count="0"/>
<line num="159" type="stmt" count="4"/>
<line num="160" type="stmt" count="3"/>
<line num="162" type="stmt" count="4"/>
<line num="165" type="method" name="parseRequestHeaders" visibility="private" complexity="3" crap="3" count="4"/>
<line num="167" type="stmt" count="4"/>
<line num="168" type="stmt" count="4"/>
<line num="169" type="stmt" count="4"/>
<line num="172" type="stmt" count="4"/>
<metrics loc="174" ncloc="173" classes="1" methods="19" coveredmethods="18" conditionals="0" coveredconditionals="0" statements="63" coveredstatements="62" elements="82" coveredelements="80"/>
<line num="170" type="stmt" count="4"/>
<line num="173" type="stmt" count="4"/>
<metrics loc="175" ncloc="174" classes="1" methods="19" coveredmethods="18" conditionals="0" coveredconditionals="0" statements="63" coveredstatements="62" elements="82" coveredelements="80"/>
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Response\Response.php">
<class name="Neoan\Response\Response" namespace="global">
Expand Down Expand Up @@ -1117,7 +1117,7 @@
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Routing\Route.php">
<class name="Neoan\Routing\Route" namespace="global">
<metrics complexity="36" methods="18" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="81" coveredstatements="77" elements="99" coveredelements="91"/>
<metrics complexity="36" methods="18" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="80" coveredstatements="76" elements="98" coveredelements="90"/>
</class>
<line num="22" type="method" name="get" visibility="public" complexity="1" crap="1" count="7"/>
<line num="24" type="stmt" count="7"/>
Expand Down Expand Up @@ -1183,42 +1183,41 @@
<line num="143" type="stmt" count="3"/>
<line num="144" type="stmt" count="3"/>
<line num="145" type="stmt" count="1"/>
<line num="146" type="stmt" count="1"/>
<line num="148" type="stmt" count="3"/>
<line num="150" type="stmt" count="5"/>
<line num="153" type="method" name="extractParameters" visibility="private" complexity="4" crap="4.02" count="5"/>
<line num="147" type="stmt" count="3"/>
<line num="149" type="stmt" count="5"/>
<line num="152" type="method" name="extractParameters" visibility="private" complexity="4" crap="4.02" count="5"/>
<line num="154" type="stmt" count="5"/>
<line num="155" type="stmt" count="5"/>
<line num="156" type="stmt" count="5"/>
<line num="157" type="stmt" count="5"/>
<line num="158" type="stmt" count="5"/>
<line num="159" type="stmt" count="5"/>
<line num="160" type="stmt" count="5"/>
<line num="161" type="stmt" count="0"/>
<line num="163" type="stmt" count="5"/>
<line num="168" type="stmt" count="5"/>
<line num="174" type="method" name="execute" visibility="private" complexity="5" crap="5" count="3"/>
<line num="176" type="stmt" count="3"/>
<line num="177" type="stmt" count="1"/>
<line num="160" type="stmt" count="0"/>
<line num="162" type="stmt" count="5"/>
<line num="167" type="stmt" count="5"/>
<line num="173" type="method" name="execute" visibility="private" complexity="5" crap="5" count="3"/>
<line num="175" type="stmt" count="3"/>
<line num="176" type="stmt" count="1"/>
<line num="178" type="stmt" count="2"/>
<line num="179" type="stmt" count="2"/>
<line num="180" type="stmt" count="2"/>
<line num="181" type="stmt" count="2"/>
<line num="182" type="stmt" count="2"/>
<line num="183" type="stmt" count="2"/>
<line num="184" type="stmt" count="1"/>
<line num="183" type="stmt" count="1"/>
<line num="185" type="stmt" count="1"/>
<line num="186" type="stmt" count="1"/>
<line num="187" type="stmt" count="1"/>
<line num="188" type="stmt" count="1"/>
<line num="190" type="stmt" count="1"/>
<line num="196" type="method" name="isLastRoutable" visibility="private" complexity="1" crap="1" count="1"/>
<line num="198" type="stmt" count="1"/>
<line num="201" type="method" name="lastRoutable" visibility="private" complexity="2" crap="2.15" count="1"/>
<line num="189" type="stmt" count="1"/>
<line num="195" type="method" name="isLastRoutable" visibility="private" complexity="1" crap="1" count="1"/>
<line num="197" type="stmt" count="1"/>
<line num="200" type="method" name="lastRoutable" visibility="private" complexity="2" crap="2.15" count="1"/>
<line num="202" type="stmt" count="1"/>
<line num="203" type="stmt" count="1"/>
<line num="204" type="stmt" count="1"/>
<line num="206" type="stmt" count="0"/>
<line num="210" type="method" name="packUnpack" visibility="private" complexity="3" crap="3.33" count="1"/>
<line num="205" type="stmt" count="0"/>
<line num="209" type="method" name="packUnpack" visibility="private" complexity="3" crap="3.33" count="1"/>
<line num="211" type="stmt" count="1"/>
<line num="212" type="stmt" count="1"/>
<line num="213" type="stmt" count="1"/>
<line num="215" type="stmt" count="0"/>
<metrics loc="218" ncloc="214" classes="1" methods="18" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="81" coveredstatements="77" elements="99" coveredelements="91"/>
<line num="214" type="stmt" count="0"/>
<metrics loc="217" ncloc="213" classes="1" methods="18" coveredmethods="14" conditionals="0" coveredconditionals="0" statements="80" coveredstatements="76" elements="98" coveredelements="90"/>
</file>
<file name="C:\xampp\htdocs\neoan.io-tools\lenkrad-core\src\Store\Store.php">
<class name="Neoan\Store\Store" namespace="global">
Expand Down Expand Up @@ -1252,6 +1251,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="59" loc="2707" ncloc="2603" classes="44" methods="205" coveredmethods="196" conditionals="0" coveredconditionals="0" statements="732" coveredstatements="723" elements="937" coveredelements="919"/>
<metrics files="59" loc="2707" ncloc="2603" classes="44" methods="205" coveredmethods="196" conditionals="0" coveredconditionals="0" statements="731" coveredstatements="722" elements="936" coveredelements="918"/>
</project>
</coverage>

0 comments on commit 0fb92c1

Please sign in to comment.