Skip to content

Commit 6d570a3

Browse files
committed
reworked github workflow
1 parent e91c815 commit 6d570a3

File tree

7 files changed

+19
-38
lines changed

7 files changed

+19
-38
lines changed

.github/workflows/build-package.yml

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

.github/workflows/integration-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
tests:
1111
runs-on: ubuntu-latest
1212
env:
13-
CONNECTIONS: bolt://neo4j:test@localhost,http://neo4j:test@localhost
13+
CONNECTIONS: bolt://neo4j:testtest@localhost,http://neo4j:testtest@localhost,neo4j://neo4j:testtest@localhost
1414
name: "Running Integration tests for PHP 8.0 on Neo4j ${{ matrix.neo4j-version }} with simple config"
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
neo4j-version: ["4.4", "5.1", "5.2"]
18+
neo4j-version: ["4.4", "5"]
1919

2020
services:
2121
neo4j:
@@ -46,4 +46,4 @@ jobs:
4646
php_version: 8.0
4747
version: 2
4848
- name: Run unit tests
49-
run: echo CONNECTIONS=bolt://neo4j:test@localhost,neo4j://neo4j:test@localhost,http://neo4j:test@localhost >> .env && php vendor/bin/phpunit --testsuite Integration --bootstrap tests/bootstrap_override_with_dotenv.php
49+
run: php vendor/bin/phpunit --testsuite Integration

.github/workflows/static-analysis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
9-
- name: "PHP-CS-Fixer"
10-
uses: docker://oskarstark/php-cs-fixer-ga:3.14
9+
- name: Cache Composer dependencies
10+
uses: actions/cache@v2
1111
with:
12-
args: --dry-run
13-
- name: "PSalm"
14-
uses: docker://vimeo/psalm-github-actions:4.29.0
12+
path: /tmp/composer-cache
13+
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
14+
- uses: php-actions/composer@v6
1515
with:
16-
composer_require_dev: true
17-
composer_ignore_platform_reqs: false
16+
progress: yes
17+
php_version: 8.0
18+
version: 2
19+
- name: "PHP-CS-Fixer"
20+
run: vendor/bin/php-cs-fixer fix --dry-run
21+
- name: "PSalm"
22+
run: vendor/bin/psalm --show-info=true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.php_cs.cache
22
.php-cs-fixer.cache
3+
.php-cs-fixer.php
34
cache/
45
vendor/
56
phpunit.xml
File renamed without changes.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apt-get update \
55
unzip \
66
git \
77
wget \
8-
&& docker-php-ext-install -j$(nproc) bcmath \
8+
&& docker-php-ext-install -j$(nproc) bcmath sockets \
99
&& wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
1010
&& mv test-reporter-latest-linux-amd64 /usr/bin/cc-test-reporter \
1111
&& chmod +x /usr/bin/cc-test-reporter \

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"nyholm/psr7-server": "^1.0",
4949
"kriswallsmith/buzz": "^1.2",
5050
"vimeo/psalm": "4.29.0",
51-
"friendsofphp/php-cs-fixer": "^3.13",
51+
"friendsofphp/php-cs-fixer": "3.15.0",
5252
"psalm/plugin-phpunit": "^0.15.1",
5353
"monolog/monolog": "^2.2",
5454
"psr/log": "^1.1",
@@ -59,7 +59,7 @@
5959
"symfony/uid": "^5.0",
6060
"symfony/var-dumper": "^5.0",
6161
"cache/integration-tests": "dev-master",
62-
"kubawerlos/php-cs-fixer-custom-fixers": "^3.11"
62+
"kubawerlos/php-cs-fixer-custom-fixers": "3.13.*"
6363
},
6464
"autoload": {
6565
"psr-4": {

0 commit comments

Comments
 (0)