Merge pull request #59 from PommeVerte/travis-fix

Fixing the travis build
dmill-bz · Nov 21, 2020 · b9b1ff1 · b9b1ff1
2 parents 02e42b1 + fb2a01e
commit b9b1ff1
Show file tree

Hide file tree

Showing 10 changed files with 1,669 additions and 532 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,29 +1,23 @@
 language: php
-
 php:
-  - 5.5
   - 5.6
-  - 7.0
-#  - hhvm
-  - nightly
-
-dist: trusty
+  - 7.2
 
-matrix:
-  allow_failures:
-    - php: nightly
+dist: xenial
+addons:
+  apt:
+    packages:
+      - openjdk-8-jdk
 
 before_install:
   - sudo apt-get update > /dev/null
 
 install:
-  # install Oracle JDK8
-  - sh -c ./build/server/jdk8-install.sh
   # install gremlin-server
   - sh -c ./build/server/install.sh
+  # set and install composer dependencies
   - if [ -n "$GH_TOKEN" ]; then composer config --global github-oauth.github.com ${GH_TOKEN}; else echo "no token"; fi
-  - composer global require "fxp/composer-asset-plugin:~1.4"
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]] || [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer update -v; else composer install; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]] || [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer update -v; else composer install -v; fi
 
 script: if [[ ${GRAPHSON_VERSION} == "3.0" ]]; then vendor/bin/phpunit --configuration build/phpunit.xml --testsuit graphson3; else vendor/bin/phpunit --configuration build/phpunit.xml --testsuit graphson1; fi
 
@@ -32,11 +26,11 @@ after_success:
 
 env:
   matrix:
-    - GREMLINSERVER_VERSION="3.2.8" GRAPHSON_VERSION="1.0"
-    - GREMLINSERVER_VERSION="3.3.2" GRAPHSON_VERSION="1.0"
-    - GREMLINSERVER_VERSION="3.3.2" GRAPHSON_VERSION="3.0"
-    - GREMLINSERVER_VERSION="3.4.0" GRAPHSON_VERSION="1.0"
-    - GREMLINSERVER_VERSION="3.4.0" GRAPHSON_VERSION="3.0"
+    - GREMLINSERVER_VERSION="3.2.11" GRAPHSON_VERSION="1.0"
+    - GREMLINSERVER_VERSION="3.3.11" GRAPHSON_VERSION="1.0"
+    - GREMLINSERVER_VERSION="3.3.11" GRAPHSON_VERSION="3.0"
+    - GREMLINSERVER_VERSION="3.4.8" GRAPHSON_VERSION="1.0"
+    - GREMLINSERVER_VERSION="3.4.8" GRAPHSON_VERSION="3.0"
 
 deploy:
   provider: pages
@@ -50,4 +44,4 @@ deploy:
   project-name: PommeVerte/gremlin-php
   on:
     branch: master
-    condition: $TRAVIS_PHP_VERSION = "5.6" && $GRAPHSON_VERSION = "3.0"
+    condition: $TRAVIS_PHP_VERSION = "5.6" && $GRAPHSON_VERSION = "3.0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+3.1.2 (in progress)
+=====
+- Dropped CI testing for `php 5.5`. This library should still be compatible, with `5.5` and `5.4` but travis setups are failing because of a potential `GnuTLs` or `pycurl` bug ([Launchpad Bug #926548](https://bugs.launchpad.net/ubuntu/+source/pycurl/+bug/926548))
+
+
 3.1.1
 =====
 - Fixed issue #51 by implementing deserialization support for `g:T`
@@ -17,7 +22,7 @@
 - Fixed an issue where using authentication and sessions could fail to maintain the session
 - Added a basic GraphSON 3.0 serializer. Until gremlin server `3.2.x` is no longer maintained, bellow will be the correct way of setting the serializer up.
   ```php
-  $db = ne Connection();
+  $db = new Connection();
   $db->message->registerSerializer('\Brightzone\GremlinDriver\Serializers\Gson3', TRUE);
   ```
   This will later be changed to the default. After which a serializer option will be added to `Connection`
@@ -183,7 +188,7 @@
 =====
 2.0 supports TP 3.0.1 with authentication features. There was a major overhaul of the code in order to make the API clearer and to stick to PSR-4 namespaces. Bellow are the BC breaking changes you will need to make if you are upgrading from v1.0 :
 
-#####Breaking changes
+##### Breaking changes
 - Namespaces currently changed from `\brightzone\rexpro\*` to `\Brightzone\GremlinDriver\*` and so forth all in CamelCase. You will need to change these in your code to reflect the change.
 - The Message class has been changed from `\Brightzone\GremlinDriver\Messages` to `\Brightzone\GremlinDriver\Message`. I you use messages directly in your code you will need to switch for the newer one.
 - Tests have been moved from `src/tests` to `tests/`. This probably doesn't affect you, but just incase.

diff --git a/README.md b/README.md
@@ -5,11 +5,6 @@ This driver currently supports TP3+.
 For a TP2 compatible php driver please check [rexpro-php](https://github.com/PommeVerte/rexpro-php)
 
 
-```diff
-- Note: current build is failing due to changes with travis, The tests still pass localy. 
-- I will get this fixed by 11/21/2020. Pending the unlocking of some travis features.
-```
-
 [![Build Status](https://travis-ci.org/PommeVerte/gremlin-php.svg?branch=master)](https://travis-ci.org/PommeVerte/gremlin-php) [![Latest Stable Version](https://poser.pugx.org/brightzone/gremlin-php/v/stable)](https://packagist.org/packages/brightzone/gremlin-php) [![Coverage Status](https://coveralls.io/repos/PommeVerte/gremlin-php/badge.svg?branch=master)](https://coveralls.io/github/PommeVerte/gremlin-php?branch=master) [![Total Downloads](https://poser.pugx.org/brightzone/gremlin-php/downloads)](https://packagist.org/packages/brightzone/gremlin-php) [![License](https://poser.pugx.org/brightzone/gremlin-php/license)](https://packagist.org/packages/brightzone/gremlin-php)
 
 [![Join the chat at https://gitter.im/PommeVerte/gremlin-php](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PommeVerte/gremlin-php?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

diff --git a/build/server/3.2.x/gremlin-server-php-secure.yaml b/build/server/3.2.x/gremlin-server-php-secure.yaml
@@ -31,33 +31,33 @@ scriptEvaluationTimeout: 30000
 serializedResponseTimeout: 30000
 channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
 graphs: {
-  graph: conf/tinkergraph-empty.properties}
+  graph: conf/tinkergraph-empty.properties }
 plugins:
   - tinkerpop.tinkergraph
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math],
-    staticImports: [java.lang.Math.PI],
-    scripts: [scripts/gremlin-php-script-secure.groovy],
+    imports: [ java.lang.Math ],
+    staticImports: [ java.lang.Math.PI ],
+    scripts: [ scripts/gremlin-php-script-secure.groovy ],
     config: {
       compilerCustomizerProviders: {
-              "org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.ThreadInterruptCustomizerProvider":[],
-              "org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider":[10000]
-              }}}}
+        "org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.ThreadInterruptCustomizerProvider": [ ],
+        "org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider": [ 10000 ]
+      } } } }
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }}            # application/vnd.gremlin-v1.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}        # application/vnd.gremlin-v1.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }}        # application/json
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph } }            # application/vnd.gremlin-v1.0+gryo
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true } }        # application/vnd.gremlin-v1.0+gryo-stringd
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph } } # application/vnd.gremlin-v1.0+json
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph } }        # application/json
 processors:
-  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
+  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 } }
 metrics: {
-  consoleReporter: {enabled: true, interval: 180000},
-  csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: true},
-  slf4jReporter: {enabled: true, interval: 180000},
-  gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST},
-  graphiteReporter: {enabled: false, interval: 180000}}
+  consoleReporter: { enabled: true, interval: 180000 },
+  csvReporter: { enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv },
+  jmxReporter: { enabled: true },
+  slf4jReporter: { enabled: true, interval: 180000 },
+  gangliaReporter: { enabled: false, interval: 180000, addressingMode: MULTICAST },
+  graphiteReporter: { enabled: false, interval: 180000 } }
 strictTransactionManagement: false
 maxInitialLineLength: 4096
 maxHeaderSize: 8192
@@ -70,6 +70,10 @@ writeBufferHighWaterMark: 65536
 authentication: {
   className: org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator,
   config: {
-    credentialsDb: conf/tinkergraph-credentials.properties}}
+    credentialsDb: conf/tinkergraph-credentials.properties } }
 ssl: {
-  enabled: true}
+  enabled: true,
+  sslEnabledProtocols: [ TLSv1.2 ],
+  keyStore: server.jks,
+  keyStorePassword: changeit
+}
diff --git a/build/server/3.3.x/gremlin-server-php-secure-graphson.yaml b/build/server/3.3.x/gremlin-server-php-secure-graphson.yaml
@@ -28,25 +28,25 @@ port: 8184
 scriptEvaluationTimeout: 30000
 channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
 graphs: {
-  graph: conf/tinkergraph-empty.properties}
+  graph: conf/tinkergraph-empty.properties }
 scriptEngines: {
   gremlin-groovy: {
-    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
-               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
-               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/gremlin-php-script-secure.groovy]}}}}
+    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: { },
+               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: { },
+               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math ], methodImports: [ java.lang.Math#* ] },
+               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: { files: [ scripts/gremlin-php-script-secure.groovy ] } } } }
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}            # application/vnd.gremlin-v3.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                      # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}         # application/json
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [ org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0 ] } }            # application/vnd.gremlin-v3.0+gryo
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true } }                                                                      # application/vnd.gremlin-v3.0+gryo-stringd
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [ org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0 ] } }         # application/json
 processors:
-  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
-  - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
+  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 } }
+  - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 } }
 metrics: {
-  consoleReporter: {enabled: true, interval: 180000},
-  csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: true},
-  slf4jReporter: {enabled: true, interval: 180000}}
+  consoleReporter: { enabled: true, interval: 180000 },
+  csvReporter: { enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv },
+  jmxReporter: { enabled: true },
+  slf4jReporter: { enabled: true, interval: 180000 } }
 strictTransactionManagement: false
 maxInitialLineLength: 4096
 maxHeaderSize: 8192
@@ -59,6 +59,10 @@ writeBufferHighWaterMark: 65536
 authentication: {
   authenticator: org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator,
   config: {
-    credentialsDb: conf/tinkergraph-credentials.properties}}
+    credentialsDb: conf/tinkergraph-credentials.properties } }
 ssl: {
-  enabled: true}
+  enabled: true,
+  sslEnabledProtocols: [ TLSv1.2 ],
+  keyStore: server.jks,
+  keyStorePassword: changeit
+}
diff --git a/build/server/3.3.x/gremlin-server-php-secure.yaml b/build/server/3.3.x/gremlin-server-php-secure.yaml
@@ -28,25 +28,25 @@ port: 8184
 scriptEvaluationTimeout: 30000
 channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
 graphs: {
-  graph: conf/tinkergraph-empty.properties}
+  graph: conf/tinkergraph-empty.properties }
 scriptEngines: {
   gremlin-groovy: {
-    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
-               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
-               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/gremlin-php-script-secure.groovy]}}}}
+    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: { },
+               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: { },
+               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: { classImports: [ java.lang.Math ], methodImports: [ java.lang.Math#* ] },
+               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: { files: [ scripts/gremlin-php-script-secure.groovy ] } } } }
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}            # application/vnd.gremlin-v3.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                      # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]  }}        # application/json
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [ org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0 ] } }            # application/vnd.gremlin-v3.0+gryo
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true } }                                                                      # application/vnd.gremlin-v3.0+gryo-stringd
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { ioRegistries: [ org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0 ] } }        # application/json
 processors:
-  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
-  - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
+  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 } }
+  - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 } }
 metrics: {
-  consoleReporter: {enabled: true, interval: 180000},
-  csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: true},
-  slf4jReporter: {enabled: true, interval: 180000}}
+  consoleReporter: { enabled: true, interval: 180000 },
+  csvReporter: { enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv },
+  jmxReporter: { enabled: true },
+  slf4jReporter: { enabled: true, interval: 180000 } }
 strictTransactionManagement: false
 maxInitialLineLength: 4096
 maxHeaderSize: 8192
@@ -59,6 +59,10 @@ writeBufferHighWaterMark: 65536
 authentication: {
   authenticator: org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator,
   config: {
-    credentialsDb: conf/tinkergraph-credentials.properties}}
+    credentialsDb: conf/tinkergraph-credentials.properties } }
 ssl: {
-  enabled: true}
+  enabled: true,
+  sslEnabledProtocols: [ TLSv1.2 ],
+  keyStore: server.jks,
+  keyStorePassword: changeit
+}