Fix jppm, add jppm profiles for tasks.

dim-s · dim-s · commit d9b269526aff · 2020-02-13T23:34:12.000+03:00
diff --git a/jphp-core/api-docs/README.md b/jphp-core/api-docs/README.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-core
-> version 1.0.4, created by JPPM.
+> version 1.1.0, created by JPPM.
 
 Compiler and Launcher for JPHP.
 
 ### Install
 ```
-jppm add jphp-core@1.0.4
+jppm add jphp-core@1.1.0
 ```
 
 ### API
diff --git a/jphp-core/api-docs/README.ru.md b/jphp-core/api-docs/README.ru.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-core
-> версия 1.0.4, создано с помощью JPPM.
+> версия 1.1.0, создано с помощью JPPM.
 
 Compiler and Launcher for JPHP.
 
 ### Установка
 ```
-jppm add jphp-core@1.0.4
+jppm add jphp-core@1.1.0
 ```
 
 ### АПИ
diff --git a/jphp-runtime/api-docs/README.md b/jphp-runtime/api-docs/README.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-runtime
-> version 1.0.8, created by JPPM.
+> version 1.0.10, created by JPPM.
 
 Runtime for JPHP + Standard library.
 
 ### Install
 ```
-jppm add jphp-runtime@1.0.8
+jppm add jphp-runtime@1.0.10
 ```
 
 ### API
diff --git a/jphp-runtime/api-docs/README.ru.md b/jphp-runtime/api-docs/README.ru.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-runtime
-> версия 1.0.8, создано с помощью JPPM.
+> версия 1.0.10, создано с помощью JPPM.
 
 Runtime for JPHP + Standard library.
 
 ### Установка
 ```
-jppm add jphp-runtime@1.0.8
+jppm add jphp-runtime@1.0.10
 ```
 
 ### АПИ
diff --git a/jphp-runtime/api-docs/classes/php/lib/arr.md b/jphp-runtime/api-docs/classes/php/lib/arr.md
@@ -38,6 +38,7 @@ Library for working with collections - arrays, iterators, etc.
 - `arr ::`[`last()`](#method-last) - _Alias to peek()._
 - `arr ::`[`lastKey()`](#method-lastkey)
 - `arr ::`[`reverse()`](#method-reverse)
+- `arr ::`[`merge()`](#method-merge)
 
 ---
 
@@ -261,6 +262,15 @@ arr::lastKey(array $collection): string|int|null
 arr::reverse(array $array): array
 ```
 
+---
+
+<a name="method-merge"></a>
+
+### merge()
+```php
+arr::merge(array $array, array $others): array
+```
+
 ---
 # Methods
 
diff --git a/jphp-runtime/api-docs/classes/php/lib/arr.ru.md b/jphp-runtime/api-docs/classes/php/lib/arr.ru.md
@@ -38,6 +38,7 @@
 - `arr ::`[`last()`](#method-last) - _Alias to peek()._
 - `arr ::`[`lastKey()`](#method-lastkey)
 - `arr ::`[`reverse()`](#method-reverse)
+- `arr ::`[`merge()`](#method-merge)
 
 ---
 
@@ -258,6 +259,15 @@ arr::lastKey(array $collection): string|int|null
 arr::reverse(array $array): array
 ```
 
+---
+
+<a name="method-merge"></a>
+
+### merge()
+```php
+arr::merge(array $array, array $others): array
+```
+
 ---
 # Методы
 
diff --git a/jphp-runtime/api-docs/classes/php/lib/fs.md b/jphp-runtime/api-docs/classes/php/lib/fs.md
@@ -365,7 +365,7 @@ Copies $source stream to $dest stream.
 
 ### move()
 ```php
-fs::move(string $fromPath, string $toPath): void
+fs::move(string $fromPath, string $toPath): bool
 ```
 Renames or moves a file or empty dir.
 
@@ -375,7 +375,7 @@ Renames or moves a file or empty dir.
 
 ### rename()
 ```php
-fs::rename(string $pathToFile, string $newName): void
+fs::rename(string $pathToFile, string $newName): bool
 ```
 Set name for file, returns true if success.
 
diff --git a/jphp-runtime/api-docs/classes/php/lib/fs.ru.md b/jphp-runtime/api-docs/classes/php/lib/fs.ru.md
@@ -363,7 +363,7 @@ fs::copy(string|File|Stream $source, string|File|Stream $dest, callable $onProgr
 
 ### move()
 ```php
-fs::move(string $fromPath, string $toPath): void
+fs::move(string $fromPath, string $toPath): bool
 ```
 Переименновывает или перемещает файл, либо пустую папку.
 
@@ -373,7 +373,7 @@ fs::move(string $fromPath, string $toPath): void
 
 ### rename()
 ```php
-fs::rename(string $pathToFile, string $newName): void
+fs::rename(string $pathToFile, string $newName): bool
 ```
 Задает файлу новое название, возвращает true при успехе.
 
diff --git a/jphp-runtime/package.php.yml b/jphp-runtime/package.php.yml
@@ -1,6 +1,6 @@
 
 name: jphp-runtime
-version: 1.0.8
+version: 1.0.10
 description: Runtime for JPHP + Standard library.
 
 plugins: [Doc, Hub]
@@ -14,6 +14,10 @@ config:
   ignore: ['/package.hub.yml']
 
 history:
+  1.0.10:
+    - Add arr::merge method to merge arrays.
+  1.0.9:
+    - Fix is_numeric function
   1.0.8:
     - Now Timer works as Thread with daemon options
   1.0.7:
diff --git a/jphp-runtime/src/main/resources/JPHP-INF/sdk/php/lib/arr.php b/jphp-runtime/src/main/resources/JPHP-INF/sdk/php/lib/arr.php
@@ -256,4 +256,13 @@ public static function lastKey($collection)
     public static function reverse(array $array)
     {
     }
+
+    /**
+     * @param array $array
+     * @param array ...$others
+     * @return array
+     */
+    public static function merge(array $array, array ...$others): array
+    {
+    }
 }
diff --git a/jphp-runtime/src/main/resources/JPHP-INF/sdk/php/lib/fs.php b/jphp-runtime/src/main/resources/JPHP-INF/sdk/php/lib/fs.php
@@ -422,8 +422,9 @@ static function copy($source, $dest, callable $onProgress = null, $bufferSize =
      *
      * @param string $fromPath
      * @param string $toPath
+     * @return bool
      */
-    static function move($fromPath, $toPath)
+    static function move($fromPath, $toPath): bool
     {
     }
 
@@ -434,8 +435,9 @@ static function move($fromPath, $toPath)
      *
      * @param string $pathToFile
      * @param string $newName
+     * @return bool
      */
-    static function rename($pathToFile, $newName)
+    static function rename($pathToFile, $newName): bool
     {
     }
 
diff --git a/jphp-runtime/src/php/runtime/ext/core/classes/lib/ItemsUtils.java b/jphp-runtime/src/php/runtime/ext/core/classes/lib/ItemsUtils.java
@@ -7,10 +7,7 @@
 import php.runtime.lang.BaseObject;
 import php.runtime.lang.ForeachIterator;
 import php.runtime.lang.spl.Countable;
-import php.runtime.memory.ArrayMemory;
-import php.runtime.memory.KeyValueMemory;
-import php.runtime.memory.LongMemory;
-import php.runtime.memory.ObjectMemory;
+import php.runtime.memory.*;
 import php.runtime.reflection.ClassEntity;
 
 import java.util.*;
@@ -439,4 +436,24 @@ public static Memory reverse(Environment env, Memory... args) {
 
         return result.toConstant();
     }
+
+    @Signature({
+            @Arg(value = "collection", type = HintType.ARRAY),
+            @Arg(value = "others", type = HintType.VARARG)
+    })
+    public static Memory merge(Environment env, Memory... args) {
+        ArrayMemory result = (ArrayMemory) args[0].toImmutable();
+
+        int i = 0;
+
+        for (Memory arg : args) {
+            if (i >= 1 && arg.isArray()) {
+                result.merge(arg.toValue(ArrayMemory.class), true, null);
+            }
+
+            i++;
+        }
+
+        return result.toConstant();
+    }
 }
diff --git a/jphp-runtime/src/php/runtime/memory/ArrayMemory.java b/jphp-runtime/src/php/runtime/memory/ArrayMemory.java
@@ -439,15 +439,17 @@ public void merge(ArrayMemory array, boolean recursive, Set<Integer> done) {
                             if (done.contains(value.getPointer()))
                                 throw new RecursiveException();
 
-                            Memory current = getByScalar(key).toImmutable();
-                            if (current.isArray()) {
+                            ReferenceMemory byScalar = getByScalar(key);
+                            Memory current = byScalar != null ? byScalar.toImmutable() : null;
+
+                            if (byScalar != null && current.isArray()) {
                                 value = value.toImmutable();
 
                                 int pointer = value.getPointer();
                                 done.add(pointer); // for check recursive
 
-                                ArrayMemory result = (ArrayMemory) value; // already array immutable above
-                                result.merge((ArrayMemory) current, recursive, done);
+                                ArrayMemory result = (ArrayMemory) current; // already array immutable above
+                                result.merge((ArrayMemory) value, recursive, done);
                                 put(key, result);
 
                                 done.remove(pointer);
diff --git a/packager/buildSrc/AppPlugin.php b/packager/buildSrc/AppPlugin.php
@@ -135,10 +135,9 @@ function build(Event $event)
 
                 switch ($buildType) {
                     case 'one-jar': {
-                        Console::error("app.build.type as 'one-jar' no longer supported, use 'multi-jar'");
-                        exit(-1);
+                        Console::warn("app.build.type as 'one-jar' is unstable, try to use 'multi-jar'");
 
-                        /*$jar = new ZipArchive($classPath);
+                        $jar = new ZipArchive($classPath);
                         $jar->readAll(function (ZipArchiveEntry $stat, ?Stream $stream) use (&$metaInfServices, $buildDir) {
                             $name = $stat->name;
 
@@ -156,7 +155,7 @@ function build(Event $event)
                                 fs::ensureParent($file);
                                 fs::copy($stream, $file);
                             }
-                        });*/
+                        });
 
                         break;
                     }
diff --git a/packager/buildSrc/app/AppPluginJavaRuntimeBuilder.php b/packager/buildSrc/app/AppPluginJavaRuntimeBuilder.php
@@ -77,7 +77,7 @@ public function fetchModules($workingDir)
                 foreach (str::lines($string, true) as $line) {
                     [, $module] = str::split($line, "->");
                     $module = str::trim($module);
-                    if ($module === "not found") {
+                    if (str::contains($module, " ")) {
                         continue;
                     }
 
diff --git a/packager/example/hello-world/package-dev.php.yml b/packager/example/hello-world/package-dev.php.yml
@@ -0,0 +1,7 @@
+# this file used when -profile=dev or if -profile is not set in cmd args
+
+sources:
+- src-dev
+
+includes:
+- debug.php
diff --git a/packager/example/hello-world/package-prod.php.yml b/packager/example/hello-world/package-prod.php.yml
@@ -0,0 +1,5 @@
+# this file used when -profile=prod in cmd args
+
+app:
+  jvm-args:
+    - '-Xms64m'
diff --git a/packager/example/hello-world/package.php.yml b/packager/example/hello-world/package.php.yml
@@ -5,6 +5,7 @@ plugins: [App]
 
 deps:
   jphp-core: '*'
+  jphp-zend-ext: '*'
 
 app:
   bootstrap: index.php
diff --git a/packager/example/hello-world/src-dev/debug.php b/packager/example/hello-world/src-dev/debug.php
@@ -0,0 +1,3 @@
+<?php
+
+echo "**DEBUG MODE**\n\n";
diff --git a/packager/example/hello-world/src/index.php b/packager/example/hello-world/src/index.php
@@ -3,3 +3,9 @@
 
 $hello = new \helloworld\HelloWorld("Hello? World");
 $hello->print();
+
+$a = ['x' => ['a' => 2, 'b' => 3]];
+$b = ['x' => ['b' => 4, 'd' => 5]];
+
+$result = array_merge_recursive($b, $a);
+print_r($result);
diff --git a/packager/package.php.yml b/packager/package.php.yml
@@ -1,5 +1,5 @@
 name: jppm
-version: 0.5.7
+version: 0.5.8
 
 plugins: [GitHub, Hub, Doc]
 
@@ -14,8 +14,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Improve build jre (`java.launcher.jdk` option).
-    + Remove `one-jar` build type (`app.build.type` option), use only `multi-jar`
+    + Add profiles of running tasks, use the flag `-profile={dev,prod,etc}` and `package-{profile}.php.yml` configs.
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)
diff --git a/packager/src-php/packager/Package.php b/packager/src-php/packager/Package.php
@@ -15,6 +15,7 @@
 class Package
 {
     const FILENAME = "package.php.yml";
+    const FILENAME_S = "package-%s.php.yml";
     const LOCK_FILENAME = "package-lock.php.yml";
 
     const TYPE_LIBRARY = 'library';
@@ -381,4 +382,9 @@ public function fetchIgnore(): Ignore
 
         return $this->ignore = $ignore;
     }
+
+    public function mergePackage(Package $profilePkg)
+    {
+        $this->data = arr::merge($this->data, $profilePkg->data);
+    }
 }
diff --git a/packager/src-php/packager/Packager.php b/packager/src-php/packager/Packager.php
diff --git a/packager/src-php/packager/cli/ConsoleApp.php b/packager/src-php/packager/cli/ConsoleApp.php
diff --git a/sandbox/src/JPHP-INF/.bootstrap.php b/sandbox/src/JPHP-INF/.bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -256,4 +256,13 @@ public static function lastKey($collection)`
`256`	`256`	`public static function reverse(array $array)`
`257`	`257`	`{`
`258`	`258`	`}`
	`259`	`+`
	`260`	`+ /**`
	`261`	`+ * @param array $array`
	`262`	`+ * @param array ...$others`
	`263`	`+ * @return array`
	`264`	`+ */`
	`265`	`+ public static function merge(array $array, array ...$others): array`
	`266`	`+ {`
	`267`	`+ }`
`259`	`268`	`}`