Skip to content

Commit 24b8cab

Browse files
committed
* Removed phpcs dep because of PHP 5.3
* Removed @Covers annotation so PHPUnit can decide on it's own.
1 parent 5fde8ab commit 24b8cab

File tree

3 files changed

+10
-32
lines changed

3 files changed

+10
-32
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"php": ">=5.0.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "~4.8|5.7",
21-
"squizlabs/php_codesniffer": "~2.8|3.*"
20+
"phpunit/phpunit": "~4.8|5.7"
2221
},
2322
"autoload": {
2423
"classmap": ["Mobile_Detect.php"],

tests/BasicsTest.php

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function headersProvider()
102102

103103
/**
104104
* @dataProvider headersProvider
105-
* @covers Mobile_Detect::getHttpHeader
105+
* @param array $headers
106106
*/
107107
public function testConstructorInjection(array $headers)
108108
{
@@ -126,7 +126,6 @@ public function testConstructorInjection(array $headers)
126126

127127
/**
128128
* @dataProvider headersProvider
129-
* @covers Mobile_Detect::getHttpHeader
130129
*/
131130
public function testInvalidHeader($headers)
132131
{
@@ -153,8 +152,6 @@ public function userAgentProvider()
153152

154153
/**
155154
* @dataProvider userAgentProvider
156-
* @covers Mobile_Detect::setUserAgent
157-
* @covers Mobile_Detect::getUserAgent
158155
*/
159156
public function testGetUserAgent($headers, $expectedUserAgent)
160157
{
@@ -165,7 +162,6 @@ public function testGetUserAgent($headers, $expectedUserAgent)
165162

166163
/**
167164
* Headers should be reset when you use setHttpHeaders.
168-
* @covers Mobile_Detect::setHttpHeaders
169165
* @issue #144
170166
*/
171167
public function testSetHttpHeaders()
@@ -181,7 +177,6 @@ public function testSetHttpHeaders()
181177

182178
/**
183179
* Read response from cloudfront, if the cloudfront headers are detected
184-
* @covers Mobile_Detect::setCfHeaders
185180
*/
186181
public function testSetCfHeaders()
187182
{
@@ -227,29 +222,19 @@ public function testSetCfHeaders()
227222
$this->assertSame($md->getCfHeaders(), $header4);
228223
}
229224

230-
/**
231-
* @covers Mobile_Detect::setUserAgent
232-
* @covers Mobile_Detect::getUserAgent
233-
*/
234225
public function testSetUserAgent()
235226
{
236227
$md = new Mobile_Detect(array());
237228
$md->setUserAgent('hello world');
238229
$this->assertSame('hello world', $md->getUserAgent());
239230
}
240231

241-
/**
242-
* @covers Mobile_Detect::prepareUserAgent
243-
*/
244232
public function testSetLongUserAgent() {
245233
$md = new Mobile_Detect();
246234
$md->setUserAgent(str_repeat("a", 501));
247235
$this->assertEquals(strlen($md->getUserAgent()), 500);
248236
}
249237

250-
/**
251-
* @covers Mobile_Detect::setDetectionType
252-
*/
253238
public function testSetDetectionType()
254239
{
255240
$md = new Mobile_Detect(array());
@@ -343,7 +328,7 @@ public function quickHeadersData()
343328

344329
/**
345330
* @dataProvider quickHeadersData
346-
* @covers Mobile_Detect::checkHttpHeadersForMobile
331+
* @param $headers
347332
*/
348333
public function testQuickHeaders($headers)
349334
{
@@ -377,7 +362,7 @@ public function quickNonMobileHeadersData()
377362

378363
/**
379364
* @dataProvider quickNonMobileHeadersData
380-
* @covers Mobile_Detect::checkHttpHeadersForMobile
365+
* @param $headers
381366
*/
382367
public function testNonMobileQuickHeaders($headers)
383368
{
@@ -387,7 +372,6 @@ public function testNonMobileQuickHeaders($headers)
387372

388373
/**
389374
* @expectedException BadMethodCallException
390-
* @coversNothing
391375
*/
392376
public function testBadMethodCall()
393377
{
@@ -439,7 +423,6 @@ public function versionDataProvider()
439423

440424
/**
441425
* @dataProvider versionDataProvider
442-
* @covers Mobile_Detect::version
443426
*/
444427
public function testVersionExtraction($userAgent, $property, $stringVersion, $floatVersion)
445428
{
@@ -456,9 +439,6 @@ public function testVersionExtraction($userAgent, $property, $stringVersion, $fl
456439
$this->assertFalse($prop);
457440
}
458441

459-
/**
460-
* @covers Mobile_Detect::getMobileDetectionRules
461-
*/
462442
public function testRules()
463443
{
464444
$md = new Mobile_Detect;
@@ -472,9 +452,6 @@ public function testRules()
472452
$this->assertEquals($count, count($rules));
473453
}
474454

475-
/**
476-
* @covers Mobile_Detect::getMobileDetectionRulesExtended
477-
*/
478455
public function testRulesExtended()
479456
{
480457
$md = new Mobile_Detect;
@@ -490,9 +467,6 @@ public function testRulesExtended()
490467
$this->assertEquals($count, count($rules));
491468
}
492469

493-
/**
494-
* @covers Mobile_Detect::getScriptVersion
495-
*/
496470
public function testScriptVersion()
497471
{
498472
$v = Mobile_Detect::getScriptVersion();
@@ -517,7 +491,6 @@ public function crazyVersionNumbers()
517491

518492
/**
519493
* @dataProvider crazyVersionNumbers
520-
* @covers Mobile_Detect::prepareVersionNo
521494
*/
522495
public function testPrepareVersionNo($raw, $expected)
523496
{

tests/phpunit.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,10 @@
2020
<directory suffix="Test.php">./</directory>
2121
</testsuite>
2222

23+
<filter>
24+
<whitelist>
25+
<file>../Mobile_Detect.php</file>
26+
</whitelist>
27+
</filter>
28+
2329
</phpunit>

0 commit comments

Comments
 (0)