[WIP] Port everything to zend

.gitignore

@@ -4,3 +4,6 @@ deps/*
 vendor/
 composer.lock
 compile_commands.json
+modules
+.libs
+autom4te.cache

.travis.scripts/compile.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+trap abort_on_failure ERR
+
+abort_on_failure () {
+	echo "Last command failed, exising"
+	exit 42;
+}
+
+build_vpack() {
+	mkdir tmp-vpack
+	pushd tmp-vpack
+		git clone https://github.com/arangodb/velocypack.git velocypack
+		cd velocypack
+		mkdir -p build
+		cd build
+		cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fPIC -std=c++11"
+		sudo make install
+	popd
+}
+build_vpack
+
+build_fuerte() {
+	mkdir tmp-fuerte
+	pushd tmp-fuerte
+        git clone https://github.com/arangodb/fuerte.git fuerte
+		cd fuerte
+		cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fPIC -std=c++11"
+		sudo make install
+	popd
+}
+build_fuerte
+
+phpize
+./configure
+make all -j4
+sudo make install
+
+echo "Use the most-up-to-date run-tests.. old ones like 5.3 don't report failure exit codes"
+wget -O run-tests.php https://raw.githubusercontent.com/php/php-src/master/run-tests.php
+
+
+rm -rf tmp-vpack tmp tmp-fuerte # coveralls may pick it up and lie about our coverage
+
+echo "extension=arangodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`

.travis.yml

@@ -1,28 +1,31 @@
-sudo: required
 language: php
 php:
+  - 7.2
   - 7.1
 
-services:
-  - docker
+env:
+  global:
+    - TEST_PHP_ARGS="-q -s output.txt -g XFAIL,FAIL,BORK,WARN,LEAK,SKIP -x --show-diff"
+    - REPORT_EXIT_STATUS=1
+    - ARANGODB_VERSION=3.2
 
-jobs:
-  include:
-    - stage: build and test extension
-      env:
-        - DOCKER_COMPOSE_VERSION=1.16.1
-        - DEPENDENCIES="--prefer-lowest --prefer-stable"
-      script:
-      - docker info
-      - sudo rm /usr/local/bin/docker-compose
-      - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-      - chmod +x docker-compose
-      - sudo mv docker-compose /usr/local/bin
-      - docker-compose up -d --no-recreate arangodb
-      - ./get_fuerte
-      - docker-compose build arangodb-builder
-      - docker-compose run --rm arangodb-builder
-      - docker-compose build php
-      - docker run --rm -it --volume $(pwd):/app prooph/composer:7.1 update --prefer-dist $DEPENDENCIES
-      - docker-compose run --rm php vendor/bin/phpunit
-      - docker-compose down -v
+addons:
+  hosts:
+    - arangodb
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y gdb valgrind
+  - sudo apt-get install -y git build-essential autoconf automake libtool bison re2c cmake libssl-dev libcurl4-openssl-dev libboost-system-dev libboost-thread-dev
+  - "./.travis.scripts/compile.sh"
+
+before_script:
+  - wget https://www.arangodb.com/repositories/travisCI/setup_arangodb_${ARANGODB_VERSION}.sh
+  - chmod 777 setup_arangodb_${ARANGODB_VERSION}.sh
+  - ./setup_arangodb_${ARANGODB_VERSION}.sh
+
+script:
+  - make test
+
+after_script:
+  - killall -s SIGTERM arangod_x86_64

Dockerfile

@@ -1,8 +1,6 @@
 FROM arangodb-builder
 
-COPY docker-entrypoint.sh /usr/local/bin/
+COPY modules/arangodb.so /tmp
 
-RUN echo "extension=libarangodb.so" > /usr/local/etc/php/conf.d/arangodb.ini \
-    && ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
-
-ENTRYPOINT ["docker-entrypoint.sh"]
+RUN echo "extension=arangodb.so" > /usr/local/etc/php/conf.d/arangodb.ini \
+    && mv /tmp/arangodb.so $(php-config --extension-dir)

Dockerfile.builder

@@ -14,23 +14,30 @@ RUN buildDeps=' \
     openssl-dev \
     libc-dev \
     pcre-dev \
+    autoconf \
     ' \
     && apk add --update $buildDeps \
     && docker-php-source extract
 
 COPY deps /tmp
 
-RUN cd /tmp/phpcpp \
-        && sed -i 's/`\${PHP_CONFIG} \-\-ldflags`//g' Makefile \
-        && make \
-        && make install
+RUN cd /tmp/velocypack \
+    && mkdir -p build \
+    && cd build \
+    && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fPIC \
+    && make install
+
+RUN cd /tmp/fuerte \
+    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fPIC \
+    && make install
 
 WORKDIR /app
 VOLUME ["/app"]
 
-RUN apk add --update bash && rm -rf /tmp/*
-
-RUN docker-php-source extract
+RUN apk add --update bash \
+        boost-system \
+        boost-thread \
+    && rm -rf /tmp/*
 
 ENTRYPOINT []
-CMD bash -c "cd /app/build && cmake .. -DPHPCPP_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-fPIC && make"
+CMD bash -c "cd /app && phpize && ./configure && make all -j4"

README.md

@@ -9,13 +9,7 @@ First install dependencies with
 $ ./get_fuerte
 ```
 
-and PHP dependencies with
-
-```
-$ docker run --rm -it --volume $(pwd):/app prooph/composer:7.1 update
-```
-
-This extension is build with [PHP-CPP](http://www.php-cpp.com/).
+This extension is build with [native Zend Engine](http://www.phpinternalsbook.com/#php-7).
 The build is simple with [Docker Compose](https://docs.docker.com/compose/install/).
 
 ```
@@ -27,6 +21,7 @@ $ docker-compose up -d --no-recreate arangodb
 
 ```
 $ docker-compose run --rm arangodb-builder
+$ docker-compose run --rm arangodb-builder make test
 $ docker-compose build php
 $ docker-compose run --rm php vendor/bin/phpunit
 ```
@@ -35,14 +30,16 @@ Cleanup
 
 ```
 $ docker-compose down -v
+$ docker-compose run --rm arangodb-builder make clean
+$ docker-compose run --rm arangodb-builder phpize --clean
 ```
 
 ### Debugging
-Check which symbols are in `build/libarangodb.so`. See [nm docs](https://linux.die.net/man/1/nm).
+Check which symbols are in `modules/arangodb.so`. See [nm docs](https://linux.die.net/man/1/nm).
 
 ```
-$ nm -g build/libarangodb.so | grep ArangoDb
-$ ldd build/libarangodb.so
+$ nm -g modules/arangodb.so | grep arangodb
+$ ldd modules/arangodb.so
 ```
 
 ### UI