Skip to content

Commit 4c25a37

Browse files
SwaderSwader
committedApr 8, 2016
Fixes #42
·
2.0.102.0.1
1 parent 2ac4986 commit 4c25a37

11 files changed

+61
-46
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Full documentation available [here](http://diffbot-php-client-docs.readthedocs.o
1212

1313
## Requirements
1414

15-
Minimum PHP 5.6 is required.
15+
Minimum PHP 5.6 is required. PHP 7.0 is recommended.
1616

1717
This package uses some non-stable packages, so you must set your project's minimum stability to something like beta or dev in `composer.json`:
1818

‎puli.json

+13
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
"installer": "composer",
7474
"env": "dev"
7575
},
76+
"paragonie/random_compat": {
77+
"install-path": "vendor/paragonie/random_compat",
78+
"installer": "composer"
79+
},
7680
"php-http/client-common": {
7781
"install-path": "vendor/php-http/client-common",
7882
"installer": "composer"
@@ -220,6 +224,11 @@
220224
"installer": "composer",
221225
"env": "dev"
222226
},
227+
"sebastian/object-enumerator": {
228+
"install-path": "vendor/sebastian/object-enumerator",
229+
"installer": "composer",
230+
"env": "dev"
231+
},
223232
"sebastian/recursion-context": {
224233
"install-path": "vendor/sebastian/recursion-context",
225234
"installer": "composer",
@@ -249,6 +258,10 @@
249258
"installer": "composer",
250259
"env": "dev"
251260
},
261+
"symfony/filesystem": {
262+
"install-path": "vendor/symfony/filesystem",
263+
"installer": "composer"
264+
},
252265
"symfony/polyfill-mbstring": {
253266
"install-path": "vendor/symfony/polyfill-mbstring",
254267
"installer": "composer",

‎src/Abstracts/Api.php

+2
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ public function buildUrl()
105105
$url .= '&url=' . urlencode($this->url);
106106
}
107107

108+
$url .= '&timeout='.$this->timeout;
109+
108110
// Add Custom Fields
109111
$fields = $this->fieldSettings;
110112
$fieldString = '';

‎tests/Api/AnalyzeApiTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testBuildUrlNoCustomFields()
4040
$url = $this
4141
->apiWithMock
4242
->buildUrl();
43-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com';
43+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000';
4444
$this->assertEquals($expectedUrl, $url);
4545
}
4646

@@ -50,7 +50,7 @@ public function testBuildUrlOneCustomField()
5050
->apiWithMock
5151
->setMeta(true)
5252
->buildUrl();
53-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta';
53+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta';
5454
$this->assertEquals($expectedUrl, $url);
5555
}
5656

@@ -61,7 +61,7 @@ public function testBuildUrlTwoCustomFields()
6161
->setMeta(true)
6262
->setLinks(true)
6363
->buildUrl();
64-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links';
64+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links';
6565
$this->assertEquals($expectedUrl, $url);
6666
}
6767

@@ -74,7 +74,7 @@ public function testBuildUrlFourCustomFields()
7474
->setBreadcrumb(true)
7575
->setQuerystring(true)
7676
->buildUrl();
77-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links,breadcrumb,querystring';
77+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring';
7878
$this->assertEquals($expectedUrl, $url);
7979
}
8080

@@ -85,7 +85,7 @@ public function testBuildUrlOtherOptionsOnly()
8585
->setMode('article')
8686
->buildUrl();
8787

88-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&discussion=false&mode=article';
88+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&discussion=false&mode=article';
8989
$this->assertEquals($expectedUrl, $url);
9090
}
9191

@@ -100,7 +100,7 @@ public function testBuildUrlOtherOptionsAndCustomFields()
100100
->setDiscussion(false)
101101
->setMode('product')
102102
->buildUrl();
103-
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links,breadcrumb,querystring&discussion=false&mode=product';
103+
$expectedUrl = 'https://api.diffbot.com/v3/analyze?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring&discussion=false&mode=product';
104104
$this->assertEquals($expectedUrl, $url);
105105
}
106106

‎tests/Api/ArticleApiTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testBuildUrlNoCustomFields()
4747
$url = $this
4848
->apiWithMock
4949
->buildUrl();
50-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com';
50+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000';
5151
$this->assertEquals($expectedUrl, $url);
5252
}
5353

@@ -57,7 +57,7 @@ public function testBuildUrlOneCustomField()
5757
->apiWithMock
5858
->setMeta(true)
5959
->buildUrl();
60-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta';
60+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta';
6161
$this->assertEquals($expectedUrl, $url);
6262
}
6363

@@ -68,7 +68,7 @@ public function testBuildUrlTwoCustomFields()
6868
->setMeta(true)
6969
->setLinks(true)
7070
->buildUrl();
71-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links';
71+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links';
7272
$this->assertEquals($expectedUrl, $url);
7373
}
7474

@@ -82,7 +82,7 @@ public function testBuildUrlFourCustomFields()
8282
->setQuerystring(true)
8383
->setSentiment(true)
8484
->buildUrl();
85-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links,breadcrumb,querystring,sentiment';
85+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring,sentiment';
8686
$this->assertEquals($expectedUrl, $url);
8787
}
8888

@@ -94,7 +94,7 @@ public function testBuildUrlOtherOptionsOnly()
9494
->setDiscussion(false)
9595
->buildUrl();
9696

97-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&paging=false&maxTags=10&discussion=false';
97+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&paging=false&maxTags=10&discussion=false';
9898
$this->assertEquals($expectedUrl, $url);
9999
}
100100

@@ -109,7 +109,7 @@ public function testBuildUrlOtherOptionsAndCustomFields()
109109
->setQuerystring(true)
110110
->setMaxTags(10)
111111
->buildUrl();
112-
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links,breadcrumb,querystring&paging=false&maxTags=10';
112+
$expectedUrl = 'https://api.diffbot.com/v3/article?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring&paging=false&maxTags=10';
113113
$this->assertEquals($expectedUrl, $url);
114114
}
115115

‎tests/Api/CrawlTest.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public function testBuildUrlArticleApi()
4343
{
4444
$api = $this->diffbot->createArticleAPI('crawl')->setDiscussion(false);
4545

46-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Farticle%3F%26discussion%3Dfalse';
46+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Farticle%3F%26timeout%3D30000%26discussion%3Dfalse';
4747
$c = $this->diffbot->crawl('sitepoint_01', $api);
4848
$c->setSeeds(['http://sitepoint.com']);
4949
$this->assertEquals($expected, $c->buildUrl());
5050
}
5151

5252
public function testBuildUrlDefaultApi()
5353
{
54-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
54+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
5555
$c = $this->diffbot->crawl('sitepoint_01');
5656
$c->setSeeds(['http://sitepoint.com']);
5757
$this->assertEquals($expected, $c->buildUrl());
@@ -67,7 +67,7 @@ public function testInvalidSeeds()
6767

6868
public function testPatternSetters()
6969
{
70-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&pageProcessPattern=class%3DarticleBody&urlCrawlPattern=%2Fcategory%2Fshoes||%21%2Fauthor%2F||%5Ehttp%3A%2F%2Fwww.diffbot.com||type%3Dproduct%24&urlProcessPattern=%2Fproduct%2Fdetail||%21%3Fcurrency%3Deuro&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
70+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&pageProcessPattern=class%3DarticleBody&urlCrawlPattern=%2Fcategory%2Fshoes||%21%2Fauthor%2F||%5Ehttp%3A%2F%2Fwww.diffbot.com||type%3Dproduct%24&urlProcessPattern=%2Fproduct%2Fdetail||%21%3Fcurrency%3Deuro&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
7171
$c = $this->diffbot->crawl('sitepoint_01');
7272
$c->setSeeds(['http://sitepoint.com']);
7373

@@ -85,7 +85,7 @@ public function testPatternSetters()
8585

8686
public function testRegexSetters()
8787
{
88-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&urlCrawlRegEx=/^[a-z0-9_-]{3,16}$/&urlProcessRegEx=/^#?([a-f0-9]{6}|[a-f0-9]{3})$/&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
88+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&urlCrawlRegEx=/^[a-z0-9_-]{3,16}$/&urlProcessRegEx=/^#?([a-f0-9]{6}|[a-f0-9]{3})$/&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
8989
$c = $this->diffbot->crawl('sitepoint_01');
9090
$c->setSeeds(['http://sitepoint.com']);
9191

@@ -114,7 +114,7 @@ public function maxHopsProvider()
114114
*/
115115
public function testMaxHops($input, $urlFragment)
116116
{
117-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxHops=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
117+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxHops=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
118118
$c = $this->diffbot->crawl('sitepoint_01');
119119
$c->setSeeds(['http://sitepoint.com']);
120120

@@ -142,7 +142,7 @@ public function maxProvider()
142142
*/
143143
public function testMax($input, $urlFragment)
144144
{
145-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxToCrawl=' . $urlFragment . '&maxToProcess=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
145+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxToCrawl=' . $urlFragment . '&maxToProcess=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
146146
$c = $this->diffbot->crawl('sitepoint_01');
147147
$c->setSeeds(['http://sitepoint.com']);
148148

@@ -177,7 +177,7 @@ public function notifyProviderOk()
177177
*/
178178
public function testNotify($input, $urlFragment)
179179
{
180-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
180+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
181181
$c = $this->diffbot->crawl('sitepoint_01');
182182
$c->setSeeds(['http://sitepoint.com']);
183183

@@ -230,7 +230,7 @@ public function crawlDelayProviderOk()
230230
*/
231231
public function testCrawlOk($input, $urlFragment)
232232
{
233-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&crawlDelay=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
233+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&crawlDelay=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
234234
$c = $this->diffbot->crawl('sitepoint_01');
235235
$c->setSeeds(['http://sitepoint.com']);
236236

@@ -280,7 +280,7 @@ public function repeatProviderOk()
280280
*/
281281
public function testRepeatOk($input, $urlFragment)
282282
{
283-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&repeat=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
283+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&repeat=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
284284
$c = $this->diffbot->crawl('sitepoint_01');
285285
$c->setSeeds(['http://sitepoint.com']);
286286

@@ -314,8 +314,8 @@ public function testRepeatNotOk($input)
314314

315315
public function testOnlyProcessIfNew()
316316
{
317-
$expected1 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&onlyProcessIfNew=1&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
318-
$expected2 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&onlyProcessIfNew=0&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
317+
$expected1 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&onlyProcessIfNew=1&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
318+
$expected2 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&onlyProcessIfNew=0&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
319319

320320
$c = $this->diffbot->crawl('sitepoint_01');
321321
$c->setSeeds(['http://sitepoint.com']);
@@ -345,7 +345,7 @@ public function maxRoundsProvider()
345345
*/
346346
public function testMaxRounds($input, $urlFragment)
347347
{
348-
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxRounds=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
348+
$expected = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&maxRounds=' . $urlFragment . '&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
349349
$c = $this->diffbot->crawl('sitepoint_01');
350350
$c->setSeeds(['http://sitepoint.com']);
351351

@@ -356,8 +356,8 @@ public function testMaxRounds($input, $urlFragment)
356356

357357
public function testObeyRobots()
358358
{
359-
$expected1 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&obeyRobots=1&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
360-
$expected2 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&obeyRobots=0&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26mode%3Dauto';
359+
$expected1 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&obeyRobots=1&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
360+
$expected2 = 'https://api.diffbot.com/v3/crawl?token=demo&name=sitepoint_01&seeds=http%3A%2F%2Fsitepoint.com&obeyRobots=0&apiUrl=https%3A%2F%2Fapi.diffbot.com%2Fv3%2Fanalyze%3F%26timeout%3D30000%26mode%3Dauto';
361361
$c = $this->diffbot->crawl('sitepoint_01');
362362
$c->setSeeds(['http://sitepoint.com']);
363363

‎tests/Api/CustomApiTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ public function apiNameProvider()
3737
return [
3838
[
3939
'custom',
40-
'https://api.diffbot.com/v3/custom?token=demo&url=http%3A%2F%2Fsample-url.com'
40+
'https://api.diffbot.com/v3/custom?token=demo&url=http%3A%2F%2Fsample-url.com&timeout=30000'
4141
],
4242
[
4343
'authorFolioNew',
44-
'https://api.diffbot.com/v3/authorFolioNew?token=demo&url=http%3A%2F%2Fsample-url.com'
44+
'https://api.diffbot.com/v3/authorFolioNew?token=demo&url=http%3A%2F%2Fsample-url.com&timeout=30000'
4545
],
4646
[
4747
'authorFolioNew/something',
48-
'https://api.diffbot.com/v3/authorFolioNew/something?token=demo&url=http%3A%2F%2Fsample-url.com'
48+
'https://api.diffbot.com/v3/authorFolioNew/something?token=demo&url=http%3A%2F%2Fsample-url.com&timeout=30000'
4949
],
5050
[
5151
'my-api',
52-
'https://api.diffbot.com/v3/my-api?token=demo&url=http%3A%2F%2Fsample-url.com'
52+
'https://api.diffbot.com/v3/my-api?token=demo&url=http%3A%2F%2Fsample-url.com&timeout=30000'
5353
],
5454
[
5555
'my-api?param=value',
56-
'https://api.diffbot.com/v3/my-api?param=value?token=demo&url=http%3A%2F%2Fsample-url.com'
56+
'https://api.diffbot.com/v3/my-api?param=value?token=demo&url=http%3A%2F%2Fsample-url.com&timeout=30000'
5757
]
5858
];
5959
}

‎tests/Api/DiscussionApiTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testBuildUrlNoCustomFields()
4545
$url = $this
4646
->apiWithMock
4747
->buildUrl();
48-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com';
48+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000';
4949
$this->assertEquals($expectedUrl, $url);
5050
}
5151

@@ -55,7 +55,7 @@ public function testBuildUrlOneCustomField()
5555
->apiWithMock
5656
->setMeta(true)
5757
->buildUrl();
58-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&fields=meta';
58+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000&fields=meta';
5959
$this->assertEquals($expectedUrl, $url);
6060
}
6161

@@ -66,7 +66,7 @@ public function testBuildUrlTwoCustomFields()
6666
->setMeta(true)
6767
->setLinks(true)
6868
->buildUrl();
69-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&fields=meta,links';
69+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000&fields=meta,links';
7070
$this->assertEquals($expectedUrl, $url);
7171
}
7272

@@ -80,7 +80,7 @@ public function testBuildUrlFourCustomFields()
8080
->setQuerystring(true)
8181
->setSentiment(true)
8282
->buildUrl();
83-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&fields=meta,links,breadcrumb,querystring,sentiment';
83+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring,sentiment';
8484
$this->assertEquals($expectedUrl, $url);
8585
}
8686

@@ -90,7 +90,7 @@ public function testBuildUrlOtherOptionsOnly()
9090
->setMaxPages(10)
9191
->buildUrl();
9292

93-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&maxPages=10';
93+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000&maxPages=10';
9494
$this->assertEquals($expectedUrl, $url);
9595
}
9696

@@ -104,7 +104,7 @@ public function testBuildUrlOtherOptionsAndCustomFields()
104104
->setQuerystring(true)
105105
->setMaxPages('all')
106106
->buildUrl();
107-
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&fields=meta,links,breadcrumb,querystring&maxPages=all';
107+
$expectedUrl = 'https://api.diffbot.com/v3/discussion?token=demo&url=https%3A%2F%2Fdiscussion-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring&maxPages=all';
108108
$this->assertEquals($expectedUrl, $url);
109109
}
110110

‎tests/Api/ImageApiTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testBuildUrlNoCustomFields()
4545
$url = $this
4646
->apiWithMock
4747
->buildUrl();
48-
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com';
48+
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000';
4949
$this->assertEquals($expectedUrl, $url);
5050
}
5151

@@ -55,7 +55,7 @@ public function testBuildUrlOneCustomField()
5555
->apiWithMock
5656
->setMeta(true)
5757
->buildUrl();
58-
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta';
58+
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta';
5959
$this->assertEquals($expectedUrl, $url);
6060
}
6161

@@ -66,7 +66,7 @@ public function testBuildUrlTwoCustomFields()
6666
->setMeta(true)
6767
->setLinks(true)
6868
->buildUrl();
69-
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links';
69+
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links';
7070
$this->assertEquals($expectedUrl, $url);
7171
}
7272

@@ -82,7 +82,7 @@ public function testBuildUrlFourCustomFields()
8282
->setFaces(true)
8383
->setMentions(true)
8484
->buildUrl();
85-
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&fields=meta,links,breadcrumb,querystring,ocr,faces,mentions';
85+
$expectedUrl = 'https://api.diffbot.com/v3/image?token=demo&url=https%3A%2F%2Farticle-mock.com&timeout=30000&fields=meta,links,breadcrumb,querystring,ocr,faces,mentions';
8686
$this->assertEquals($expectedUrl, $url);
8787
}
8888

‎tests/Api/ProductApiTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testBuildUrlNoCustomFields()
4949
$url = $this
5050
->apiWithMock
5151
->buildUrl();
52-
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com';
52+
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com&timeout=30000';
5353
$this->assertEquals($expectedUrl, $url);
5454
}
5555

@@ -61,7 +61,7 @@ public function testBuildUrlMultipleCustomFields()
6161
->setSize(true)
6262
->setAvailability(true)
6363
->buildUrl();
64-
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com&fields=colors,size,availability';
64+
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com&timeout=30000&fields=colors,size,availability';
6565
$this->assertEquals($expectedUrl, $url);
6666
}
6767

@@ -74,7 +74,7 @@ public function testBuildUrlMultipleCustomFieldsAndOtherOptions()
7474
->setAvailability(true)
7575
->setDiscussion(false)
7676
->buildUrl();
77-
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com&fields=colors,size,availability&discussion=false';
77+
$expectedUrl = 'https://api.diffbot.com/v3/product?token=demo&url=https%3A%2F%2Fdogbrush-mock.com&timeout=30000&fields=colors,size,availability&discussion=false';
7878
$this->assertEquals($expectedUrl, $url);
7979
}
8080
}

‎tests/Api/SearchCustomMocksTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function searchInfoProvider()
108108
*/
109109
public function testSearchInfo($case, $expectations)
110110
{
111-
$this->markTestSkipped('Bugged due to JSONC: https://github.com/Swader/diffbot-php-client/issues/12');
111+
// $this->markTestSkipped('Bugged due to JSONC: https://github.com/Swader/diffbot-php-client/issues/12');
112112
$this->diffbot->setHttpClient($this->getCustomMockFakeClient($this->mockPrefix . $case['file']));
113113

114114
$searchInfo = $this->diffbot->search($case['q'])->call(true);

0 commit comments

Comments
 (0)
Please sign in to comment.