Skip to content

Commit 4b92d75

Browse files
author
JimChen
committed
replace underscores with namespace marker, PSR-0 style
1 parent 47e2255 commit 4b92d75

File tree

3 files changed

+202
-1
lines changed

3 files changed

+202
-1
lines changed

‎coverage.clover

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<coverage generated="1546930682">
3+
<project timestamp="1546930682">
4+
<package name="Recsys\Common">
5+
<file name="E:\Desktop\open-source\recsys-common\src/Common/AbstractGateway.php">
6+
<class name="AbstractGateway" namespace="Recsys\Common">
7+
<metrics methods="6" coveredmethods="6" conditionals="0" coveredconditionals="0" statements="13" coveredstatements="13" elements="19" coveredelements="19"/>
8+
</class>
9+
<line num="44" type="method" name="__construct" crap="1" count="4"/>
10+
<line num="46" type="stmt" count="4"/>
11+
<line num="47" type="stmt" count="4"/>
12+
<line num="48" type="stmt" count="4"/>
13+
<line num="57" type="method" name="initialize" crap="1" count="6"/>
14+
<line num="59" type="stmt" count="6"/>
15+
<line num="61" type="stmt" count="6"/>
16+
<line num="72" type="method" name="createRequest" crap="1" count="1"/>
17+
<line num="77" type="stmt" count="1"/>
18+
<line num="79" type="stmt" count="1"/>
19+
<line num="87" type="method" name="getDefaultHttpClient" crap="1" count="4"/>
20+
<line num="89" type="stmt" count="4"/>
21+
<line num="99" type="method" name="support" crap="1" count="2"/>
22+
<line num="101" type="stmt" count="2"/>
23+
<line num="112" type="method" name="__call" crap="2" count="2"/>
24+
<line num="114" type="stmt" count="2"/>
25+
<line num="115" type="stmt" count="1"/>
26+
<line num="117" type="stmt" count="1"/>
27+
<line num="120" type="stmt" count="1"/>
28+
<metrics loc="122" ncloc="58" classes="1" methods="6" coveredmethods="6" conditionals="0" coveredconditionals="0" statements="13" coveredstatements="13" elements="19" coveredelements="19"/>
29+
</file>
30+
<file name="E:\Desktop\open-source\recsys-common\src/Common/GatewayFactory.php">
31+
<class name="GatewayFactory" namespace="Recsys\Common">
32+
<metrics methods="5" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="16" coveredstatements="16" elements="21" coveredelements="21"/>
33+
</class>
34+
<line num="29" type="method" name="all" crap="1" count="3"/>
35+
<line num="31" type="stmt" count="3"/>
36+
<line num="39" type="method" name="replace" crap="1" count="1"/>
37+
<line num="41" type="stmt" count="1"/>
38+
<line num="42" type="stmt" count="1"/>
39+
<line num="49" type="method" name="register" crap="2" count="2"/>
40+
<line num="51" type="stmt" count="2"/>
41+
<line num="52" type="stmt" count="2"/>
42+
<line num="54" type="stmt" count="2"/>
43+
<line num="65" type="method" name="create" crap="2" count="3"/>
44+
<line num="67" type="stmt" count="3"/>
45+
<line num="68" type="stmt" count="3"/>
46+
<line num="69" type="stmt" count="1"/>
47+
<line num="72" type="stmt" count="2"/>
48+
<line num="82" type="method" name="getGatewayClassName" crap="3" count="3"/>
49+
<line num="84" type="stmt" count="3"/>
50+
<line num="85" type="stmt" count="1"/>
51+
<line num="89" type="stmt" count="2"/>
52+
<line num="90" type="stmt" count="2"/>
53+
<line num="91" type="stmt" count="1"/>
54+
<line num="93" type="stmt" count="2"/>
55+
<metrics loc="95" ncloc="50" classes="1" methods="5" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="16" coveredstatements="16" elements="21" coveredelements="21"/>
56+
</file>
57+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Parameters.php">
58+
<class name="Parameters" namespace="Recsys\Common">
59+
<metrics methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
60+
</class>
61+
<line num="17" type="method" name="set" crap="1" count="2"/>
62+
<line num="19" type="stmt" count="2"/>
63+
<line num="20" type="stmt" count="2"/>
64+
<metrics loc="21" ncloc="14" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
65+
</file>
66+
<file name="E:\Desktop\open-source\recsys-common\src/Common/ParametersTrait.php">
67+
<class name="ParametersTrait" namespace="Recsys\Common">
68+
<metrics methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="12" coveredstatements="11" elements="17" coveredelements="15"/>
69+
</class>
70+
<line num="32" type="method" name="setParameter" crap="1" count="2"/>
71+
<line num="34" type="stmt" count="2"/>
72+
<line num="36" type="stmt" count="2"/>
73+
<line num="44" type="method" name="getParameter" crap="1" count="1"/>
74+
<line num="46" type="stmt" count="1"/>
75+
<line num="54" type="method" name="getParameters" crap="1" count="7"/>
76+
<line num="56" type="stmt" count="7"/>
77+
<line num="68" type="method" name="initialize" crap="1" count="3"/>
78+
<line num="70" type="stmt" count="3"/>
79+
<line num="72" type="stmt" count="3"/>
80+
<line num="85" type="method" name="validate" crap="3.04" count="1"/>
81+
<line num="87" type="stmt" count="1"/>
82+
<line num="88" type="stmt" count="1"/>
83+
<line num="89" type="stmt" count="1"/>
84+
<line num="90" type="stmt" count="1"/>
85+
<line num="91" type="stmt" count="1"/>
86+
<line num="94" type="stmt" count="0"/>
87+
<metrics loc="95" ncloc="46" classes="1" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="12" coveredstatements="11" elements="17" coveredelements="15"/>
88+
</file>
89+
</package>
90+
<package name="Recsys\Common\Exception">
91+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Exception/InvalidRequestException.php">
92+
<class name="InvalidRequestException" namespace="Recsys\Common\Exception">
93+
<metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
94+
</class>
95+
<metrics loc="15" ncloc="8" classes="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
96+
</file>
97+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Exception/RuntimeException.php">
98+
<class name="RuntimeException" namespace="Recsys\Common\Exception">
99+
<metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
100+
</class>
101+
<metrics loc="15" ncloc="8" classes="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
102+
</file>
103+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Exception/UnknownMethodException.php">
104+
<class name="UnknownMethodException" namespace="Recsys\Common\Exception">
105+
<metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
106+
</class>
107+
<metrics loc="15" ncloc="8" classes="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
108+
</file>
109+
</package>
110+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Exception/RecsysException.php">
111+
<metrics loc="15" ncloc="8" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
112+
</file>
113+
<file name="E:\Desktop\open-source\recsys-common\src/Common/GatewayInterface.php">
114+
<metrics loc="41" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
115+
</file>
116+
<package name="Recsys\Common\Message">
117+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Message/AbstractRequest.php">
118+
<class name="AbstractRequest" namespace="Recsys\Common\Message">
119+
<metrics methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="15" coveredstatements="12" elements="20" coveredelements="16"/>
120+
</class>
121+
<line num="43" type="method" name="__construct" crap="1" count="4"/>
122+
<line num="45" type="stmt" count="4"/>
123+
<line num="46" type="stmt" count="4"/>
124+
<line num="47" type="stmt" count="4"/>
125+
<line num="60" type="method" name="initialize" crap="2" count="6"/>
126+
<line num="62" type="stmt" count="6"/>
127+
<line num="63" type="stmt" count="1"/>
128+
<line num="66" type="stmt" count="6"/>
129+
<line num="68" type="stmt" count="6"/>
130+
<line num="76" type="method" name="getResponse" crap="6" count="0"/>
131+
<line num="78" type="stmt" count="0"/>
132+
<line num="79" type="stmt" count="0"/>
133+
<line num="82" type="stmt" count="0"/>
134+
<line num="90" type="method" name="send" crap="1" count="2"/>
135+
<line num="92" type="stmt" count="2"/>
136+
<line num="94" type="stmt" count="2"/>
137+
<line num="107" type="method" name="setParameter" crap="2" count="2"/>
138+
<line num="109" type="stmt" count="2"/>
139+
<line num="110" type="stmt" count="1"/>
140+
<line num="113" type="stmt" count="1"/>
141+
<metrics loc="115" ncloc="62" classes="1" methods="5" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="15" coveredstatements="12" elements="20" coveredelements="16"/>
142+
</file>
143+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Message/AbstractResponse.php">
144+
<class name="AbstractResponse" namespace="Recsys\Common\Message">
145+
<metrics methods="5" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="12" coveredelements="12"/>
146+
</class>
147+
<line num="35" type="method" name="__construct" crap="1" count="1"/>
148+
<line num="37" type="stmt" count="1"/>
149+
<line num="38" type="stmt" count="1"/>
150+
<line num="39" type="stmt" count="1"/>
151+
<line num="46" type="method" name="getRequest" crap="1" count="1"/>
152+
<line num="48" type="stmt" count="1"/>
153+
<line num="56" type="method" name="getData" crap="1" count="2"/>
154+
<line num="58" type="stmt" count="2"/>
155+
<line num="66" type="method" name="getMessage" crap="1" count="1"/>
156+
<line num="68" type="stmt" count="1"/>
157+
<line num="76" type="method" name="getCode" crap="1" count="1"/>
158+
<line num="78" type="stmt" count="1"/>
159+
<metrics loc="80" ncloc="37" classes="1" methods="5" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="12" coveredelements="12"/>
160+
</file>
161+
</package>
162+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Message/MessageInterface.php">
163+
<metrics loc="22" ncloc="9" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
164+
</file>
165+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Message/RequestInterface.php">
166+
<metrics loc="51" ncloc="17" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
167+
</file>
168+
<file name="E:\Desktop\open-source\recsys-common\src/Common/Message/ResponseInterface.php">
169+
<metrics loc="42" ncloc="15" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
170+
</file>
171+
<package name="Recsys">
172+
<file name="E:\Desktop\open-source\recsys-common\src/Recsys.php">
173+
<class name="Recsys" namespace="Recsys">
174+
<metrics methods="3" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
175+
</class>
176+
<line num="37" type="method" name="getFactory" crap="2" count="3"/>
177+
<line num="39" type="stmt" count="3"/>
178+
<line num="40" type="stmt" count="1"/>
179+
<line num="43" type="stmt" count="3"/>
180+
<line num="51" type="method" name="setFactory" crap="1" count="3"/>
181+
<line num="53" type="stmt" count="3"/>
182+
<line num="54" type="stmt" count="3"/>
183+
<line num="66" type="method" name="__callStatic" crap="1" count="1"/>
184+
<line num="68" type="stmt" count="1"/>
185+
<line num="70" type="stmt" count="1"/>
186+
<metrics loc="72" ncloc="33" classes="1" methods="3" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="10" coveredelements="10"/>
187+
</file>
188+
</package>
189+
<metrics files="15" loc="816" ncloc="384" classes="10" methods="30" coveredmethods="28" conditionals="0" coveredconditionals="0" statements="72" coveredstatements="68" elements="102" coveredelements="96"/>
190+
</project>
191+
</coverage>

‎src/Common/GatewayFactory.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ protected function getGatewayClassName($shortName)
8585
return $shortName;
8686
}
8787

88+
// replace underscores with namespace marker, PSR-0 style
89+
$shortName = str_replace('_', '\\', $shortName);
90+
if (false === strpos($shortName, '\\')) {
91+
$shortName .= '\\';
92+
}
8893
return '\\Recsys\\'.$shortName.'Gateway';
8994
}
9095
}

‎tests/Common/GatewayFactoryTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,19 @@ public function testRegisterExistingGateway()
4141
$this->factory->register('Bar');
4242
$this->assertSame(['Milky', 'Bar'], $this->factory->all());
4343
}
44+
public function testCreateShortName()
45+
{
46+
$gateway = $this->factory->create('Advance_Test');
47+
$this->assertInstanceOf('\\Recsys\\Advance\\TestGateway', $gateway);
48+
}
4449
public function testCreateFullyQualified()
4550
{
4651
$gateway = $this->factory->create('\\Recsys\\Advance\\TestGateway');
4752
$this->assertInstanceOf('\\Recsys\\Advance\\TestGateway', $gateway);
4853
}
4954
/**
5055
* @expectedException \Recsys\Common\Exception\RuntimeException
51-
* @expectedExceptionMessage Class '\Recsys\InvalidGateway' not found
56+
* @expectedExceptionMessage Class '\Recsys\Invalid\Gateway' not found
5257
*/
5358
public function testCreateInvalid()
5459
{

0 commit comments

Comments
 (0)