phptest 0.0.1 → 0.0.4

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.1",
+  "version": "0.0.4",
   "name": "phptest",
   "description": "Test helper library for PHP core runtime components",
   "keywords": [
@@ -29,12 +29,14 @@
     "lie": "^3.3.0",
     "microdash": "^1.4.2",
     "regexp.escape": "^1.1.0",
-    "source-map": "^0.7.3"
+    "source-map": "^0.8.0-beta.0"
+  },
+  "devDependencies": {
+    "phpcore": "^7.1.0"
   },
   "peerDependencies": {
     "core-js-pure": "^3.21.1",
     "mocha": "^9.2.2",
-    "phpcore": "^7.1.0",
     "phptoast": "^9.0.1",
     "phptojs": "^9.0.0"
   },

package/src/createIntegrationTools.js

@@ -13,27 +13,30 @@ var _ = require('microdash'),
     escapeRegex = require('regexp.escape'),
     path = require('path'),
     mochaPath = path.dirname(require.resolve('mocha/package.json')),
-    phpCorePath = path.resolve(__dirname, '../..'),
     phpToAST = require('phptoast'),
     phpToJS = require('phptojs'),
     util = require('util'),
-    OpcodeExecutor = require('phpcore/src/Core/Opcode/Handler/OpcodeExecutor'),
-    Reference = require('../../src/Reference/Reference'),
     SourceMapConsumer = require('source-map').SourceMapConsumer,
-    Value = require('../../src/Value').sync(),
-    Variable = require('../../src/Variable').sync(),
-    WeakMap = require('es6-weak-map'),
-    runtimeFactory = require('../../src/shared/runtimeFactory');
+    WeakMap = require('es6-weak-map');
 
 /**
  * Creates an integration test helper tools object.
  *
- * @param {Function} initRuntime
+ * @param {string} phpCorePath
+ * @param {Function=} initRuntime
  * @returns {Object}
  */
-module.exports = function (initRuntime) {
-    // A map that allows looking up the source map data for a module later on
-    var moduleDataMap = new WeakMap(),
+module.exports = function (phpCorePath, initRuntime) {
+    var
+        OpcodeExecutor = require(phpCorePath + '/src/Core/Opcode/Handler/OpcodeExecutor'),
+        Reference = require(phpCorePath + '/src/Reference/Reference'),
+        Value = require(phpCorePath + '/src/Value').sync(),
+        Variable = require(phpCorePath + '/src/Variable').sync(),
+        runtimeFactory = require(phpCorePath + '/src/shared/runtimeFactory'),
+
+        // A map that allows looking up the source map data for a module later on.
+        moduleDataMap = new WeakMap(),
+
         /**
          * Creates a Runtime with the given mode.
          *
@@ -41,7 +44,9 @@ module.exports = function (initRuntime) {
          * @returns {Runtime}
          */
         createRuntime = function (mode) {
-            return initRuntime(runtimeFactory.create(mode));
+            var runtime = runtimeFactory.create(mode);
+
+            return initRuntime ? initRuntime(runtime) : runtime;
         },
 
         createAsyncRuntime = function () {
@@ -133,12 +138,6 @@ module.exports = function (initRuntime) {
         )()
             .match(/<anonymous>:(\d+):\d+/)[1] - 1;
 
-    if (!initRuntime) {
-        initRuntime = function (runtime) {
-            return runtime;
-        };
-    }
-
     // Force all opcodes to be async for all async mode tests, to help ensure async handling is in place.
     asyncRuntime.install({
         serviceGroups: [