Skip to content

Commit d93a848

Browse files
Fabio CapucciMulkave
authored andcommitted
Support for Laravel 5.5 (#252)
* Fix Tests * Update to Laravel 5.5 * Updated PhpUnit to v6 * Removed useless folders inside src * L5.5 Auto Discovery * Edit Travis CI * Edit Travis CI * Travis CI Fix Composer not updated
1 parent acff98c commit d93a848

Some content is hidden

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

62 files changed

+79
-61
lines changed

.gitignore

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

77
*.sublime-workspace
8+
9+
.idea

.travis.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
language: php
22

33
php:
4-
- 5.6
54
- 7.0
5+
- 7.1
6+
7+
services:
8+
- neo4j
69

710
matrix:
811
allow_failures:
9-
- hhvm
10-
- php: 7.0
12+
- env: NEO4J_VERSION="2.3"
1113

1214
before_script:
1315
# install dependencies to add repos
@@ -19,26 +21,22 @@ before_script:
1921
- sudo update-alternatives --auto java
2022
- sudo update-alternatives --auto javac
2123
- export JAVA_HOME="/usr/lib/jvm/java-8-oracle"
22-
# install Neo4j
23-
- sudo rm -fv /etc/init.d/neo4j
24-
- wget -O - https://debian.neo4j.org/neotechnology.gpg.key | sudo apt-key add -
25-
- echo 'deb http://debian.neo4j.org/repo stable/' | sudo tee /etc/apt/sources.list.d/neo4j.list
26-
- sudo apt-get update
27-
- sudo apt-get install -y neo4j
28-
- sudo sed -i.bak '/\(dbms\.security\.auth_enabled=\).*/s/^#//g' "/etc/neo4j/neo4j.conf"
29-
- sudo service neo4j restart
30-
- sleep 3 # give neo4j some time to start
3124

3225
# install composer
33-
- composer self-update
34-
- composer install --prefer-source --no-interaction --dev
26+
- travis_retry composer self-update
27+
- travis_retry composer install --prefer-source --no-interaction
3528

3629
script: vendor/bin/phpunit
3730

3831
env:
39-
- NEO4J_VERSION="3.0.4"
40-
- JAVA_HOME="/usr/lib/jvm/java-8-oracle"
41-
- JRE_HOME="/usr/lib/jvm/java-8-oracle"
32+
global:
33+
- NEO4J_AUTH=none
34+
matrix:
35+
- NEO4J_VERSION="2.3"
36+
- NEO4J_VERSION="3.0"
37+
- NEO4J_VERSION="3.1"
38+
- NEO4J_VERSION="3.2"
39+
- NEO4J_VERSION="3.3"
4240

4341
notifications:
4442
slack:

composer.json

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"name": "vinelab/neoeloquent",
33
"description": "Laravel wrapper for the Neo4j graph database REST interface",
4-
"keywords": ["laravel", "neo4j", "graph", "database", "neoeloquent"],
4+
"keywords": [
5+
"laravel",
6+
"neo4j",
7+
"graph",
8+
"database",
9+
"neoeloquent"
10+
],
511
"license": "MIT",
612
"authors": [
713
{
@@ -10,28 +16,36 @@
1016
}
1117
],
1218
"require": {
13-
"php": ">=5.6.4",
14-
"illuminate/support": "5.4.*",
15-
"illuminate/database": "5.4.*",
16-
"illuminate/pagination": "5.4.*",
17-
"illuminate/events": "5.4.*",
19+
"php": ">=7.0.0",
20+
"illuminate/support": "5.5.*",
21+
"illuminate/database": "5.5.*",
22+
"illuminate/pagination": "5.5.*",
23+
"illuminate/events": "5.5.*",
1824
"heydavid713/neo4jphp": "0.1.*",
1925
"nesbot/carbon": "~1.0"
2026
},
2127
"require-dev": {
22-
"phpunit/phpunit": "~5.7",
23-
"mockery/mockery": "0.9.4"
28+
"phpunit/phpunit": "~6.0",
29+
"mockery/mockery": "1.0"
2430
},
2531
"repositories": [
26-
2732
],
2833
"autoload": {
34+
"psr-4": {
35+
"Vinelab\\NeoEloquent\\": "src"
36+
}
37+
},
38+
"autoload-dev": {
2939
"classmap": [
3040
"tests/TestCase.php"
31-
],
32-
"psr-0": {
33-
"Vinelab\\NeoEloquent\\": "src/"
34-
}
41+
]
3542
},
36-
"minimum-stability": "stable"
43+
"minimum-stability": "stable",
44+
"extra": {
45+
"laravel": {
46+
"providers": [
47+
"Vinelab\\NeoEloquent\\NeoEloquentServiceProvider"
48+
]
49+
}
50+
}
3751
}

phpunit.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
43
bootstrap="vendor/autoload.php"
4+
backupStaticAttributes="false"
55
colors="true"
6+
verbose="true"
67
convertErrorsToExceptions="true"
78
convertNoticesToExceptions="true"
89
convertWarningsToExceptions="true"
910
processIsolation="false"
1011
stopOnFailure="false"
11-
syntaxCheck="false"
12+
beStrictAboutTestsThatDoNotTestAnything="false"
1213
>
1314
<testsuites>
1415
<testsuite name="NeoEloquent Test Suite">
File renamed without changes.

0 commit comments

Comments
 (0)