Skip to content

Commit 4202cbc

Browse files
authored
New client integration (#346)
* updated dependencies and basic php version * first green tests * greenbarred AddDropLabelsTest * greenbarred BeongsToManyRelationTest * greenbarred BelongsToRelationTest * greenbarred HasMnayRelationTest * greenbarred HasOneRelationTest * greenbarred ModelEventsTest * greenbarred OrdersAndLimitsTest * greenbarred ParameterGroupingTest * greenbarred PolymorphicHyperMorphToTest * greenbarred QueryingRelationsTest * greenbarred QueryScopesTest * greenbarred SimpleCRUDTest * greenbarred WheresTheTest * greenbarred all function tests * greenbarred ConnectionTest * greenbarred ConnectionFactoryTest * greenbarred BuilderTest * greenbarred GrammarTest * greenbarred ModelTest * greenbarred EloquentBuilderTest * greenbarred all tests * switched to alpine * updated client dependency * reworked authentication to not have to encode it * some code cleaning * Corrected autoloading tests * upgraded build steps to include all source files and composer installation * moved tests to dev autoload and removed vcs project
1 parent f7cb970 commit 4202cbc

40 files changed

+562
-720
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ composer.lock
66

77
*.sublime-workspace
88
Examples/**/vendor
9+
10+
.phpunit.result.cache

Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM php:8.0-alpine
2+
3+
RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
4+
&& pecl install xdebug \
5+
&& docker-php-ext-enable xdebug \
6+
&& apk del -f .build-deps
7+
8+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
9+
10+
COPY composer.json composer.loc[k] ./
11+
12+
RUN composer install --ignore-platform-reqs #temporary workaround as the bolt library incorrectly enforces the sockets extension
13+
14+
COPY Examples/ ./
15+
COPY src/ ./
16+
COPY tests/ ./
17+
COPY phpunit.xml .travis.yml ./

composer.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,33 @@
2020
}
2121
],
2222
"require": {
23-
"php": ">=7.0.0",
23+
"php": ">=7.4",
2424
"illuminate/container": "~5.3.0 || ~5.4.0 || ~5.5.0",
2525
"illuminate/contracts": "~5.3.0 || ~5.4.0 || ~5.5.0",
2626
"illuminate/database": "~5.3.0 || ~5.4.0 || ~5.5.0",
2727
"illuminate/events": "~5.3.0 || ~5.4.0 || ~5.5.0",
2828
"illuminate/support": "~5.3.0 || ~5.4.0 || ~5.5.0",
2929
"illuminate/pagination": "~5.3.0 || ~5.4.0 || ~5.5.0",
3030
"nesbot/carbon": "^1.0.0",
31-
"graphaware/neo4j-bolt": "dev-feature/causal-cluster-support"
31+
"laudis/neo4j-php-client": "2.1.2"
3232
},
3333
"require-dev": {
3434
"mockery/mockery": "~1.3.0",
35-
"phpunit/phpunit": "~6.0",
35+
"phpunit/phpunit": "^9.0",
3636
"symfony/var-dumper": "*",
3737
"fzaninotto/faker": "~1.4",
3838
"composer/composer": "^2.1"
3939
},
40-
"repositories": [
41-
{
42-
"type": "vcs",
43-
"url": "https://github.com/Vinelab/neo4j-bolt-php.git"
44-
}
45-
],
4640
"autoload": {
47-
"classmap": [
48-
"tests/TestCase.php"
49-
],
5041
"psr-4": {
5142
"Vinelab\\NeoEloquent\\": "src/"
5243
}
5344
},
45+
"autoload-dev": {
46+
"psr-4": {
47+
"Vinelab\\NeoEloquent\\Tests\\": "tests/"
48+
}
49+
},
5450
"minimum-stability": "stable",
5551
"suggest": {
5652
"vinelab/neoeloquent: 1.5-dev": "Added support for Laravel 5.4. NeoEloquentServiceProvider52 was deprecated please use NeoEloquentServiceProvider"

docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ version: '3.7'
44
services:
55
# Docker Image: https://hub.docker.com/r/vinelab/nginx-php
66
app:
7-
image: vinelab/nginx-php:composer
7+
build:
8+
context: .
89
ports:
910
- ${DOCKER_HOST_APP_PORT:-8000}:80
1011
volumes:
@@ -16,7 +17,7 @@ services:
1617
neo4j:
1718
environment:
1819
- NEO4J_AUTH=none
19-
image: neo4j:3.2.14
20+
image: neo4j:4.0
2021
ports:
2122
- ${DOCKER_HOST_NEO4J_HTTP_PORT:-7474}:7474
2223
- ${DOCKER_HOST_NEO4J_BOLT_PORT:-7687}:7687

phpunit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
>
1312
<testsuites>
1413
<testsuite name="NeoEloquent Test Suite">

0 commit comments

Comments
 (0)