Skip to content

Commit 8728898

Browse files
exaby73exaby73
committed
Merge remote-tracking branch 'origin' into feat/8.4-deprecations
2 parents 8ff79cb + 920014a commit 8728898

File tree

8 files changed

+78
-33
lines changed

8 files changed

+78
-33
lines changed

‎.github/workflows/integration-test-cluster-neo4j-4.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@ on:
1111
jobs:
1212
tests:
1313
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
php: [8.1, 8.3]
1417
env:
18+
PHP_VERSION: ${{ matrix.php }}
1519
CONNECTION: neo4j://neo4j:testtest@localhost:7688
16-
name: "Running on PHP 8.1 in a Neo4j 4.4 cluster"
20+
name: "Running on PHP ${{ matrix.php }} in a Neo4j 4.4 cluster"
1721

1822
steps:
1923
- uses: actions/checkout@v2
2024
- name: Populate .env
2125
run: |
22-
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" > .env
26+
echo "PHP_VERSION=${{ matrix.php }}" > .env
27+
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
2328
- uses: hoverkraft-tech/[email protected]
2429
name: Start services
2530
with:

‎.github/workflows/integration-test-cluster-neo4j-5.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@ on:
1111
jobs:
1212
tests:
1313
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
php: [8.1, 8.3]
1417
env:
18+
PHP_VERSION: ${{ matrix.php }}
1519
CONNECTION: neo4j://neo4j:testtest@localhost:7687
16-
name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"
20+
name: "Running on PHP ${{ matrix.php }} with a Neo4j 5.20-enterprise cluster"
1721

1822
steps:
1923
- uses: actions/checkout@v2
2024
- name: Populate .env
2125
run: |
22-
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" > .env
26+
echo "PHP_VERSION=${{ matrix.php }}" > .env
27+
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
2328
- uses: hoverkraft-tech/[email protected]
2429
name: Start services
2530
with:

‎.github/workflows/integration-test-single-server.yml‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ on:
1111
jobs:
1212
tests-v4:
1313
runs-on: ubuntu-latest
14-
name: "Running on PHP 8.1 with a Neo4j 4 instance connecting over all available protocols"
14+
strategy:
15+
matrix:
16+
php: [8.1, 8.3]
17+
name: "Running on PHP ${{ matrix.php }} with a Neo4j 4 instance connecting over all available protocols"
1518

1619
steps:
1720
- uses: actions/checkout@v2
1821
- name: Populate .env
1922
run: |
20-
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" > .env
23+
echo "PHP_VERSION=${{ matrix.php }}" > .env
24+
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
2125
- uses: hoverkraft-tech/[email protected]
2226
name: Start services
2327
with:
@@ -28,22 +32,35 @@ jobs:
2832
docker compose run client composer install
2933
- name: Test neo4j://
3034
run: |
31-
docker compose run -e CONNECTION=neo4j://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
35+
docker compose run \
36+
-e PHP_VERSION=${{ matrix.php }} \
37+
-e CONNECTION=neo4j://neo4j:testtest@neo4j \
38+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
3239
- name: Test bolt://
3340
run: |
34-
docker compose run -e CONNECTION=bolt://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
41+
docker compose run \
42+
-e PHP_VERSION=${{ matrix.php }} \
43+
-e CONNECTION=bolt://neo4j:testtest@neo4j \
44+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
3545
- name: Test http://
3646
run: |
37-
docker compose run -e CONNECTION=http://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
47+
docker compose run \
48+
-e PHP_VERSION=${{ matrix.php }} \
49+
-e CONNECTION=http://neo4j:testtest@neo4j \
50+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
3851
tests-v5:
3952
runs-on: ubuntu-latest
40-
name: "Running on PHP 8.1 with a Neo4j 5 instance connecting over all available protocols"
53+
strategy:
54+
matrix:
55+
php: [8.1, 8.3]
56+
name: "Running on PHP ${{ matrix.php }} with a Neo4j 5 instance connecting over all available protocols"
4157

4258
steps:
4359
- uses: actions/checkout@v2
4460
- name: Populate .env
4561
run: |
46-
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" > .env
62+
echo "PHP_VERSION=${{ matrix.php }}" > .env
63+
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
4764
- uses: hoverkraft-tech/[email protected]
4865
name: Start services
4966
with:
@@ -54,10 +71,19 @@ jobs:
5471
docker compose run client composer install
5572
- name: Test neo4j://
5673
run: |
57-
docker compose run -e CONNECTION=neo4j://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
74+
docker compose run \
75+
-e PHP_VERSION=${{ matrix.php }} \
76+
-e CONNECTION=neo4j://neo4j:testtest@neo4j \
77+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
5878
- name: Test bolt://
5979
run: |
60-
docker compose run -e CONNECTION=bolt://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
80+
docker compose run \
81+
-e PHP_VERSION=${{ matrix.php }} \
82+
-e CONNECTION=bolt://neo4j:testtest@neo4j \
83+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
6184
- name: Test http://
6285
run: |
63-
docker compose run -e CONNECTION=http://neo4j:testtest@neo4j client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
86+
docker compose run \
87+
-e PHP_VERSION=${{ matrix.php }} \
88+
-e CONNECTION=http://neo4j:testtest@neo4j \
89+
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: php-actions/composer@v6
2323
with:
2424
progress: yes
25-
php_version: 8.0
25+
php_version: 8.3
2626
version: 2
2727
- name: "PHP-CS-Fixer"
2828
run: vendor/bin/php-cs-fixer fix --dry-run

‎.github/workflows/unit-test.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ on:
1111
jobs:
1212
tests:
1313
runs-on: ubuntu-latest
14-
name: "Running on PHP 8.1"
14+
name: "Running Unit Tests"
15+
strategy:
16+
matrix:
17+
php: ['8.1', '8.2', '8.3']
1518

1619
steps:
1720
- uses: actions/checkout@v2
@@ -23,12 +26,12 @@ jobs:
2326
- uses: php-actions/composer@v6
2427
with:
2528
progress: yes
26-
php_version: 8.1
29+
php_version: ${{ matrix.php }}
2730
version: 2
2831
- uses: php-actions/phpunit@v3
2932
with:
3033
configuration: phpunit.xml.dist
31-
php_version: 8.1
34+
php_version: ${{ matrix.php }}
3235
memory_limit: 1024M
3336
version: 10
3437
testsuite: Unit

‎Dockerfile‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
FROM php:8.1-cli
2-
3-
RUN apt-get update && \
4-
apt-get install -y && \
5-
libzip-dev && \
6-
unzip && \
7-
git && \
8-
wget && \
9-
docker-php-ext-install -j$(nproc) bcmath sockets && \
10-
wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 && \
11-
mv test-reporter-latest-linux-amd64 /usr/bin/cc-test-reporter && \
12-
chmod +x /usr/bin/cc-test-reporter && \
13-
pecl install xdebug && \
14-
docker-php-ext-enable xdebug && \
1+
ARG PHP_VERSION
2+
3+
FROM php:${PHP_VERSION}-cli
4+
RUN apt-get update \
5+
&& apt-get install -y \
6+
libzip-dev \
7+
unzip \
8+
git \
9+
wget \
10+
&& docker-php-ext-install -j$(nproc) bcmath sockets \
11+
&& wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
12+
&& mv test-reporter-latest-linux-amd64 /usr/bin/cc-test-reporter \
13+
&& chmod +x /usr/bin/cc-test-reporter \
14+
&& pecl install xdebug \
15+
&& docker-php-ext-enable xdebug && \
1516
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
1617

1718
WORKDIR /opt/project

‎docker-compose-neo4j-4.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ services:
3030
build:
3131
context: .
3232
dockerfile: Dockerfile
33+
args:
34+
PHP_VERSION: ${PHP_VERSION}
3335
networks:
3436
- neo4j
3537
volumes:
@@ -44,7 +46,8 @@ services:
4446
context: .
4547
dockerfile: Dockerfile
4648
args:
47-
- WITH_XDEBUG=true
49+
PHP_VERSION: ${PHP_VERSION}
50+
WITH_XDEBUG: true
4851
working_dir: /opt/project
4952
volumes:
5053
- .:/opt/project

‎docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ x-definitions:
2424
build:
2525
context: .
2626
dockerfile: Dockerfile
27+
args:
28+
PHP_VERSION: ${PHP_VERSION}
2729
volumes:
2830
- .:/opt/project
2931
x-common-cluster:

0 commit comments

Comments
 (0)