Skip to content

Commit 6b65175

Browse files
committed
Pulled out Couchdb dependency to our own one
1 parent 1287abf commit 6b65175

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

composer.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,26 @@
2323
"php": "^5.6 || ^7.0",
2424
"psr/cache": "~1.0.0",
2525
"psr/simple-cache": "~1.0.0",
26-
"phpfastcache/phpssdb": "~1.0.0",
27-
"mongodb/mongodb": "^1.1",
2826
"ext-mbstring": "*",
2927
"ext-json": "*"
30-
3128
},
3229
"suggest": {
3330
"ext-apc": "*",
3431
"ext-intl": "*",
3532
"ext-memcached": "*",
3633
"ext-memcache": "*",
3734
"ext-redis": "*",
38-
"ext-predis": "*",
35+
"ext-xcache": "*",
3936
"ext-sqlite": "*",
37+
"ext-wincache": "*",
38+
"ext-leveldb": "*",
4039
"predis/predis": "~1.1.0",
41-
"doctrine/couchdb": "@dev"
40+
"mongodb/mongodb": "^1.1",
41+
"phpfastcache/phpssdb": "~1.0.0",
42+
"phpfastcache/couchdb": "~1.0.0"
43+
},
44+
"conflict": {
45+
"doctrine/couchdb": "*"
4246
},
4347
"autoload": {
4448
"psr-4": {

src/phpFastCache/Drivers/Couchdb/Driver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,16 @@ protected function getLatestDocumentRevision($docId)
194194
$path = '/' . $this->getDatabaseName() . '/' . urlencode($docId);
195195

196196
$response = $this->instance->getHttpClient()->request(
197-
'GET',// At this moment HEAD requests are not working: https://github.com/doctrine/couchdb-client/issues/72
197+
'HEAD',
198198
$path,
199199
null,
200200
false
201201
);
202202
if(!empty($response->headers['etag'])){
203203
return trim($response->headers['etag'], " '\"\t\n\r\0\x0B");
204-
}else{
205-
return null;
206204
}
205+
206+
return null;
207207
}
208208

209209
/**

0 commit comments

Comments
 (0)