Merge pull request #16 from juanjux/bip-5

Bip 5

Author: juanjux

.travis.yml

@@ -7,7 +7,7 @@ services:
   - docker
 
 before_script:
-  - go get -v gopkg.in/bblfsh/sdk.v1/...
+  - go get -v gopkg.in/bblfsh/sdk.v2/...
   - bblfsh-sdk prepare-build .
   - go get -v -t ./driver/...
 

Makefile

@@ -13,4 +13,3 @@ build-native-internal:
 
 	rm $(BUILD_PATH)/bin/native || true
 	ln -s /opt/driver/src/ast $(BUILD_PATH)/bin/native
-

README.md

@@ -1,4 +1,4 @@
-# php-driver  ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1.15--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.9-63afbf.svg)
+# php-driver  ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1.17--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.9-63afbf.svg)
 
 php driver for [babelfish](https://github.com/bblfsh/bblfshd).
 
@@ -8,7 +8,7 @@ Development Environment
 
 Requirements:
 - `docker`
-- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v1/...)_
+- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v2/...)_
 - UAST converter dependencies _(go get -t -v ./...)_
 
 To initialize the build system execute: `bblfsh-sdk prepare-build`, at the root of the project. This will install the SDK at `.sdk` for this driver.

driver/fixtures/fixtures_test.go

@@ -0,0 +1,34 @@
+package fixtures
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/bblfsh/php-driver/driver/normalizer"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver/fixtures"
+)
+
+const projectRoot = "../../"
+
+var Suite = &fixtures.Suite{
+	Lang:     "php",
+	Ext:      ".php",
+	Path:     filepath.Join(projectRoot, fixtures.Dir),
+	NewDriver: func() driver.BaseDriver {
+		return driver.NewExecDriverAt(filepath.Join(projectRoot, "native/ast"))
+	},
+	Transforms: driver.Transforms{
+		Native: normalizer.Native,
+		Code:   normalizer.Code,
+	},
+	BenchName: "complex",
+}
+
+func TestPHPDriver(t *testing.T) {
+	Suite.RunTests(t)
+}
+
+func BenchmarkPHPDriver(b *testing.B) {
+	Suite.RunBenchmarks(b)
+}

driver/impl/impl.go

@@ -0,0 +1,8 @@
+package impl
+
+import "gopkg.in/bblfsh/sdk.v2/sdk/driver"
+
+func init() {
+	// Can be overridden to link a native driver into a Go driver server.
+	driver.DefaultDriver = driver.NewExecDriver()
+}

driver/main.go

@@ -1,11 +1,15 @@
 package main
 
 import (
+	_ "github.com/bblfsh/php-driver/driver/impl"
 	"github.com/bblfsh/php-driver/driver/normalizer"
 
-	"gopkg.in/bblfsh/sdk.v1/sdk/driver"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
 )
 
 func main() {
-	driver.Run(normalizer.ToNode, normalizer.Transformers)
+	driver.Run(driver.Transforms{
+		Native: normalizer.Native,
+		Code:   normalizer.Code,
+	})
 }