Skip to content

Commit

Permalink
New client integration (#346)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
transistive authored Oct 11, 2021
1 parent f7cb970 commit 4202cbc
Show file tree
Hide file tree
Showing 40 changed files with 562 additions and 720 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ composer.lock

*.sublime-workspace
Examples/**/vendor

.phpunit.result.cache
17 changes: 17 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM php:8.0-alpine

RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
&& pecl install xdebug \
&& docker-php-ext-enable xdebug \
&& apk del -f .build-deps

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

COPY composer.json composer.loc[k] ./

RUN composer install --ignore-platform-reqs #temporary workaround as the bolt library incorrectly enforces the sockets extension

COPY Examples/ ./
COPY src/ ./
COPY tests/ ./
COPY phpunit.xml .travis.yml ./
20 changes: 8 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,33 @@
}
],
"require": {
"php": ">=7.0.0",
"php": ">=7.4",
"illuminate/container": "~5.3.0 || ~5.4.0 || ~5.5.0",
"illuminate/contracts": "~5.3.0 || ~5.4.0 || ~5.5.0",
"illuminate/database": "~5.3.0 || ~5.4.0 || ~5.5.0",
"illuminate/events": "~5.3.0 || ~5.4.0 || ~5.5.0",
"illuminate/support": "~5.3.0 || ~5.4.0 || ~5.5.0",
"illuminate/pagination": "~5.3.0 || ~5.4.0 || ~5.5.0",
"nesbot/carbon": "^1.0.0",
"graphaware/neo4j-bolt": "dev-feature/causal-cluster-support"
"laudis/neo4j-php-client": "2.1.2"
},
"require-dev": {
"mockery/mockery": "~1.3.0",
"phpunit/phpunit": "~6.0",
"phpunit/phpunit": "^9.0",
"symfony/var-dumper": "*",
"fzaninotto/faker": "~1.4",
"composer/composer": "^2.1"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/Vinelab/neo4j-bolt-php.git"
}
],
"autoload": {
"classmap": [
"tests/TestCase.php"
],
"psr-4": {
"Vinelab\\NeoEloquent\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Vinelab\\NeoEloquent\\Tests\\": "tests/"
}
},
"minimum-stability": "stable",
"suggest": {
"vinelab/neoeloquent: 1.5-dev": "Added support for Laravel 5.4. NeoEloquentServiceProvider52 was deprecated please use NeoEloquentServiceProvider"
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ version: '3.7'
services:
# Docker Image: https://hub.docker.com/r/vinelab/nginx-php
app:
image: vinelab/nginx-php:composer
build:
context: .
ports:
- ${DOCKER_HOST_APP_PORT:-8000}:80
volumes:
Expand All @@ -16,7 +17,7 @@ services:
neo4j:
environment:
- NEO4J_AUTH=none
image: neo4j:3.2.14
image: neo4j:4.0
ports:
- ${DOCKER_HOST_NEO4J_HTTP_PORT:-7474}:7474
- ${DOCKER_HOST_NEO4J_BOLT_PORT:-7687}:7687
Expand Down
1 change: 0 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
>
<testsuites>
<testsuite name="NeoEloquent Test Suite">
Expand Down
Loading

0 comments on commit 4202cbc

Please sign in to comment.