Skip to content

Commit 7da9df6

Browse files
committed
Fix encoding, fix bugs.
1 parent afff8f5 commit 7da9df6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src-jvm/main/java/php/pkg/twig/classes/TwigEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public Reader getReader(String cacheKey, IObject loader) {
9494
try {
9595
return new InputStreamReader(Stream.getInputStream(
9696
env, env.invokeMethod(loader, "read", StringMemory.valueOf(cacheKey))
97-
));
97+
), env.getDefaultCharset());
9898
} catch (Throwable throwable) {
9999
env.forwardThrow(throwable);
100100
return null;

src-jvm/main/java/php/pkg/twig/support/JPHPExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public Object evaluate() {
4747
}
4848
}
4949

50-
return memory;
50+
return Memory.unwrap(env, memory);
5151
} else {
52-
return instance.callMethodAny(env, attributeName, argumentValues);
52+
return Memory.unwrap(env, instance.callMethodAny(env, attributeName, argumentValues));
5353
}
5454
} catch (Throwable e) {
5555
if (e instanceof BaseError) {
@@ -81,7 +81,7 @@ private ResolvedAttribute resolve(Memory instance, String attributeName, Object[
8181
return new ResolvedAttribute() {
8282
@Override
8383
public Object evaluate() {
84-
return instance.valueOfIndex(attributeName);
84+
return Memory.unwrap(env, instance.valueOfIndex(attributeName));
8585
}
8686
};
8787
}

0 commit comments

Comments
 (0)