Skip to content

Commit 11281ff

Browse files
committed
Moved Arangodb and Couchdb to their own extensions
1 parent e356077 commit 11281ff

File tree

20 files changed

+36
-1435
lines changed

20 files changed

+36
-1435
lines changed

.scrutinizer.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
build:
1313
dependencies:
1414
override:
15-
- "composer require -W --ignore-platform-reqs doctrine/couchdb:dev-master phpfastcache/phpssdb:~1.1 predis/predis:~1.1 mongodb/mongodb:~1.9 triagens/arangodb:~3.8 aws/aws-sdk-php:~3.2 google/cloud-firestore:~1.20 solarium/solarium:~6.1"
15+
- "composer require -W --ignore-platform-reqs phpfastcache/phpssdb:~1.1 predis/predis:~1.1 mongodb/mongodb:~1.9 aws/aws-sdk-php:~3.2 google/cloud-firestore:~1.20 solarium/solarium:~6.1"
1616
nodes:
1717
analysis:
1818
project_setup:
1919
override: true
2020
tests:
2121
override: [php-scrutinizer-run]
22-
environment:
23-
php:
22+
environment:
23+
php:
2424
version: 8.0.0
2525
ini:
2626
date.timezone: 'Europe/Paris'
@@ -31,13 +31,13 @@ build:
3131
- memcache
3232
checks:
3333
php: true
34-
coding_style:
35-
php:
36-
spaces:
37-
around_operators:
34+
coding_style:
35+
php:
36+
spaces:
37+
around_operators:
3838
concatenation: true
39-
filter:
40-
excluded_paths:
39+
filter:
40+
excluded_paths:
4141
- .github/*
4242
- bin/*
4343
- docs/*
@@ -48,15 +48,15 @@ filter:
4848
tools:
4949
external_code_coverage: false
5050
php_code_coverage: true
51-
php_code_sniffer:
52-
config:
51+
php_code_sniffer:
52+
config:
5353
standard: PSR12
5454
enabled: true
55-
filter:
56-
paths:
55+
filter:
56+
paths:
5757
- lib/*
58-
php_mess_detector:
58+
php_mess_detector:
5959
enabled: true
60-
filter:
61-
paths:
60+
filter:
61+
paths:
6262
- lib/*

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ before_install:
4141
- composer install
4242
- composer require phwoolcon/ci-pecl-cacher -n
4343
- "./bin/ci/scripts/install_solr.sh || echo \"Solr install failed\""
44-
- "./bin/ci/scripts/install_arangodb.sh || echo \"Arangodb install failed\""
4544
- "./bin/ci/scripts/install_ssdb.sh || echo \"SSDB install failed\""
46-
- "./bin/ci/scripts/install_couchdb.sh || echo \"Couchdb install failed\""
4745
- "./bin/ci/scripts/install_couchbase.sh || echo \"Couchbase install failed\""
4846
- "./bin/ci/scripts/setup_mongodb.sh || echo \"Setup Mongodb failed\""
4947
- "./bin/ci/scripts/setup_gcp.sh || echo \"GCP setup failed\""

EXTENSIONS.MD

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
## As of the 9.2 an extension concept has been introduced.
22

3-
It's pretty but allow Phpfastcache to split up its drivers into sub-repository with a simple additional call to make.
3+
It's pretty new but allow Phpfastcache to split up its drivers into sub-repository with a simple additional call to make.
44

5-
The 9.2 make the beginning of a new external extension: `Couchbasev4`
5+
The 9.2 make the beginning of a new external extensions:
66

7-
There's only 2 steps:
8-
9-
1) Add it to your composer: `composer install phpfastcache/couchbasev4-extension`
10-
2) Call the CacheManager: `CacheManager::getInstance('Couchbasev4')`
11-
12-
Be aware that as of the v10 the following drivers will be **MOVED** to their own sub-repositories an extension:
137
- `Arangodb`
8+
- `Couchbasev4`
149
- `Couchdb`
1510
- `Cassandra`
1611
- `Dynamodb`
1712
- `Firestore`
1813
- `Mongodb`
1914

15+
There's only 2 steps:
16+
17+
1) Add it to your composer: `composer install phpfastcache/couchbasev4-extension`
18+
2) Call the CacheManager: `CacheManager::getInstance('Couchbasev4')`
19+
2020
However `Couchbasev3` will stay in the core for compatibility reason but will be **deprecated**.

bin/ci/scripts/install_arangodb.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

bin/ci/scripts/install_couchdb.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

bin/ci/scripts/install_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ composer install
66
#####
77
# Travis CI have php mongodb extension locked to 1.10, so we must set the mongodb/mongodb minimum version to 1.9 :(
88
#####
9-
composer require -W doctrine/couchdb:dev-master phpfastcache/phpssdb:~1.2 predis/predis:~1.1 mongodb/mongodb:~1.9 triagens/arangodb:~3.8 aws/aws-sdk-php:~3.2 google/cloud-firestore:~1.39 solarium/solarium:~6.1
9+
composer require -W phpfastcache/phpssdb:~1.2 predis/predis:~1.1 mongodb/mongodb:~1.9 triagens/arangodb:~3.8 aws/aws-sdk-php:~3.2 google/cloud-firestore:~1.39 solarium/solarium:~6.1

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
"homepage": "https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors"
2020
}
2121
],
22+
"provide": {
23+
"psr/cache-implementation": "2.0|3.0",
24+
"psr/simple-cache-implementation": "2.0|3.0"
25+
},
2226
"require": {
2327
"php": ">=8.0",
2428
"psr/cache": "^2.0||^3.0",
@@ -56,26 +60,22 @@
5660
"phpfastcache/phpssdb": "~1.1.0",
5761
"solarium/solarium": "~6.1",
5862
"doctrine/couchdb": "^dev-master#9eeb9e5",
59-
"triagens/arangodb": "^3.8",
6063
"google/cloud-firestore": "^1.20",
61-
"aws/aws-sdk-php": "~3.0"
64+
"aws/aws-sdk-php": "~3.0",
65+
"phpfastcache/arangodb-extension": "^9.2",
66+
"phpfastcache/couchdb-extension": "^9.2"
6267
},
6368
"conflict": {
64-
"doctrine/couchdb": "<dev-master#9eeb9e5",
6569
"solarium/solarium": "<6.1"
6670
},
6771
"autoload": {
6872
"psr-4": {
6973
"Phpfastcache\\": "lib/Phpfastcache/"
7074
}
7175
},
72-
"autoload-dev": {
73-
"psr-4": {
74-
"Phpfastcache\\Tests\\": "tests/lib/"
75-
}
76-
},
7776
"scripts": {
7877
"phpcs": "vendor/bin/phpcs lib/ --report=summary",
78+
"phpcbf": "vendor/bin/phpcbf lib/ --report=summary",
7979
"phpmd": "vendor/bin/phpmd lib/ ansi phpmd.xml",
8080
"phpstan": "vendor/bin/phpstan analyse lib/ -l 6 -c phpstan.neon",
8181
"quality": ["@phpcs", "@phpmd", "@phpstan"],

docs/EVENTS.md

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -311,36 +311,11 @@ The order of execution of the events is always the following:
311311

312312
### Driver-specific Events (as of V9)
313313
#### Arangodb
314-
- onArangodbConnection(*Callable* **$callback**)
315-
- **Callback arguments**
316-
- *ExtendedCacheItemPoolInterface* **$itemPool**
317-
- *EventReferenceParameter($connectionOptions)* **$connectionOptions** _via EventReferenceParameter object_ **(type modification forbidden)**
318-
- **Scope**
319-
- Arangodb Driver
320-
- **Description**
321-
- Allow you to alter the parameters built used to connect to Arangodb server
322-
- **Risky Circular Methods**: None
323-
324-
- onArangodbCollectionParams(*Callable* **$callback**)
325-
- **Callback arguments**
326-
- *ExtendedCacheItemPoolInterface* **$itemPool**
327-
- *EventReferenceParameter($params)* **$params** _via EventReferenceParameter object_ **(type modification forbidden)**
328-
- **Scope**
329-
- Arangodb Driver
330-
- **Description**
331-
- Allow you to alter the parameters built used to create the collection
332-
- **Risky Circular Methods**: None
314+
See [Arangodb extension event documentation](https://github.com/PHPSocialNetwork/arangodb-extension#events).
333315

334316
#### Couchdb (v9.2)
335-
- onCouchdbCreateOptions(*Callable* **$callback**)
336-
- **Callback arguments**
337-
- *ExtendedCacheItemPoolInterface* **$itemPool**
338-
- *EventReferenceParameter($options)* **$options** _via EventReferenceParameter object_ **(type modification forbidden)**
339-
- **Scope**
340-
- Arangodb Driver
341-
- **Description**
342-
- Allow you to alter the options built used to create the Couchdb client instance.
343-
- **Risky Circular Methods**: None
317+
See [Couchdb extension event documentation](https://github.com/PHPSocialNetwork/couchdb-extension#events).
318+
344319
#### Dynamodb
345320
- onDynamodbCreateTable(*Callable* **$callback**)
346321
- **Callback arguments**

0 commit comments

Comments
 (0)