phptest 0.0.4 → 0.0.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.4",
+  "version": "0.0.7",
   "name": "phptest",
   "description": "Test helper library for PHP core runtime components",
   "keywords": [
@@ -32,13 +32,13 @@
     "source-map": "^0.8.0-beta.0"
   },
   "devDependencies": {
-    "phpcore": "^7.1.0"
+    "phpcore": "^7.2.0"
   },
   "peerDependencies": {
     "core-js-pure": "^3.21.1",
-    "mocha": "^9.2.2",
+    "mocha": "^10.0.0",
     "phptoast": "^9.0.1",
-    "phptojs": "^9.0.0"
+    "phptojs": "^9.0.1"
   },
   "engines": {
     "node": ">=12"

package/src/createIntegrationTools.js

@@ -28,11 +28,12 @@ var _ = require('microdash'),
  */
 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'),
+        resolvedPHPCorePath = path.resolve(phpCorePath),
+        OpcodeExecutor = require(resolvedPHPCorePath + '/src/Core/Opcode/Handler/OpcodeExecutor'),
+        Reference = require(resolvedPHPCorePath + '/src/Reference/Reference'),
+        Value = require(resolvedPHPCorePath + '/src/Value').sync(),
+        Variable = require(resolvedPHPCorePath + '/src/Variable').sync(),
+        runtimeFactory = require(resolvedPHPCorePath + '/src/shared/runtimeFactory'),
 
         // A map that allows looking up the source map data for a module later on.
         moduleDataMap = new WeakMap(),
@@ -109,6 +110,8 @@ module.exports = function (phpCorePath, initRuntime) {
                 return phpCore;
             });
 
+            // Note that we do not support setting additional module options for PHPCore,
+            // because module-level options are deprecated in favour of environment-level ones.
             if (path !== null) {
                 module = module.using({
                     path: path
@@ -180,7 +183,7 @@ module.exports = function (phpCorePath, initRuntime) {
                                         result.setValue(value).next(resolve, reject);
                                     });
                                 }, function (reference) {
-                                    return result.setReference(reference);
+                                    return result.setReference(reference.getReference());
                                 });
                             }
 
@@ -243,7 +246,7 @@ module.exports = function (phpCorePath, initRuntime) {
                     stack = stack.replace(
                         // Find stack frames for the transpiled PHP code - source maps would not be handled natively
                         // even if we embedded them in the generated JS, so we need to perform manual mapping
-                        /\(eval at transpile \(.*\/test\/integration\/tools.js:\d+:\d+\), <anonymous>:(\d+):(\d+)\)/g,
+                        /\(eval at transpile \(.*\/phptest\/src\/createIntegrationTools\.js:\d+:\d+\), <anonymous>:(\d+):(\d+)\)/g,
                         function (all, line, column) {
                             var mappedPosition = sourceMapConsumer.originalPositionFor({
                                 // Note: These number casts are required, the source-map library
@@ -272,7 +275,7 @@ module.exports = function (phpCorePath, initRuntime) {
                     stack = stack.replace(/(?:(?:.*\/path\/to\/internal.*)([\r\n]*))+/mg, '    at [Node.js internals]$1');
 
                     // Normalise PHPCore frames
-                    stack = stack.replace(new RegExp(escapeRegex(phpCorePath), 'g'), '/path/to/phpcore');
+                    stack = stack.replace(new RegExp(escapeRegex(resolvedPHPCorePath), 'g'), '/path/to/phpcore');
 
                     return stack;
                 });