add setLoader method

chenos · Feb 7, 2018 · ce2d324 · ce2d324
1 parent 67ba6e3
commit ce2d324
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,10 +19,8 @@ services:
       context: ./docker/
       dockerfile: ${DOCKERFILE:-Dockerfile-71}
     environment:
-      # TRAVIS: ${TRAVIS:-''}
-      # TRAVIS_JOB_ID: ${TRAVIS_JOB_ID:-''}
-      COVERALLS_RUN_LOCALLY: 1
-      COVERALLS_REPO_TOKEN: gfDOr1cMqeqyzMmFgu54HpUcJvsZJf6yV
+      TRAVIS: ${TRAVIS:-''}
+      TRAVIS_JOB_ID: ${TRAVIS_JOB_ID:-''}
     working_dir: /var/www/html
     volumes:
       - ./:/var/www/html

diff --git a/src/Context.php b/src/Context.php
@@ -16,15 +16,12 @@ class Context
 
     protected $variables = [];
 
-    public function __construct($v8name = 'PHP')
+    public function __construct($v8name = 'PHP', ModuleLoader $loader = null)
     {
         $this->v8name = $v8name;
-        $this->loader = new ModuleLoader();
         $this->v8 = new V8Js($v8name);
-
-        $this->v8->setModuleNormaliser([$this->loader, 'normaliseIdentifier']);
-        $this->v8->setModuleLoader([$this->loader, 'loadModule']);
-        $this->v8->executeString("global.requireDefault = function (m) {
+        $this->setLoader($loader ?: new ModuleLoader());
+        $this->eval("global.requireDefault = function (m) {
             var o = require(m);return o && o.__esModule ? o.default : o;};");
     }
 
@@ -59,21 +56,20 @@ public function load($file, int $flags = V8Js::FLAG_NONE, int $timeLimit = 0, in
 
     public function require($module, $identifier = null)
     {
-        if (is_null($identifier)) {
-            return $this->eval("requireDefault('{$module}')");
-        }
-
         if (is_string($identifier)) {
             return $this->eval("var $identifier = requireDefault('{$module}'); $identifier");
         }
 
-        if (is_array($identifier) && ! empty($identifier)) {
+        if (is_array($identifier)) {
             foreach ($identifier as $key => $value) {
                 $this->eval(sprintf('var %s = require(\'%s\').%s;', 
                     $value, $module, is_string($key) ? $key : $value));
             }
+
             return $this->eval(sprintf('{%s}', implode(', ', $identifier)));
         }
+
+        return $this->eval("requireDefault('{$module}')");
     }
 
     public function set($key, $value, $global = false)
@@ -107,4 +103,11 @@ public function getLoader()
     {
         return $this->loader;
     }
+
+    public function setLoader(ModuleLoader $loader)
+    {
+        $this->loader = $loader;
+        $this->v8->setModuleNormaliser([$this->loader, 'normaliseIdentifier']);
+        $this->v8->setModuleLoader([$this->loader, 'loadModule']);
+    }
 }