Prep v6.2.11

.gitignore

@@ -1,18 +1,19 @@
-.idea
+.idea/
+.gradle/
+.projectKnowledge/
+nbproject/
+nbbuild.xml
+.nb-gradle/
+.nb-gradle-properties
+build/
+dist/
+bin/
+lib/
+doc/API/
+.classpath
+manifest.mf
 *.iml
-/dist
-/bin
-/nbproject
-/doc/API
-/.classpath
-/server/META-INF/java/JavaProxy.php
-/server/META-INF/java/Java.inc
-/server/php/java/bridge/JavaProxy.java
-/server/php/java/bridge/LauncherWindows.java
-/server/php/java/bridge/LauncherWindows2.java
-/server/php/java/bridge/LauncherWindows3.java
-/server/php/java/bridge/LauncherUnix.java
-/server/php/java/bridge/JavaInc.java
-/server/php/java/bridge/LauncherWindows4.java
-/server/php/java/bridge/PhpDebuggerPHP.java
-
+*.lock
+*.log
+devNull
+out/

.travis.yml

@@ -0,0 +1,40 @@
+dist: trusty
+sudo: required
+
+language: java
+
+jdk:
+  - oraclejdk8
+
+#services:
+#  - mysql
+
+os:
+  - linux
+
+before_script:
+  # for debugging purposes
+  - php --version
+  - chmod +x gradlew
+
+script:
+  # Regular test suite
+  - ./gradlew test
+  # Launch a server
+  - ./gradlew clean tomcatRun
+  # Some debug to see if server has started
+  - cat ./tomcat.log
+  - sleep 10
+  - cat ./tomcat.log
+  - sudo netstat -nlp | grep :8090
+  # Launch the soluble-japha test suite
+  - ./.travis/run_soluble_japha_phpunit_tests.sh
+
+after_failure:
+  - cat ./tomcat.log
+
+after_success:
+  #- ./gradlew build jacocoTestReport
+  - bash <(curl -s https://codecov.io/bash)
+
+

.travis/.gitignore

@@ -0,0 +1 @@
+soluble-japha

.travis/phpunit.travis.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         bootstrap="./test/bootstrap.php"
+>
+
+
+    <php>
+        <!--
+            AUTORUN_PJB_STANDALONE : boolean
+
+              * Only work on Linux system with a JVM installed *
+
+              If you want to automatically download, install and run
+              the original PHPJavaBridge standalone server. This
+              feature allows CI systems to run tests with minimal
+              configuration.An correct example of servlet_address
+              could be http://127.0.0.1:8083/servlet.phpjavabridge,
+              Feel free to change the port.
+
+              (if false, you have to get a tomcat server running)
+        -->
+<!--
+        <server name="AUTORUN_PJB_STANDALONE" value="true" />
+        <server name="PJB_SERVLET_ADDRESS" value="http://127.0.0.1:8083/servlet.phpjavabridge" />
+-->
+        <!--
+           to run the test suite on tomcat please increase
+           the heap memory in /etc/default/tomcat7:
+
+           JAVA_OPTS="-Djava.awt.headless=true -Xmx512m -XX:+UseConcMarkSweepGC"
+        -->
+
+        <server name="AUTORUN_PJB_STANDALONE" value="false" />
+
+
+        <server name="PJB_SERVLET_ADDRESS" value="http://localhost:8090/servlet.phpjavabridge" />
+
+
+        <!--
+            Configure connection to mysql server for testing 
+            mysql jdbc connection
+        -->
+        <server name="JAPHA_ENABLE_JDBC_TESTS" value="false" />
+
+        <server name="MYSQL_DRIVER" value="Mysqli" />
+        <server name="MYSQL_HOSTNAME" value="127.0.0.1" />
+        <server name="MYSQL_USERNAME" value="root" />
+        <server name="MYSQL_PASSWORD" value="" />
+        <server name="MYSQL_DATABASE" value="testdb" />
+
+        <server name="PHPUNIT_CACHE_DIR" value="./test/tmp/cache" />
+        <ini name="date.timezone" value="Europe/Brussels"/>
+
+        <ini name="default_charset" value="UTF-8"/>
+        <ini name="display_errors" value="On"/>
+        <ini name="error_reporting" value="E_ALL"/>
+        <!--
+        // Produce errors if different from UTF-8
+        <ini name="default_charset" value="latin1"/>
+        -->
+    </php>
+
+    <testsuites>
+        <testsuite name="soluble/japha">
+            <directory>./test/src/SolubleTest/Japha</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+            <exclude>
+                <file>./src/Soluble/Japha/Bridge/Driver/Pjb62/SimpleParser.php</file>
+            </exclude>		
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="./test/build/logs/clover.xml"/>
+        <log type="coverage-html" target="./test/build/html-coverage" charset="UTF-8" yui="true" highlight="false" lowUpperBound="35" highLowerBound="70"/>
+    </logging>		
+</phpunit>

.travis/run_soluble_japha_phpunit_tests.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+#
+# Travis specific post-test script to run the test suite provided
+# in the latest release of https://github.com/belgattitude/soluble-japha client.
+#
+#
+# usage:
+#   > ./run_soluble_japha_phpunit_tests.sh
+#
+# requirements:
+#   - php >= 5.6, php 7+
+#   - git
+#   - composer
+#   - linux
+#
+# @author Vanvelthem Sébastien
+#
+
+set -e
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PROJECT_DIR="$SCRIPT_DIR/.."
+JAPHA_DIR="$SCRIPT_DIR/soluble-japha"
+
+install_soluble_japha_master() {
+
+    echo "[*] Installing master branch of soluble-japha";
+
+    # 1. Clone the soluble-japha project (if not already exists)
+    if [ ! -d $JAPHA_DIR ]; then
+        git clone https://github.com/belgattitude/soluble-japha.git $JAPHA_DIR
+    fi
+
+    # 2. Clone the soluble-japha project
+    cd $JAPHA_DIR
+
+    # 3. Checkout latest release
+    #git fetch --tags
+    #latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
+    #git checkout ${latestTag}
+
+    git checkout master
+
+    # 4. Run composer install
+    composer install
+
+    # 5. Restore path
+    cd $PROJECT_DIR
+}
+
+
+runPHPUnit()  {
+    cd $JAPHA_DIR
+    echo "[*] Running phpunit"
+    cp ../phpunit.travis.xml .
+    ./vendor/bin/phpunit -c ./phpunit.travis.xml -v
+}
+
+
+# Here's the steps
+install_soluble_japha_master;
+runPHPUnit;
+

CHANGELOG.md

@@ -1,31 +1,43 @@
-# CHANGELOG
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
 
-## 6.2.xx (2017-xx-xx)
-
 ### Added
 
-- Preliminary support for gradle [see #5](https://github.com/belgattitude/php-java-bridge/issues/5)
+- Build: Support for Gradle (still relying on ant build.xml), see [#5](https://github.com/belgattitude/php-java-bridge/issues/5) and [#9](https://github.com/belgattitude/php-java-bridge/pull/9)
+- Build: New tasks added in gradle 'jacocoTestReport', see P/R [#9](https://github.com/belgattitude/php-java-bridge/pull/9)
+- Test: Resurrect existing unit tests
+- Test: test and coverage using Jacoco added, see P/R [#9](https://github.com/belgattitude/php-java-bridge/pull/9)
+- Doc: trick to build when default interpreter is php 7+, see [#4](https://github.com/belgattitude/php-java-bridge/issues/4)
+- License: MIT license where applicable, see [#10](https://github.com/belgattitude/php-java-bridge/issues/10) 
 
-### Improvements
+### Removed
 
-- Some more doc updates
+- Removed obsolete javax.script sources
 
-### Fixes
-
-- Ant build: solution for building when php7+ [see #4](https://github.com/belgattitude/php-java-bridge/issues/4)
+### Changed
+
+- Moved namespace `php.java` into `io.soluble.pjb`, see P/R [#9](https://github.com/belgattitude/php-java-bridge/pull/9)
+- Project directory structure _mavenized_, sources moved from './server' to './src/main/java', see P/R [#9](https://github.com/belgattitude/php-java-bridge/pull/9)
 
 
 ## 6.2.10 (2017-01-15)
 
-### Changes
+### Changed
 
 - Removal embedded php-cgi binaries [see #3](https://github.com/belgattitude/php-java-bridge/issues/3)
 - Source code indentation
 - README.md: added Recipe for building and deploying on tomcat
 
-### Fixes
+### Fixed
 
 - Added a `build-php5.6.xml` ant config 
 
 
+## 6.2.1 (2010-06-01)
 
+For reference see the doc/legacy/Changelog

CREDITS.md

@@ -0,0 +1,21 @@
+# Credits
+
+## Authors
+
+All credits for the original implementation:
+
+- Jost Boekemeier
+- Andre Felipe Machado 
+- Sam Ruby 
+- Kai Londenberg 
+- Nandika Jayawardana 
+- Sanka Samaranayake 
+
+## Contributors
+
+Contributors and/or maintainers for the [unofficial fork](https://github.com/belgattitude/php-java-bridge) and post 6.2.1 versions 
+
+* [Christian P. Lerch](https://github.com/cplerch) - Java refactorings and modernizations
+* [Sébastien Vanvelthem](https://github.com/belgattitude) - Fork initiator and client rewrite.
+
+