Upgrade jppm.

Author: dim-s

jphp-runtime/src/php/runtime/memory/support/operation/ReaderMemoryStream.java

@@ -0,0 +1,4 @@
+package php.runtime.memory.support.operation;
+
+public class ReaderMemoryStream {
+}

jphp-runtime/src/php/runtime/memory/support/operation/WriterMemoryStream.java

@@ -0,0 +1,40 @@
+package php.runtime.memory.support.operation;
+
+import php.runtime.Memory;
+import php.runtime.env.Environment;
+import php.runtime.env.TraceInfo;
+import php.runtime.exceptions.CriticalException;
+import php.runtime.ext.core.classes.stream.FileObject;
+import php.runtime.ext.core.classes.stream.Stream;
+import php.runtime.memory.support.MemoryOperation;
+
+import java.io.*;
+
+public class ReaderMemoryStream extends MemoryOperation<Reader> {
+    @Override
+    public Class<?>[] getOperationClasses() {
+        return new Class[] { Reader.class };
+    }
+
+    @Override
+    public Reader convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
+        if (arg.isNull()) return null;
+
+        if (arg.instanceOf(Stream.class)) {
+            InputStream inputStream = Stream.getInputStream(env, arg);
+            if (inputStream == null) return null;
+
+            return new InputStreamReader(inputStream, env.getDefaultCharset());
+        } else if (arg.instanceOf(FileObject.class)) {
+            Stream stream = Stream.create(env, arg.toString(), "r");
+            return new InputStreamReader(Stream.getInputStream(env, stream), env.getDefaultCharset());
+        }
+
+        return new StringReader(arg.toString());
+    }
+
+    @Override
+    public Memory unconvert(Environment env, TraceInfo trace, Reader arg) throws Throwable {
+        throw new CriticalException("Unsupported operation");
+    }
+}

packager/example/hello-world/package.php.yml

@@ -25,3 +25,5 @@ app:
 sources:
 - src
 
+includes:
+- index.php

packager/example/hello-world/src/index.php

@@ -1,19 +1,3 @@
 <?php
 
-$t = \php\time\Time::millis();
-
-function test($a, $b, $c = 33, $d = 22) {
-    $x = $a * 2;
-    $y = $b ^ 4;
-    return $c + $d + 1 + $x - $y;
-}
-
-echo \php\time\Time::millis() - $t, "ms";
-/*
-
-$localPort = \php\net\ServerSocket::findAvailableLocalPort();
-$server = new \php\net\ServerSocket($localPort);
-
-while (true) {
-    $socket = $server->accept();
-}*/
+$password = "1fjhkldkjdlkj";

packager/package.php.yml

@@ -1,5 +1,5 @@
 name: jppm
-version: 0.6.5
+version: 0.6.6
 
 plugins: [GitHub, Hub, Doc]
 
@@ -17,7 +17,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Fix app plugin bugs.
+    + Fix git sources and semver bugs.
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

packager/src-php/packager/Repository.php

@@ -310,8 +310,12 @@ public function findPackage(string $name, string $versionPattern, ?PackageLock $
             $lockVersion = $lock->findVersion($name);
 
             if ($lockVersion) {
-                if ($lockVersion === $versionPattern || (new SemVersion($lockVersion))->satisfies($versionPattern)) {
-                    $versionPattern = $lockVersion;
+                try {
+                    if ($lockVersion === $versionPattern || (new SemVersion($lockVersion))->satisfies($versionPattern)) {
+                        $versionPattern = $lockVersion;
+                    }
+                } catch (\Throwable $e) {
+                    // nop.
                 }
             }
         }