Add array filter for fs::scan() and fs::clean().

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Fri Apr 21 16:01:06 MSK 2017
+#Wed Sep 27 14:24:48 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

jphp-runtime/src/main/resources/JPHP-INF/sdk/php/lib/fs.php

@@ -264,29 +264,98 @@ static function delete($path)
     /**
      * Deletes all files in path. This method does not delete the $path directory.
      * Returns array with error, success and skip file list.
+     *
+     * Array filter, e.g.:
+     * [
+     *      extensions => [...],
+     *      excludeExtensions => [...],
+     *      excludeDirs => bool,
+     *      excludeFiles => bool,
+     *      excludeHidden => bool,
+     *
+     *      minSize => int
+     *      maxSize => int
+     *      minTime => int, millis
+     *      maxTime => int, millis
+     *
+     *      callback => function (File $file, $depth) { }
+     * ]
+     *
      * --RU--
      * Удаляет все файлы найденные по указанному пути. Метод не удаляет саму указанную директорию.
      * Возвращает массив с ключами error, success и skip, в которых список файлов.
      *
+     * Фильтр может быть в виде массива:
+     *  [
+     *      extensions => [...],
+     *      excludeExtensions => [...],
+     *      excludeDirs => bool,
+     *      excludeFiles => bool,
+     *      excludeHidden => bool,
+     *
+     *      minSize => int (мин. размер файла, включительно)
+     *      maxSize => int (макс. размер файла, включительно),
+     *      minTime => int, millis (мин. время изменения файла, включительно)
+     *      maxTime => int, millis (макс. время изменения файла, включительно)
+     *
+     *      callback => function (File $file, $depth) { }
+     *  ]
+     *
      * @param string $path
-     * @param callable $checker (File $file, $depth) optional, must return true to delete the file.
+     * @param callable|array $filter (File $file, $depth) optional, must return true to delete the file.
      * @return array [success => [], error => [], skip = []]
      */
-    static function clean($path, callable $checker = null)
+    static function clean($path, $filter = null)
     {
     }
 
     /**
-     * Scans the path with callback.
+     * Scans the path with callback or array filter and can returns found list
+     * if the callback returns any result or if the callback is null.
+     *
+     * Array filter, e.g.:
+     * [
+     *      extensions => [...],
+     *      excludeExtensions => [...],
+     *      excludeDirs => bool,
+     *      excludeFiles => bool,
+     *      excludeHidden => bool,
+     *
+     *      minSize => int
+     *      maxSize => int
+     *      minTime => int, millis
+     *      maxTime => int, millis
+     *
+     *      callback => function (File $file, $depth) { }
+     * ]
+     *
      * --RU--
-     * Сканирует директорию с коллбэком.
+     * Сканирует директорию с коллбэком или фильтром, и может возвращать список найденного, если
+     * из коллбэка возвращать результат или если коллбэк не передан.
+     *
+     * Фильтр в виде массива:
+     *  [
+     *      extensions => [...],
+     *      excludeExtensions => [...],
+     *      excludeDirs => bool,
+     *      excludeFiles => bool,
+     *      excludeHidden => bool,
+     *
+     *      minSize => int (мин. размер файла, включительно)
+     *      maxSize => int (макс. размер файла, включительно),
+     *      minTime => int, millis (мин. время изменения файла, включительно)
+     *      maxTime => int, millis (макс. время изменения файла, включительно)
+     *
+     *      callback => function (File $file, $depth) { }
+     *  ]
      *
      * @param string $path
-     * @param callable $onProgress (File $file, $depth)
+     * @param callable|array $filter (File $file, $depth): mixed|null
      * @param int $maxDepth if 0 then unlimited.
      * @param bool $subIsFirst
+     * @return array[]
      */
-    static function scan($path, callable $onProgress, $maxDepth = 0, $subIsFirst = false)
+    static function scan($path, $filter = null, $maxDepth = 0, $subIsFirst = false)
     {
     }