Skip to content

Commit 4d65fb4

Browse files
Remove support for Arango 3.11 and fix dependencies issues (#13)
* fix: use 'sprintf' instead of string interpolation * drop tests for arango 3.11 and add tests with PHP 8.4 * Update php.yml * Update dependencies * composer update + composer bump * Small refactor on AQL namespace * update .gitignore * fix code sniffs * Http namespace refactor
1 parent 8a088e4 commit 4d65fb4

File tree

82 files changed

+847
-582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+847
-582
lines changed

.github/workflows/php.yml

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,29 @@ name: PHP
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
branches: [main, develop]
66
pull_request:
7-
branches: [ main, develop ]
7+
branches: [main, develop]
88

99
permissions:
1010
contents: read
1111

1212
jobs:
13-
arango_3_11:
14-
runs-on: ubuntu-latest
15-
env:
16-
ARANGO_SERVER: 3.11.8
17-
services:
18-
arangodb:
19-
image: 'arangodb/arangodb:3.11.8'
20-
ports:
21-
- 8529:8529
22-
env:
23-
ARANGO_ROOT_PASSWORD: testing
24-
strategy:
25-
fail-fast: false
26-
matrix:
27-
php-versions: ['8.2', '8.3']
28-
29-
steps:
30-
- name: Setup PHP
31-
uses: shivammathur/setup-php@v2
32-
with:
33-
php-version: ${{ matrix.php-versions }}
34-
coverage: xdebug
35-
36-
- name: Check out repository code
37-
uses: actions/checkout@v3
38-
39-
- name: Add testing configuration
40-
run: cp .env.testing .env
41-
42-
- name: Add ArangoDB version to .env
43-
run: echo -e "\nARANGODB_VERSION=$ARANGO_SERVER" >> .env
44-
45-
- name: Install dependencies
46-
run: composer install --no-interaction
47-
48-
- name: Wait ArangoDB to init
49-
run: sleep 30
50-
51-
- name: Run tests suites
52-
run: vendor/bin/phpunit -c phpunit.xml
53-
5413
arango_3_12:
5514
runs-on: ubuntu-latest
5615
env:
57-
ARANGO_SERVER: 3.12.0
16+
ARANGO_SERVER: 3.12.4
5817
services:
5918
arangodb:
60-
image: 'arangodb/arangodb:3.12.0'
19+
image: "arangodb/arangodb:3.12.4"
6120
ports:
6221
- 8529:8529
6322
env:
6423
ARANGO_ROOT_PASSWORD: testing
6524
strategy:
6625
fail-fast: false
6726
matrix:
68-
php-versions: ['8.2', '8.3']
27+
php-versions: ["8.2", "8.3", "8.4"]
6928

7029
steps:
7130
- name: Setup PHP
@@ -91,4 +50,3 @@ jobs:
9150

9251
- name: Run tests suites
9352
run: vendor/bin/phpunit -c phpunit.xml
94-

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build/
99
cache/
1010
coverage.xml
1111
*.phar
12+
.phpactor.json
1213

1314
# Ignore documentation generation script
1415
documentation.php

composer.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@
2121
"require": {
2222
"php": ">=8.2",
2323
"ext-json": "*",
24-
"guzzlehttp/psr7": "^2.3",
25-
"guzzlehttp/guzzle": "^7.4",
26-
"symfony/service-contracts": "3.0.2",
27-
"symfony/event-dispatcher-contracts": "3.0.2",
28-
"symfony/deprecation-contracts": "3.0.2",
29-
"symfony/string": "6.0.10"
24+
"guzzlehttp/guzzle": "^7.10",
25+
"symfony/service-contracts": "^3.6",
26+
"symfony/event-dispatcher-contracts": "^3.6",
27+
"symfony/deprecation-contracts": "^3.6",
28+
"symfony/string": "^7.3.4"
3029
},
3130
"require-dev": {
32-
"phpunit/phpunit": "^9.5",
33-
"vlucas/phpdotenv": "^5.4",
34-
"phpunit/php-code-coverage": "^9.0",
35-
"friendsofphp/php-cs-fixer": "^3.0",
36-
"squizlabs/php_codesniffer": "~3.7"
31+
"phpunit/phpunit": "^9.6.29",
32+
"vlucas/phpdotenv": "^5.6.2",
33+
"phpunit/php-code-coverage": "^9.2.32",
34+
"friendsofphp/php-cs-fixer": "^3.88.2",
35+
"squizlabs/php_codesniffer": "^3.13.4"
3736
},
3837
"autoload": {
3938
"psr-4": {

0 commit comments

Comments
 (0)