updated grav to 1.7.14

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: grav
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: # Replace with a single custom sponsorship URL

.phan/config.php

@@ -0,0 +1,44 @@
+<?php
+return [
+    "target_php_version" => null,
+    'pretend_newer_core_functions_exist' => true,
+    'allow_missing_properties' => false,
+    'null_casts_as_any_type' => false,
+    'null_casts_as_array' => false,
+    'array_casts_as_null' => false,
+    'strict_method_checking' => true,
+    'quick_mode' => false,
+    'simplify_ast' => false,
+    'directory_list' => [
+        '.',
+    ],
+    "exclude_analysis_directory_list" => [
+        'vendor/'
+    ],
+    'exclude_file_list' => [
+        'system/src/Grav/Common/Errors/Resources/layout.html.php',
+        'tests/_support/AcceptanceTester.php',
+        'tests/_support/FunctionalTester.php',
+        'tests/_support/UnitTester.php',
+    ],
+    'autoload_internal_extension_signatures' => [
+        'memcached' => '.phan/internal_stubs/memcached.phan_php',
+        'memcache' => '.phan/internal_stubs/memcache.phan_php',
+        'redis' => '.phan/internal_stubs/Redis.phan_php',
+    ],
+    'plugins' => [
+        'AlwaysReturnPlugin',
+        'UnreachableCodePlugin',
+        'DuplicateArrayKeyPlugin',
+        'PregRegexCheckerPlugin',
+        'PrintfCheckerPlugin',
+    ],
+    'suppress_issue_types' => [
+        'PhanUnreferencedUseNormal',
+        'PhanTypeObjectUnsetDeclaredProperty',
+        'PhanTraitParentReference',
+        'PhanTypeInvalidThrowsIsInterface',
+        'PhanRequiredTraitNotAdded',
+        'PhanDeprecatedFunction',  // Uncomment this to see all the deprecated calls
+    ]
+];

.phan/internal_stubs/Redis.phan_php

@@ -0,0 +1,5153 @@
+<?php
+
+/**
+ * Helper autocomplete for php redis extension
+ *
+ * @author Max Kamashev <max.kamashev@gmail.com>
+ * @link   https://github.com/ukko/phpredis-phpdoc
+ */
+class Redis
+{
+    const AFTER                 = 'after';
+    const BEFORE                = 'before';
+
+    /**
+     * Options
+     */
+    const OPT_SERIALIZER        = 1;
+    const OPT_PREFIX            = 2;
+    const OPT_READ_TIMEOUT      = 3;
+    const OPT_SCAN              = 4;
+    const OPT_SLAVE_FAILOVER    = 5;
+
+    /**
+     * Cluster options
+     */
+    const FAILOVER_NONE         = 0;
+    const FAILOVER_ERROR        = 1;
+    const FAILOVER_DISTRIBUTE   = 2;
+
+    /**
+     * SCAN options
+     */
+    const SCAN_NORETRY          = 0;
+    const SCAN_RETRY            = 1;
+
+    /**
+     * Serializers
+     */
+    const SERIALIZER_NONE       = 0;
+    const SERIALIZER_PHP        = 1;
+    const SERIALIZER_IGBINARY   = 2;
+    const SERIALIZER_MSGPACK    = 3;
+    const SERIALIZER_JSON       = 4;
+
+    /**
+     * Multi
+     */
+    const ATOMIC                = 0;
+    const MULTI                 = 1;
+    const PIPELINE              = 2;
+
+    /**
+     * Type
+     */
+    const REDIS_NOT_FOUND       = 0;
+    const REDIS_STRING          = 1;
+    const REDIS_SET             = 2;
+    const REDIS_LIST            = 3;
+    const REDIS_ZSET            = 4;
+    const REDIS_HASH            = 5;
+
+    /**
+     * Creates a Redis client
+     *
+     * @example $redis = new Redis();
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Connects to a Redis instance.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0.0 meaning unlimited)
+     * @param null   $reserved      should be null if $retryInterval is specified
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @example
+     * <pre>
+     * $redis->connect('127.0.0.1', 6379);
+     * $redis->connect('127.0.0.1');            // port 6379 by default
+     * $redis->connect('127.0.0.1', 6379, 2.5); // 2.5 sec timeout.
+     * $redis->connect('/tmp/redis.sock');      // unix domain socket.
+     * </pre>
+     */
+    public function connect(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $reserved = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * Connects to a Redis instance.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0.0 meaning unlimited)
+     * @param null   $reserved      should be null if $retry_interval is specified
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @see        connect()
+     * @deprecated use Redis::connect()
+     */
+    public function open(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $reserved = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * A method to determine if a phpredis object thinks it's connected to a server
+     *
+     * @return bool Returns TRUE if phpredis thinks it's connected and FALSE if not
+     */
+    public function isConnected()
+    {
+    }
+
+    /**
+     * Retrieve our host or unix socket that we're connected to
+     *
+     * @return string|bool The host or unix socket we're connected to or FALSE if we're not connected
+     */
+    public function getHost()
+    {
+    }
+
+    /**
+     * Get the port we're connected to
+     *
+     * @return int|bool Returns the port we're connected to or FALSE if we're not connected
+     */
+    public function getPort()
+    {
+    }
+
+    /**
+     * Get the database number phpredis is pointed to
+     *
+     * @return int|bool Returns the database number (int) phpredis thinks it's pointing to
+     * or FALSE if we're not connected
+     */
+    public function getDbNum()
+    {
+    }
+
+    /**
+     * Get the (write) timeout in use for phpredis
+     *
+     * @return float|bool The timeout (DOUBLE) specified in our connect call or FALSE if we're not connected
+     */
+    public function getTimeout()
+    {
+    }
+
+    /**
+     * Get the read timeout specified to phpredis or FALSE if we're not connected
+     *
+     * @return float|bool Returns the read timeout (which can be set using setOption and Redis::OPT_READ_TIMEOUT)
+     * or FALSE if we're not connected
+     */
+    public function getReadTimeout()
+    {
+    }
+
+    /**
+     * Gets the persistent ID that phpredis is using
+     *
+     * @return string|null|bool Returns the persistent id phpredis is using
+     * (which will only be set if connected with pconnect),
+     * NULL if we're not using a persistent ID,
+     * and FALSE if we're not connected
+     */
+    public function getPersistentID()
+    {
+    }
+
+    /**
+     * Get the password used to authenticate the phpredis connection
+     *
+     * @return string|null|bool Returns the password used to authenticate a phpredis session or NULL if none was used,
+     * and FALSE if we're not connected
+     */
+    public function getAuth()
+    {
+    }
+
+    /**
+     * Connects to a Redis instance or reuse a connection already established with pconnect/popen.
+     *
+     * The connection will not be closed on close or end of request until the php process ends.
+     * So be patient on to many open FD's (specially on redis server side) when using persistent connections on
+     * many servers connecting to one redis server.
+     *
+     * Also more than one persistent connection can be made identified by either host + port + timeout
+     * or host + persistentId or unix socket + timeout.
+     *
+     * This feature is not available in threaded versions. pconnect and popen then working like their non persistent
+     * equivalents.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0 meaning unlimited)
+     * @param string $persistentId  identity for the requested persistent connection
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on ertcnror.
+     *
+     * @example
+     * <pre>
+     * $redis->pconnect('127.0.0.1', 6379);
+     *
+     * // port 6379 by default - same connection like before
+     * $redis->pconnect('127.0.0.1');
+     *
+     * // 2.5 sec timeout and would be another connection than the two before.
+     * $redis->pconnect('127.0.0.1', 6379, 2.5);
+     *
+     * // x is sent as persistent_id and would be another connection than the three before.
+     * $redis->pconnect('127.0.0.1', 6379, 2.5, 'x');
+     *
+     * // unix domain socket - would be another connection than the four before.
+     * $redis->pconnect('/tmp/redis.sock');
+     * </pre>
+     */
+    public function pconnect(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $persistentId = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * @param string $host
+     * @param int    $port
+     * @param float  $timeout
+     * @param string $persistentId
+     * @param int    $retryInterval
+     * @param float  $readTimeout
+     *
+     * @return bool
+     *
+     * @deprecated use Redis::pconnect()
+     * @see pconnect()
+     */
+    public function popen(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $persistentId = '',
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * Disconnects from the Redis instance.
+     *
+     * Note: Closing a persistent connection requires PhpRedis >= 4.2.0
+     *
+     * @since >= 4.2 Closing a persistent connection requires PhpRedis
+     *
+     * @return bool TRUE on success, FALSE on error
+     */
+    public function close()
+    {
+    }
+
+    /**
+     * Swap one Redis database with another atomically
+     *
+     * Note: Requires Redis >= 4.0.0
+     *
+     * @param int $db1
+     * @param int $db2
+     *
+     * @return bool TRUE on success and FALSE on failure
+     *
+     * @link https://redis.io/commands/swapdb
+     * @since >= 4.0
+     * @example
+     * <pre>
+     * // Swaps DB 0 with DB 1 atomically
+     * $redis->swapdb(0, 1);
+     * </pre>
+     */
+    public function swapdb(int $db1, int $db2)
+    {
+    }
+
+    /**
+     * Set client option
+     *
+     * @param int   $option option name
+     * @param mixed $value  option value
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);        // don't serialize data
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);         // use built-in serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_IGBINARY);    // use igBinary serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_MSGPACK);     // Use msgpack serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_JSON);        // Use json serialize/unserialize
+     *
+     * $redis->setOption(Redis::OPT_PREFIX, 'myAppName:');                      // use custom prefix on all keys
+     *
+     * // Options for the SCAN family of commands, indicating whether to abstract
+     * // empty results from the user.  If set to SCAN_NORETRY (the default), phpredis
+     * // will just issue one SCAN command at a time, sometimes returning an empty
+     * // array of results.  If set to SCAN_RETRY, phpredis will retry the scan command
+     * // until keys come back OR Redis returns an iterator of zero
+     * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_NORETRY);
+     * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY);
+     * </pre>
+     */
+    public function setOption($option, $value)
+    {
+    }
+
+    /**
+     * Get client option
+     *
+     * @param int $option parameter name
+     *
+     * @return mixed|null Parameter value
+     *
+     * @see setOption()
+     * @example
+     * // return option value
+     * $redis->getOption(Redis::OPT_SERIALIZER);
+     */
+    public function getOption($option)
+    {
+    }
+
+    /**
+     * Check the current connection status
+     *
+     * @return  string STRING: +PONG on success.
+     * Throws a RedisException object on connectivity error, as described above.
+     * @throws RedisException
+     * @link    https://redis.io/commands/ping
+     */
+    public function ping()
+    {
+    }
+
+    /**
+     * Echo the given string
+     *
+     * @param string $message
+     *
+     * @return string Returns message
+     *
+     * @link    https://redis.io/commands/echo
+     */
+    public function echo($message)
+    {
+    }
+
+    /**
+     * Get the value related to the specified key
+     *
+     * @param string $key
+     *
+     * @return string|mixed|bool If key didn't exist, FALSE is returned.
+     * Otherwise, the value related to this key is returned
+     *
+     * @link    https://redis.io/commands/get
+     * @example
+     * <pre>
+     * $redis->set('key', 'hello');
+     * $redis->get('key');
+     *
+     * // set and get with serializer
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_JSON);
+     *
+     * $redis->set('key', ['asd' => 'as', 'dd' => 123, 'b' => true]);
+     * var_dump($redis->get('key'));
+     * // Output:
+     * array(3) {
+     *  'asd' => string(2) "as"
+     *  'dd' => int(123)
+     *  'b' => bool(true)
+     * }
+     * </pre>
+     */
+    public function get($key)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key.
+     *
+     * @since If you're using Redis >= 2.6.12, you can pass extended options as explained in example
+     *
+     * @param string       $key
+     * @param string|mixed $value string if not used serializer
+     * @param int|array    $timeout [optional] Calling setex() is preferred if you want a timeout.<br>
+     * Since 2.6.12 it also supports different flags inside an array. Example ['NX', 'EX' => 60]<br>
+     *  - EX seconds -- Set the specified expire time, in seconds.<br>
+     *  - PX milliseconds -- Set the specified expire time, in milliseconds.<br>
+     *  - PX milliseconds -- Set the specified expire time, in milliseconds.<br>
+     *  - NX -- Only set the key if it does not already exist.<br>
+     *  - XX -- Only set the key if it already exist.<br>
+     * <pre>
+     * // Simple key -> value set
+     * $redis->set('key', 'value');
+     *
+     * // Will redirect, and actually make an SETEX call
+     * $redis->set('key','value', 10);
+     *
+     * // Will set the key, if it doesn't exist, with a ttl of 10 seconds
+     * $redis->set('key', 'value', ['nx', 'ex' => 10]);
+     *
+     * // Will set a key, if it does exist, with a ttl of 1000 miliseconds
+     * $redis->set('key', 'value', ['xx', 'px' => 1000]);
+     * </pre>
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link     https://redis.io/commands/set
+     */
+    public function set($key, $value, $timeout = null)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key, with a time to live.
+     *
+     * @param string       $key
+     * @param int          $ttl
+     * @param string|mixed $value
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link    https://redis.io/commands/setex
+     * @example $redis->setex('key', 3600, 'value'); // sets key → value, with 1h TTL.
+     */
+    public function setex($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Set the value and expiration in milliseconds of a key.
+     *
+     * @see     setex()
+     * @param   string       $key
+     * @param   int          $ttl, in milliseconds.
+     * @param   string|mixed $value
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link    https://redis.io/commands/psetex
+     * @example $redis->psetex('key', 1000, 'value'); // sets key → value, with 1sec TTL.
+     */
+    public function psetex($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key if the key doesn't already exist in the database.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/setnx
+     * @example
+     * <pre>
+     * $redis->setnx('key', 'value');   // return TRUE
+     * $redis->setnx('key', 'value');   // return FALSE
+     * </pre>
+     */
+    public function setnx($key, $value)
+    {
+    }
+
+    /**
+     * Remove specified keys.
+     *
+     * @param   int|string|array $key1 An array of keys, or an undefined number of parameters, each a key: key1 key2 key3 ... keyN
+     * @param   int|string       ...$otherKeys
+     *
+     * @return int Number of keys deleted
+     *
+     * @link https://redis.io/commands/del
+     * @example
+     * <pre>
+     * $redis->set('key1', 'val1');
+     * $redis->set('key2', 'val2');
+     * $redis->set('key3', 'val3');
+     * $redis->set('key4', 'val4');
+     *
+     * $redis->del('key1', 'key2');     // return 2
+     * $redis->del(['key3', 'key4']);   // return 2
+     * </pre>
+     */
+    public function del($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * @see del()
+     * @deprecated use Redis::del()
+     *
+     * @param   string|string[] $key1
+     * @param   string          $key2
+     * @param   string          $key3
+     *
+     * @return int Number of keys deleted
+     */
+    public function delete($key1, $key2 = null, $key3 = null)
+    {
+    }
+
+    /**
+     * Delete a key asynchronously in another thread. Otherwise it is just as DEL, but non blocking.
+     *
+     * @see del()
+     * @param string|string[] $key1
+     * @param string          $key2
+     * @param string          $key3
+     *
+     * @return int Number of keys unlinked.
+     *
+     * @link    https://redis.io/commands/unlink
+     * @example
+     * <pre>
+     * $redis->set('key1', 'val1');
+     * $redis->set('key2', 'val2');
+     * $redis->set('key3', 'val3');
+     * $redis->set('key4', 'val4');
+     * $redis->unlink('key1', 'key2');          // return 2
+     * $redis->unlink(array('key3', 'key4'));   // return 2
+     * </pre>
+     */
+    public function unlink($key1, $key2 = null, $key3 = null)
+    {
+    }
+
+    /**
+     * Enter and exit transactional mode.
+     *
+     * @param int $mode Redis::MULTI|Redis::PIPELINE
+     * Defaults to Redis::MULTI.
+     * A Redis::MULTI block of commands runs as a single transaction;
+     * a Redis::PIPELINE block is simply transmitted faster to the server, but without any guarantee of atomicity.
+     * discard cancels a transaction.
+     *
+     * @return Redis returns the Redis instance and enters multi-mode.
+     * Once in multi-mode, all subsequent method calls return the same object until exec() is called.
+     *
+     * @link    https://redis.io/commands/multi
+     * @example
+     * <pre>
+     * $ret = $redis->multi()
+     *      ->set('key1', 'val1')
+     *      ->get('key1')
+     *      ->set('key2', 'val2')
+     *      ->get('key2')
+     *      ->exec();
+     *
+     * //$ret == array (
+     * //    0 => TRUE,
+     * //    1 => 'val1',
+     * //    2 => TRUE,
+     * //    3 => 'val2');
+     * </pre>
+     */
+    public function multi($mode = Redis::MULTI)
+    {
+    }
+
+    /**
+     * @return void|array
+     *
+     * @see multi()
+     * @link https://redis.io/commands/exec
+     */
+    public function exec()
+    {
+    }
+
+    /**
+     * @see multi()
+     * @link https://redis.io/commands/discard
+     */
+    public function discard()
+    {
+    }
+
+    /**
+     * Watches a key for modifications by another client. If the key is modified between WATCH and EXEC,
+     * the MULTI/EXEC transaction will fail (return FALSE). unwatch cancels all the watching of all keys by this client.
+     * @param string|string[] $key a list of keys
+     *
+     * @return void
+     *
+     * @link    https://redis.io/commands/watch
+     * @example
+     * <pre>
+     * $redis->watch('x');
+     * // long code here during the execution of which other clients could well modify `x`
+     * $ret = $redis->multi()
+     *          ->incr('x')
+     *          ->exec();
+     * // $ret = FALSE if x has been modified between the call to WATCH and the call to EXEC.
+     * </pre>
+     */
+    public function watch($key)
+    {
+    }
+
+    /**
+     * @see watch()
+     * @link    https://redis.io/commands/unwatch
+     */
+    public function unwatch()
+    {
+    }
+
+    /**
+     * Subscribe to channels.
+     *
+     * Warning: this function will probably change in the future.
+     *
+     * @param string[]     $channels an array of channels to subscribe
+     * @param string|array $callback either a string or an array($instance, 'method_name').
+     * The callback function receives 3 parameters: the redis instance, the channel name, and the message.
+     *
+     * @return mixed|null Any non-null return value in the callback will be returned to the caller.
+     *
+     * @link    https://redis.io/commands/subscribe
+     * @example
+     * <pre>
+     * function f($redis, $chan, $msg) {
+     *  switch($chan) {
+     *      case 'chan-1':
+     *          ...
+     *          break;
+     *
+     *      case 'chan-2':
+     *                     ...
+     *          break;
+     *
+     *      case 'chan-2':
+     *          ...
+     *          break;
+     *      }
+     * }
+     *
+     * $redis->subscribe(array('chan-1', 'chan-2', 'chan-3'), 'f'); // subscribe to 3 chans
+     * </pre>
+     */
+    public function subscribe($channels, $callback)
+    {
+    }
+
+    /**
+     * Subscribe to channels by pattern
+     *
+     * @param array        $patterns   an array of glob-style patterns to subscribe
+     * @param string|array $callback   Either a string or an array with an object and method.
+     *                     The callback will get four arguments ($redis, $pattern, $channel, $message)
+     * @param mixed        $chan       Any non-null return value in the callback will be returned to the caller
+     * @param string       $msg
+     *
+     * @link    https://redis.io/commands/psubscribe
+     * @example
+     * <pre>
+     * function psubscribe($redis, $pattern, $chan, $msg) {
+     *  echo "Pattern: $pattern\n";
+     *  echo "Channel: $chan\n";
+     *  echo "Payload: $msg\n";
+     * }
+     * </pre>
+     */
+    public function psubscribe($patterns, $callback, $chan, $msg)
+    {
+    }
+
+    /**
+     * Publish messages to channels.
+     *
+     * Warning: this function will probably change in the future.
+     *
+     * @param string $channel a channel to publish to
+     * @param string $message string
+     *
+     * @return int Number of clients that received the message
+     *
+     * @link    https://redis.io/commands/publish
+     * @example $redis->publish('chan-1', 'hello, world!'); // send message.
+     */
+    public function publish($channel, $message)
+    {
+    }
+
+    /**
+     * A command allowing you to get information on the Redis pub/sub system
+     *
+     * @param string       $keyword    String, which can be: "channels", "numsub", or "numpat"
+     * @param string|array $argument   Optional, variant.
+     *                                 For the "channels" subcommand, you can pass a string pattern.
+     *                                 For "numsub" an array of channel names
+     *
+     * @return array|int Either an integer or an array.
+     *   - channels  Returns an array where the members are the matching channels.
+     *   - numsub    Returns a key/value array where the keys are channel names and
+     *               values are their counts.
+     *   - numpat    Integer return containing the number active pattern subscriptions
+     *
+     * @link    https://redis.io/commands/pubsub
+     * @example
+     * <pre>
+     * $redis->pubsub('channels'); // All channels
+     * $redis->pubsub('channels', '*pattern*'); // Just channels matching your pattern
+     * $redis->pubsub('numsub', array('chan1', 'chan2')); // Get subscriber counts for 'chan1' and 'chan2'
+     * $redis->pubsub('numpat'); // Get the number of pattern subscribers
+     * </pre>
+     */
+    public function pubsub($keyword, $argument)
+    {
+    }
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param array $channels an array of channels to usubscribe
+     *
+     * @link    https://redis.io/commands/unsubscribe
+     */
+    public function unsubscribe($channels = null)
+    {
+    }
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param array $patterns   an array of glob-style patterns to unsubscribe
+     *
+     * @link https://redis.io/commands/punsubscribe
+     */
+    public function punsubscribe($patterns = null)
+    {
+    }
+
+    /**
+     * Verify if the specified key/keys exists
+     *
+     * This function took a single argument and returned TRUE or FALSE in phpredis versions < 4.0.0.
+     *
+     * @since >= 4.0 Returned int, if < 4.0 returned bool
+     *
+     * @param string|string[] $key
+     *
+     * @return int|bool The number of keys tested that do exist
+     *
+     * @link https://redis.io/commands/exists
+     * @link https://github.com/phpredis/phpredis#exists
+     * @example
+     * <pre>
+     * $redis->exists('key'); // 1
+     * $redis->exists('NonExistingKey'); // 0
+     *
+     * $redis->mset(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz']);
+     * $redis->exists(['foo', 'bar', 'baz]); // 3
+     * $redis->exists('foo', 'bar', 'baz'); // 3
+     * </pre>
+     */
+    public function exists($key)
+    {
+    }
+
+    /**
+     * Increment the number stored at key by one.
+     *
+     * @param   string $key
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/incr
+     * @example
+     * <pre>
+     * $redis->incr('key1'); // key1 didn't exists, set to 0 before the increment and now has the value 1
+     * $redis->incr('key1'); // 2
+     * $redis->incr('key1'); // 3
+     * $redis->incr('key1'); // 4
+     * </pre>
+     */
+    public function incr($key)
+    {
+    }
+
+    /**
+     * Increment the float value of a key by the given amount
+     *
+     * @param string $key
+     * @param float  $increment
+     *
+     * @return float
+     *
+     * @link    https://redis.io/commands/incrbyfloat
+     * @example
+     * <pre>
+     * $redis->set('x', 3);
+     * $redis->incrByFloat('x', 1.5);   // float(4.5)
+     * $redis->get('x');                // float(4.5)
+     * </pre>
+     */
+    public function incrByFloat($key, $increment)
+    {
+    }
+
+    /**
+     * Increment the number stored at key by one.
+     * If the second argument is filled, it will be used as the integer value of the increment.
+     *
+     * @param string $key   key
+     * @param int    $value value that will be added to key (only for incrBy)
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/incrby
+     * @example
+     * <pre>
+     * $redis->incr('key1');        // key1 didn't exists, set to 0 before the increment and now has the value 1
+     * $redis->incr('key1');        // 2
+     * $redis->incr('key1');        // 3
+     * $redis->incr('key1');        // 4
+     * $redis->incrBy('key1', 10);  // 14
+     * </pre>
+     */
+    public function incrBy($key, $value)
+    {
+    }
+
+    /**
+     * Decrement the number stored at key by one.
+     *
+     * @param string $key
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/decr
+     * @example
+     * <pre>
+     * $redis->decr('key1'); // key1 didn't exists, set to 0 before the increment and now has the value -1
+     * $redis->decr('key1'); // -2
+     * $redis->decr('key1'); // -3
+     * </pre>
+     */
+    public function decr($key)
+    {
+    }
+
+    /**
+     * Decrement the number stored at key by one.
+     * If the second argument is filled, it will be used as the integer value of the decrement.
+     *
+     * @param string $key
+     * @param int    $value  that will be substracted to key (only for decrBy)
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/decrby
+     * @example
+     * <pre>
+     * $redis->decr('key1');        // key1 didn't exists, set to 0 before the increment and now has the value -1
+     * $redis->decr('key1');        // -2
+     * $redis->decr('key1');        // -3
+     * $redis->decrBy('key1', 10);  // -13
+     * </pre>
+     */
+    public function decrBy($key, $value)
+    {
+    }
+
+    /**
+     * Adds the string values to the head (left) of the list.
+     * Creates the list if the key didn't exist.
+     * If the key exists and is not a list, FALSE is returned.
+     *
+     * @param string $key
+     * @param string|mixed $value1... Variadic list of values to push in key, if dont used serialized, used string
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure
+     *
+     * @link https://redis.io/commands/lpush
+     * @example
+     * <pre>
+     * $redis->lPush('l', 'v1', 'v2', 'v3', 'v4')   // int(4)
+     * var_dump( $redis->lRange('l', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v4"
+     * //   [1]=> string(2) "v3"
+     * //   [2]=> string(2) "v2"
+     * //   [3]=> string(2) "v1"
+     * // }
+     * </pre>
+     */
+    public function lPush($key, ...$value1)
+    {
+    }
+
+    /**
+     * Adds the string values to the tail (right) of the list.
+     * Creates the list if the key didn't exist.
+     * If the key exists and is not a list, FALSE is returned.
+     *
+     * @param string $key
+     * @param string|mixed $value1... Variadic list of values to push in key, if dont used serialized, used string
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure
+     *
+     * @link    https://redis.io/commands/rpush
+     * @example
+     * <pre>
+     * $redis->rPush('l', 'v1', 'v2', 'v3', 'v4');    // int(4)
+     * var_dump( $redis->lRange('l', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v2"
+     * //   [2]=> string(2) "v3"
+     * //   [3]=> string(2) "v4"
+     * // }
+     * </pre>
+     */
+    public function rPush($key, ...$value1)
+    {
+    }
+
+    /**
+     * Adds the string value to the head (left) of the list if the list exists.
+     *
+     * @param string $key
+     * @param string|mixed $value String, value to push in key
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure.
+     *
+     * @link    https://redis.io/commands/lpushx
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->lPushx('key1', 'A');     // returns 0
+     * $redis->lPush('key1', 'A');      // returns 1
+     * $redis->lPushx('key1', 'B');     // returns 2
+     * $redis->lPushx('key1', 'C');     // returns 3
+     * // key1 now points to the following list: [ 'A', 'B', 'C' ]
+     * </pre>
+     */
+    public function lPushx($key, $value)
+    {
+    }
+
+    /**
+     * Adds the string value to the tail (right) of the list if the ist exists. FALSE in case of Failure.
+     *
+     * @param string $key
+     * @param string|mixed $value String, value to push in key
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure.
+     *
+     * @link    https://redis.io/commands/rpushx
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->rPushx('key1', 'A'); // returns 0
+     * $redis->rPush('key1', 'A'); // returns 1
+     * $redis->rPushx('key1', 'B'); // returns 2
+     * $redis->rPushx('key1', 'C'); // returns 3
+     * // key1 now points to the following list: [ 'A', 'B', 'C' ]
+     * </pre>
+     */
+    public function rPushx($key, $value)
+    {
+    }
+
+    /**
+     * Returns and removes the first element of the list.
+     *
+     * @param   string $key
+     *
+     * @return  mixed|bool if command executed successfully BOOL FALSE in case of failure (empty list)
+     *
+     * @link    https://redis.io/commands/lpop
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lPop('key1');        // key1 => [ 'B', 'C' ]
+     * </pre>
+     */
+    public function lPop($key)
+    {
+    }
+
+    /**
+     * Returns and removes the last element of the list.
+     *
+     * @param   string $key
+     *
+     * @return  mixed|bool if command executed successfully BOOL FALSE in case of failure (empty list)
+     *
+     * @link    https://redis.io/commands/rpop
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->rPop('key1');        // key1 => [ 'A', 'B' ]
+     * </pre>
+     */
+    public function rPop($key)
+    {
+    }
+
+    /**
+     * Is a blocking lPop primitive. If at least one of the lists contains at least one element,
+     * the element will be popped from the head of the list and returned to the caller.
+     * Il all the list identified by the keys passed in arguments are empty, blPop will block
+     * during the specified timeout until an element is pushed to one of those lists. This element will be popped.
+     *
+     * @param string|string[] $keys    String array containing the keys of the lists OR variadic list of strings
+     * @param int             $timeout Timeout is always the required final parameter
+     *
+     * @return array ['listName', 'element']
+     *
+     * @link    https://redis.io/commands/blpop
+     * @example
+     * <pre>
+     * // Non blocking feature
+     * $redis->lPush('key1', 'A');
+     * $redis->del('key2');
+     *
+     * $redis->blPop('key1', 'key2', 10);        // array('key1', 'A')
+     * // OR
+     * $redis->blPop(['key1', 'key2'], 10);      // array('key1', 'A')
+     *
+     * $redis->brPop('key1', 'key2', 10);        // array('key1', 'A')
+     * // OR
+     * $redis->brPop(['key1', 'key2'], 10); // array('key1', 'A')
+     *
+     * // Blocking feature
+     *
+     * // process 1
+     * $redis->del('key1');
+     * $redis->blPop('key1', 10);
+     * // blocking for 10 seconds
+     *
+     * // process 2
+     * $redis->lPush('key1', 'A');
+     *
+     * // process 1
+     * // array('key1', 'A') is returned
+     * </pre>
+     */
+    public function blPop($keys, $timeout)
+    {
+    }
+
+    /**
+     * Is a blocking rPop primitive. If at least one of the lists contains at least one element,
+     * the element will be popped from the head of the list and returned to the caller.
+     * Il all the list identified by the keys passed in arguments are empty, brPop will
+     * block during the specified timeout until an element is pushed to one of those lists. T
+     * his element will be popped.
+     *
+     * @param string|string[] $keys    String array containing the keys of the lists OR variadic list of strings
+     * @param int             $timeout Timeout is always the required final parameter
+     *
+     * @return array ['listName', 'element']
+     *
+     * @link    https://redis.io/commands/brpop
+     * @example
+     * <pre>
+     * // Non blocking feature
+     * $redis->lPush('key1', 'A');
+     * $redis->del('key2');
+     *
+     * $redis->blPop('key1', 'key2', 10); // array('key1', 'A')
+     * // OR
+     * $redis->blPop(array('key1', 'key2'), 10); // array('key1', 'A')
+     *
+     * $redis->brPop('key1', 'key2', 10); // array('key1', 'A')
+     * // OR
+     * $redis->brPop(array('key1', 'key2'), 10); // array('key1', 'A')
+     *
+     * // Blocking feature
+     *
+     * // process 1
+     * $redis->del('key1');
+     * $redis->blPop('key1', 10);
+     * // blocking for 10 seconds
+     *
+     * // process 2
+     * $redis->lPush('key1', 'A');
+     *
+     * // process 1
+     * // array('key1', 'A') is returned
+     * </pre>
+     */
+    public function brPop(array $keys, $timeout)
+    {
+    }
+
+    /**
+     * Returns the size of a list identified by Key. If the list didn't exist or is empty,
+     * the command returns 0. If the data type identified by Key is not a list, the command return FALSE.
+     *
+     * @param string $key
+     *
+     * @return int|bool The size of the list identified by Key exists.
+     * bool FALSE if the data type identified by Key is not list
+     *
+     * @link    https://redis.io/commands/llen
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C'); // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lLen('key1');       // 3
+     * $redis->rPop('key1');
+     * $redis->lLen('key1');       // 2
+     * </pre>
+     */
+    public function lLen($key)
+    {
+    }
+
+    /**
+     * @see lLen()
+     * @link https://redis.io/commands/llen
+     * @deprecated use Redis::lLen()
+     *
+     * @param string $key
+     *
+     * @return int The size of the list identified by Key exists
+     */
+    public function lSize($key)
+    {
+    }
+
+    /**
+     * Return the specified element of the list stored at the specified key.
+     * 0 the first element, 1 the second ... -1 the last element, -2 the penultimate ...
+     * Return FALSE in case of a bad index or a key that doesn't point to a list.
+     *
+     * @param string $key
+     * @param int    $index
+     *
+     * @return mixed|bool the element at this index
+     *
+     * Bool FALSE if the key identifies a non-string data type, or no value corresponds to this index in the list Key.
+     *
+     * @link    https://redis.io/commands/lindex
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lIndex('key1', 0);     // 'A'
+     * $redis->lIndex('key1', -1);    // 'C'
+     * $redis->lIndex('key1', 10);    // `FALSE`
+     * </pre>
+     */
+    public function lIndex($key, $index)
+    {
+    }
+
+    /**
+     * @see lIndex()
+     * @link https://redis.io/commands/lindex
+     * @deprecated use Redis::lIndex()
+     *
+     * @param string $key
+     * @param int $index
+     * @return mixed|bool the element at this index
+     */
+    public function lGet($key, $index)
+    {
+    }
+
+    /**
+     * Set the list at index with the new value.
+     *
+     * @param string $key
+     * @param int    $index
+     * @param string $value
+     *
+     * @return bool TRUE if the new value is setted.
+     * FALSE if the index is out of range, or data type identified by key is not a list.
+     *
+     * @link    https://redis.io/commands/lset
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');    // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lIndex('key1', 0);     // 'A'
+     * $redis->lSet('key1', 0, 'X');
+     * $redis->lIndex('key1', 0);     // 'X'
+     * </pre>
+     */
+    public function lSet($key, $index, $value)
+    {
+    }
+
+    /**
+     * Returns the specified elements of the list stored at the specified key in
+     * the range [start, end]. start and stop are interpretated as indices: 0 the first element,
+     * 1 the second ... -1 the last element, -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/lrange
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');
+     * $redis->lRange('key1', 0, -1); // array('A', 'B', 'C')
+     * </pre>
+     */
+    public function lRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see lRange()
+     * @link https://redis.io/commands/lrange
+     * @deprecated use Redis::lRange()
+     *
+     * @param string    $key
+     * @param int       $start
+     * @param int       $end
+     * @return array
+     */
+    public function lGetRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * Trims an existing list so that it will contain only a specified range of elements.
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $stop
+     *
+     * @return array|bool Bool return FALSE if the key identify a non-list value
+     *
+     * @link        https://redis.io/commands/ltrim
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');
+     * $redis->lRange('key1', 0, -1); // array('A', 'B', 'C')
+     * $redis->lTrim('key1', 0, 1);
+     * $redis->lRange('key1', 0, -1); // array('A', 'B')
+     * </pre>
+     */
+    public function lTrim($key, $start, $stop)
+    {
+    }
+
+    /**
+     * @see lTrim()
+     * @link  https://redis.io/commands/ltrim
+     * @deprecated use Redis::lTrim()
+     *
+     * @param string    $key
+     * @param int       $start
+     * @param int       $stop
+     */
+    public function listTrim($key, $start, $stop)
+    {
+    }
+
+    /**
+     * Removes the first count occurences of the value element from the list.
+     * If count is zero, all the matching elements are removed. If count is negative,
+     * elements are removed from tail to head.
+     *
+     * @param string $key
+     * @param string $value
+     * @param int    $count
+     *
+     * @return int|bool the number of elements to remove
+     * bool FALSE if the value identified by key is not a list.
+     *
+     * @link    https://redis.io/commands/lrem
+     * @example
+     * <pre>
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'B');
+     * $redis->lPush('key1', 'C');
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'A');
+     *
+     * $redis->lRange('key1', 0, -1);   // array('A', 'A', 'C', 'B', 'A')
+     * $redis->lRem('key1', 'A', 2);    // 2
+     * $redis->lRange('key1', 0, -1);   // array('C', 'B', 'A')
+     * </pre>
+     */
+    public function lRem($key, $value, $count)
+    {
+    }
+
+    /**
+     * @see lRem
+     * @link https://redis.io/commands/lremove
+     * @deprecated use Redis::lRem()
+     *
+     * @param string $key
+     * @param string $value
+     * @param int $count
+     */
+    public function lRemove($key, $value, $count)
+    {
+    }
+
+    /**
+     * Insert value in the list before or after the pivot value. the parameter options
+     * specify the position of the insert (before or after). If the list didn't exists,
+     * or the pivot didn't exists, the value is not inserted.
+     *
+     * @param string       $key
+     * @param int          $position Redis::BEFORE | Redis::AFTER
+     * @param string       $pivot
+     * @param string|mixed $value
+     *
+     * @return int The number of the elements in the list, -1 if the pivot didn't exists.
+     *
+     * @link    https://redis.io/commands/linsert
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->lInsert('key1', Redis::AFTER, 'A', 'X');     // 0
+     *
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'B');
+     * $redis->lPush('key1', 'C');
+     *
+     * $redis->lInsert('key1', Redis::BEFORE, 'C', 'X');    // 4
+     * $redis->lRange('key1', 0, -1);                       // array('A', 'B', 'X', 'C')
+     *
+     * $redis->lInsert('key1', Redis::AFTER, 'C', 'Y');     // 5
+     * $redis->lRange('key1', 0, -1);                       // array('A', 'B', 'X', 'C', 'Y')
+     *
+     * $redis->lInsert('key1', Redis::AFTER, 'W', 'value'); // -1
+     * </pre>
+     */
+    public function lInsert($key, $position, $pivot, $value)
+    {
+    }
+
+    /**
+     * Adds a values to the set value stored at key.
+     *
+     * @param string       $key       Required key
+     * @param string|mixed ...$value1 Variadic list of values
+     *
+     * @return int|bool The number of elements added to the set.
+     * If this value is already in the set, FALSE is returned
+     *
+     * @link    https://redis.io/commands/sadd
+     * @example
+     * <pre>
+     * $redis->sAdd('k', 'v1');                // int(1)
+     * $redis->sAdd('k', 'v1', 'v2', 'v3');    // int(2)
+     * </pre>
+     */
+    public function sAdd($key, ...$value1)
+    {
+    }
+
+    /**
+     * Removes the specified members from the set value stored at key.
+     *
+     * @param   string       $key
+     * @param   string|mixed ...$member1 Variadic list of members
+     *
+     * @return int The number of elements removed from the set
+     *
+     * @link    https://redis.io/commands/srem
+     * @example
+     * <pre>
+     * var_dump( $redis->sAdd('k', 'v1', 'v2', 'v3') );    // int(3)
+     * var_dump( $redis->sRem('k', 'v2', 'v3') );          // int(2)
+     * var_dump( $redis->sMembers('k') );
+     * //// Output:
+     * // array(1) {
+     * //   [0]=> string(2) "v1"
+     * // }
+     * </pre>
+     */
+    public function sRem($key, ...$member1)
+    {
+    }
+
+    /**
+     * @see sRem()
+     * @link    https://redis.io/commands/srem
+     * @deprecated use Redis::sRem()
+     *
+     * @param   string  $key
+     * @param   string|mixed  ...$member1
+     */
+    public function sRemove($key, ...$member1)
+    {
+    }
+
+    /**
+     * Moves the specified member from the set at srcKey to the set at dstKey.
+     *
+     * @param string       $srcKey
+     * @param string       $dstKey
+     * @param string|mixed $member
+     *
+     * @return bool If the operation is successful, return TRUE.
+     * If the srcKey and/or dstKey didn't exist, and/or the member didn't exist in srcKey, FALSE is returned.
+     *
+     * @link    https://redis.io/commands/smove
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set11');
+     * $redis->sAdd('key1' , 'set12');
+     * $redis->sAdd('key1' , 'set13');          // 'key1' => {'set11', 'set12', 'set13'}
+     * $redis->sAdd('key2' , 'set21');
+     * $redis->sAdd('key2' , 'set22');          // 'key2' => {'set21', 'set22'}
+     * $redis->sMove('key1', 'key2', 'set13');  // 'key1' =>  {'set11', 'set12'}
+     *                                          // 'key2' =>  {'set21', 'set22', 'set13'}
+     * </pre>
+     */
+    public function sMove($srcKey, $dstKey, $member)
+    {
+    }
+
+    /**
+     * Checks if value is a member of the set stored at the key key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return bool TRUE if value is a member of the set at key key, FALSE otherwise
+     *
+     * @link    https://redis.io/commands/sismember
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3'); // 'key1' => {'set1', 'set2', 'set3'}
+     *
+     * $redis->sIsMember('key1', 'set1'); // TRUE
+     * $redis->sIsMember('key1', 'setX'); // FALSE
+     * </pre>
+     */
+    public function sIsMember($key, $value)
+    {
+    }
+
+    /**
+     * @see sIsMember()
+     * @link    https://redis.io/commands/sismember
+     * @deprecated use Redis::sIsMember()
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     */
+    public function sContains($key, $value)
+    {
+    }
+
+    /**
+     * Returns the cardinality of the set identified by key.
+     *
+     * @param string $key
+     *
+     * @return int the cardinality of the set identified by key, 0 if the set doesn't exist.
+     *
+     * @link    https://redis.io/commands/scard
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3');   // 'key1' => {'set1', 'set2', 'set3'}
+     * $redis->sCard('key1');           // 3
+     * $redis->sCard('keyX');           // 0
+     * </pre>
+     */
+    public function sCard($key)
+    {
+    }
+
+    /**
+     * Removes and returns a random element from the set value at Key.
+     *
+     * @param string $key
+     *
+     * @return string|mixed|bool "popped" value
+     * bool FALSE if set identified by key is empty or doesn't exist.
+     *
+     * @link    https://redis.io/commands/spop
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3');   // 'key1' => {'set3', 'set1', 'set2'}
+     * $redis->sPop('key1');            // 'set1', 'key1' => {'set3', 'set2'}
+     * $redis->sPop('key1');            // 'set3', 'key1' => {'set2'}
+     * </pre>
+     */
+    public function sPop($key)
+    {
+    }
+
+    /**
+     * Returns a random element(s) from the set value at Key, without removing it.
+     *
+     * @param string $key
+     * @param int    $count [optional]
+     *
+     * @return string|mixed|array|bool value(s) from the set
+     * bool FALSE if set identified by key is empty or doesn't exist and count argument isn't passed.
+     *
+     * @link    https://redis.io/commands/srandmember
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'one');
+     * $redis->sAdd('key1' , 'two');
+     * $redis->sAdd('key1' , 'three');              // 'key1' => {'one', 'two', 'three'}
+     *
+     * var_dump( $redis->sRandMember('key1') );     // 'key1' => {'one', 'two', 'three'}
+     *
+     * // string(5) "three"
+     *
+     * var_dump( $redis->sRandMember('key1', 2) );  // 'key1' => {'one', 'two', 'three'}
+     *
+     * // array(2) {
+     * //   [0]=> string(2) "one"
+     * //   [1]=> string(2) "three"
+     * // }
+     * </pre>
+     */
+    public function sRandMember($key, $count = 1)
+    {
+    }
+
+    /**
+     * Returns the members of a set resulting from the intersection of all the sets
+     * held at the specified keys. If just a single key is specified, then this command
+     * produces the members of this set. If one of the keys is missing, FALSE is returned.
+     *
+     * @param string $key1         keys identifying the different sets on which we will apply the intersection.
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return array contain the result of the intersection between those keys
+     * If the intersection between the different sets is empty, the return value will be empty array.
+     *
+     * @link    https://redis.io/commands/sinter
+     * @example
+     * <pre>
+     * $redis->sAdd('key1', 'val1');
+     * $redis->sAdd('key1', 'val2');
+     * $redis->sAdd('key1', 'val3');
+     * $redis->sAdd('key1', 'val4');
+     *
+     * $redis->sAdd('key2', 'val3');
+     * $redis->sAdd('key2', 'val4');
+     *
+     * $redis->sAdd('key3', 'val3');
+     * $redis->sAdd('key3', 'val4');
+     *
+     * var_dump($redis->sInter('key1', 'key2', 'key3'));
+     *
+     * //array(2) {
+     * //  [0]=>
+     * //  string(4) "val4"
+     * //  [1]=>
+     * //  string(4) "val3"
+     * //}
+     * </pre>
+     */
+    public function sInter($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs a sInter command and stores the result in a new set.
+     *
+     * @param string $dstKey       the key to store the diff into.
+     * @param string $key1         keys identifying the different sets on which we will apply the intersection.
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return int|bool The cardinality of the resulting set, or FALSE in case of a missing key
+     *
+     * @link    https://redis.io/commands/sinterstore
+     * @example
+     * <pre>
+     * $redis->sAdd('key1', 'val1');
+     * $redis->sAdd('key1', 'val2');
+     * $redis->sAdd('key1', 'val3');
+     * $redis->sAdd('key1', 'val4');
+     *
+     * $redis->sAdd('key2', 'val3');
+     * $redis->sAdd('key2', 'val4');
+     *
+     * $redis->sAdd('key3', 'val3');
+     * $redis->sAdd('key3', 'val4');
+     *
+     * var_dump($redis->sInterStore('output', 'key1', 'key2', 'key3'));
+     * var_dump($redis->sMembers('output'));
+     *
+     * //int(2)
+     * //
+     * //array(2) {
+     * //  [0]=>
+     * //  string(4) "val4"
+     * //  [1]=>
+     * //  string(4) "val3"
+     * //}
+     * </pre>
+     */
+    public function sInterStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the union between N sets and returns it.
+     *
+     * @param string $key1         first key for union
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return array string[] The union of all these sets
+     *
+     * @link    https://redis.io/commands/sunionstore
+     * @example
+     * <pre>
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s1', '3');
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     * $redis->sAdd('s2', '4');
+     *
+     * var_dump($redis->sUnion('s0', 's1', 's2'));
+     *
+     * array(4) {
+     * //  [0]=>
+     * //  string(1) "3"
+     * //  [1]=>
+     * //  string(1) "4"
+     * //  [2]=>
+     * //  string(1) "1"
+     * //  [3]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sUnion($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the same action as sUnion, but stores the result in the first key
+     *
+     * @param   string  $dstKey  the key to store the diff into.
+     * @param string $key1         first key for union
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return int Any number of keys corresponding to sets in redis
+     *
+     * @link    https://redis.io/commands/sunionstore
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s1', '3');
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     * $redis->sAdd('s2', '4');
+     *
+     * var_dump($redis->sUnionStore('dst', 's0', 's1', 's2'));
+     * var_dump($redis->sMembers('dst'));
+     *
+     * //int(4)
+     * //array(4) {
+     * //  [0]=>
+     * //  string(1) "3"
+     * //  [1]=>
+     * //  string(1) "4"
+     * //  [2]=>
+     * //  string(1) "1"
+     * //  [3]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sUnionStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the difference between N sets and returns it.
+     *
+     * @param string $key1         first key for diff
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return array string[] The difference of the first set will all the others
+     *
+     * @link    https://redis.io/commands/sdiff
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s0', '3');
+     * $redis->sAdd('s0', '4');
+     *
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     *
+     * var_dump($redis->sDiff('s0', 's1', 's2'));
+     *
+     * //array(2) {
+     * //  [0]=>
+     * //  string(1) "4"
+     * //  [1]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sDiff($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the same action as sDiff, but stores the result in the first key
+     *
+     * @param string $dstKey       the key to store the diff into.
+     * @param string $key1         first key for diff
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return int|bool The cardinality of the resulting set, or FALSE in case of a missing key
+     *
+     * @link    https://redis.io/commands/sdiffstore
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s0', '3');
+     * $redis->sAdd('s0', '4');
+     *
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     *
+     * var_dump($redis->sDiffStore('dst', 's0', 's1', 's2'));
+     * var_dump($redis->sMembers('dst'));
+     *
+     * //int(2)
+     * //array(2) {
+     * //  [0]=>
+     * //  string(1) "4"
+     * //  [1]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sDiffStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Returns the contents of a set.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the contents of the set
+     *
+     * @link    https://redis.io/commands/smembers
+     * @example
+     * <pre>
+     * $redis->del('s');
+     * $redis->sAdd('s', 'a');
+     * $redis->sAdd('s', 'b');
+     * $redis->sAdd('s', 'a');
+     * $redis->sAdd('s', 'c');
+     * var_dump($redis->sMembers('s'));
+     *
+     * //array(3) {
+     * //  [0]=>
+     * //  string(1) "c"
+     * //  [1]=>
+     * //  string(1) "a"
+     * //  [2]=>
+     * //  string(1) "b"
+     * //}
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function sMembers($key)
+    {
+    }
+
+    /**
+     * @see sMembers()
+     * @link    https://redis.io/commands/smembers
+     * @deprecated use Redis::sMembers()
+     *
+     * @param  string  $key
+     * @return array   An array of elements, the contents of the set
+     */
+    public function sGetMembers($key)
+    {
+    }
+
+    /**
+     * Scan a set for members
+     *
+     * @param string $key      The set to search.
+     * @param int    $iterator LONG (reference) to the iterator as we go.
+     * @param string   $pattern  String, optional pattern to match against.
+     * @param int    $count    How many members to return at a time (Redis might return a different amount)
+     *
+     * @return array|bool PHPRedis will return an array of keys or FALSE when we're done iterating
+     *
+     * @link    https://redis.io/commands/sscan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while ($members = $redis->sScan('set', $iterator)) {
+     *     foreach ($members as $member) {
+     *         echo $member . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function sScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Sets a value and returns the previous entry at that key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return string|mixed A string (mixed, if used serializer), the previous value located at this key
+     *
+     * @link    https://redis.io/commands/getset
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $exValue = $redis->getSet('x', 'lol');   // return '42', replaces x by 'lol'
+     * $newValue = $redis->get('x')'            // return 'lol'
+     * </pre>
+     */
+    public function getSet($key, $value)
+    {
+    }
+
+    /**
+     * Returns a random key
+     *
+     * @return string an existing key in redis
+     *
+     * @link    https://redis.io/commands/randomkey
+     * @example
+     * <pre>
+     * $key = $redis->randomKey();
+     * $surprise = $redis->get($key);  // who knows what's in there.
+     * </pre>
+     */
+    public function randomKey()
+    {
+    }
+
+    /**
+     * Switches to a given database
+     *
+     * @param int $dbIndex
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/select
+     * @example
+     * <pre>
+     * $redis->select(0);       // switch to DB 0
+     * $redis->set('x', '42');  // write 42 to x
+     * $redis->move('x', 1);    // move to DB 1
+     * $redis->select(1);       // switch to DB 1
+     * $redis->get('x');        // will return 42
+     * </pre>
+     */
+    public function select($dbIndex)
+    {
+    }
+
+    /**
+     * Moves a key to a different database.
+     *
+     * @param string $key
+     * @param int    $dbIndex
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/move
+     * @example
+     * <pre>
+     * $redis->select(0);       // switch to DB 0
+     * $redis->set('x', '42');  // write 42 to x
+     * $redis->move('x', 1);    // move to DB 1
+     * $redis->select(1);       // switch to DB 1
+     * $redis->get('x');        // will return 42
+     * </pre>
+     */
+    public function move($key, $dbIndex)
+    {
+    }
+
+    /**
+     * Renames a key
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/rename
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->rename('x', 'y');
+     * $redis->get('y');   // → 42
+     * $redis->get('x');   // → `FALSE`
+     * </pre>
+     */
+    public function rename($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * @see rename()
+     * @link    https://redis.io/commands/rename
+     * @deprecated use Redis::rename()
+     *
+     * @param   string  $srcKey
+     * @param   string  $dstKey
+     */
+    public function renameKey($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * Renames a key
+     *
+     * Same as rename, but will not replace a key if the destination already exists.
+     * This is the same behaviour as setNx.
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/renamenx
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->rename('x', 'y');
+     * $redis->get('y');   // → 42
+     * $redis->get('x');   // → `FALSE`
+     * </pre>
+     */
+    public function renameNx($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timeout) on an item
+     *
+     * @param string $key The key that will disappear
+     * @param int    $ttl The key's remaining Time To Live, in seconds
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/expire
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->expire('x', 3);  // x will disappear in 3 seconds.
+     * sleep(5);                    // wait 5 seconds
+     * $redis->get('x');            // will return `FALSE`, as 'x' has expired.
+     * </pre>
+     */
+    public function expire($key, $ttl)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timeout in milliseconds) on an item
+     *
+     * @param string $key The key that will disappear.
+     * @param int    $ttl The key's remaining Time To Live, in milliseconds
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/pexpire
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->pExpire('x', 11500); // x will disappear in 11500 milliseconds.
+     * $redis->ttl('x');            // 12
+     * $redis->pttl('x');           // 11500
+     * </pre>
+     */
+    public function pExpire($key, $ttl)
+    {
+    }
+
+    /**
+     * @see expire()
+     * @link    https://redis.io/commands/expire
+     * @deprecated use Redis::expire()
+     *
+     * @param   string  $key
+     * @param   int     $ttl
+     * @return  bool
+     */
+    public function setTimeout($key, $ttl)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timestamp) on an item.
+     *
+     * @param string $key       The key that will disappear.
+     * @param int    $timestamp Unix timestamp. The key's date of death, in seconds from Epoch time.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/expireat
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $now = time(NULL);               // current timestamp
+     * $redis->expireAt('x', $now + 3); // x will disappear in 3 seconds.
+     * sleep(5);                        // wait 5 seconds
+     * $redis->get('x');                // will return `FALSE`, as 'x' has expired.
+     * </pre>
+     */
+    public function expireAt($key, $timestamp)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timestamp) on an item. Requires a timestamp in milliseconds
+     *
+     * @param string $key       The key that will disappear
+     * @param int    $timestamp Unix timestamp. The key's date of death, in seconds from Epoch time
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/pexpireat
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->pExpireAt('x', 1555555555005);
+     * echo $redis->ttl('x');                       // 218270121
+     * echo $redis->pttl('x');                      // 218270120575
+     * </pre>
+     */
+    public function pExpireAt($key, $timestamp)
+    {
+    }
+
+    /**
+     * Returns the keys that match a certain pattern.
+     *
+     * @param string $pattern pattern, using '*' as a wildcard
+     *
+     * @return array string[] The keys that match a certain pattern.
+     *
+     * @link    https://redis.io/commands/keys
+     * @example
+     * <pre>
+     * $allKeys = $redis->keys('*');   // all keys will match this.
+     * $keyWithUserPrefix = $redis->keys('user*');
+     * </pre>
+     */
+    public function keys($pattern)
+    {
+    }
+
+    /**
+     * @see keys()
+     * @deprecated use Redis::keys()
+     *
+     * @param string $pattern
+     * @link    https://redis.io/commands/keys
+     */
+    public function getKeys($pattern)
+    {
+    }
+
+    /**
+     * Returns the current database's size
+     *
+     * @return int DB size, in number of keys
+     *
+     * @link    https://redis.io/commands/dbsize
+     * @example
+     * <pre>
+     * $count = $redis->dbSize();
+     * echo "Redis has $count keys\n";
+     * </pre>
+     */
+    public function dbSize()
+    {
+    }
+
+    /**
+     * Authenticate the connection using a password.
+     * Warning: The password is sent in plain-text over the network.
+     *
+     * @param string $password
+     *
+     * @return bool TRUE if the connection is authenticated, FALSE otherwise
+     *
+     * @link    https://redis.io/commands/auth
+     * @example $redis->auth('foobared');
+     */
+    public function auth($password)
+    {
+    }
+
+    /**
+     * Starts the background rewrite of AOF (Append-Only File)
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/bgrewriteaof
+     * @example $redis->bgrewriteaof();
+     */
+    public function bgrewriteaof()
+    {
+    }
+
+    /**
+     * Changes the slave status
+     * Either host and port, or no parameter to stop being a slave.
+     *
+     * @param string $host [optional]
+     * @param int    $port [optional]
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/slaveof
+     * @example
+     * <pre>
+     * $redis->slaveof('10.0.1.7', 6379);
+     * // ...
+     * $redis->slaveof();
+     * </pre>
+     */
+    public function slaveof($host = '127.0.0.1', $port = 6379)
+    {
+    }
+
+    /**
+     * Access the Redis slowLog
+     *
+     * @param string   $operation This can be either GET, LEN, or RESET
+     * @param int|null $length    If executing a SLOWLOG GET command, you can pass an optional length.
+     *
+     * @return mixed The return value of SLOWLOG will depend on which operation was performed.
+     * - SLOWLOG GET: Array of slowLog entries, as provided by Redis
+     * - SLOGLOG LEN: Integer, the length of the slowLog
+     * - SLOWLOG RESET: Boolean, depending on success
+     *
+     * @example
+     * <pre>
+     * // Get ten slowLog entries
+     * $redis->slowLog('get', 10);
+     * // Get the default number of slowLog entries
+     *
+     * $redis->slowLog('get');
+     * // Reset our slowLog
+     * $redis->slowLog('reset');
+     *
+     * // Retrieve slowLog length
+     * $redis->slowLog('len');
+     * </pre>
+     *
+     * @link https://redis.io/commands/slowlog
+     */
+    public function slowLog(string $operation, int $length = null)
+    {
+    }
+
+
+    /**
+     * Describes the object pointed to by a key.
+     * The information to retrieve (string) and the key (string).
+     * Info can be one of the following:
+     * - "encoding"
+     * - "refcount"
+     * - "idletime"
+     *
+     * @param string $string
+     * @param string $key
+     *
+     * @return string|int|bool for "encoding", int for "refcount" and "idletime", FALSE if the key doesn't exist.
+     *
+     * @link    https://redis.io/commands/object
+     * @example
+     * <pre>
+     * $redis->lPush('l', 'Hello, world!');
+     * $redis->object("encoding", "l"); // → ziplist
+     * $redis->object("refcount", "l"); // → 1
+     * $redis->object("idletime", "l"); // → 400 (in seconds, with a precision of 10 seconds).
+     * </pre>
+     */
+    public function object($string = '', $key = '')
+    {
+    }
+
+    /**
+     * Performs a synchronous save.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     * If a save is already running, this command will fail and return FALSE.
+     *
+     * @link    https://redis.io/commands/save
+     * @example $redis->save();
+     */
+    public function save()
+    {
+    }
+
+    /**
+     * Performs a background save.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     * If a save is already running, this command will fail and return FALSE
+     *
+     * @link    https://redis.io/commands/bgsave
+     * @example $redis->bgSave();
+     */
+    public function bgsave()
+    {
+    }
+
+    /**
+     * Returns the timestamp of the last disk save.
+     *
+     * @return int timestamp
+     *
+     * @link    https://redis.io/commands/lastsave
+     * @example $redis->lastSave();
+     */
+    public function lastSave()
+    {
+    }
+
+    /**
+     * Blocks the current client until all the previous write commands are successfully transferred and
+     * acknowledged by at least the specified number of slaves.
+     *
+     * @param int $numSlaves Number of slaves that need to acknowledge previous write commands.
+     * @param int $timeout   Timeout in milliseconds.
+     *
+     * @return  int The command returns the number of slaves reached by all the writes performed in the
+     *              context of the current connection
+     *
+     * @link    https://redis.io/commands/wait
+     * @example $redis->wait(2, 1000);
+     */
+    public function wait($numSlaves, $timeout)
+    {
+    }
+
+    /**
+     * Returns the type of data pointed by a given key.
+     *
+     * @param string $key
+     *
+     * @return int
+     * Depending on the type of the data pointed by the key,
+     * this method will return the following value:
+     * - string: Redis::REDIS_STRING
+     * - set:   Redis::REDIS_SET
+     * - list:  Redis::REDIS_LIST
+     * - zset:  Redis::REDIS_ZSET
+     * - hash:  Redis::REDIS_HASH
+     * - other: Redis::REDIS_NOT_FOUND
+     *
+     * @link    https://redis.io/commands/type
+     * @example $redis->type('key');
+     */
+    public function type($key)
+    {
+    }
+
+    /**
+     * Append specified string to the string stored in specified key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return int Size of the value after the append
+     *
+     * @link    https://redis.io/commands/append
+     * @example
+     * <pre>
+     * $redis->set('key', 'value1');
+     * $redis->append('key', 'value2'); // 12
+     * $redis->get('key');              // 'value1value2'
+     * </pre>
+     */
+    public function append($key, $value)
+    {
+    }
+
+    /**
+     * Return a substring of a larger string
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return string the substring
+     *
+     * @link    https://redis.io/commands/getrange
+     * @example
+     * <pre>
+     * $redis->set('key', 'string value');
+     * $redis->getRange('key', 0, 5);   // 'string'
+     * $redis->getRange('key', -5, -1); // 'value'
+     * </pre>
+     */
+    public function getRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * Return a substring of a larger string
+     *
+     * @deprecated
+     * @param   string  $key
+     * @param   int     $start
+     * @param   int     $end
+     */
+    public function substr($key, $start, $end)
+    {
+    }
+
+    /**
+     * Changes a substring of a larger string.
+     *
+     * @param string $key
+     * @param int    $offset
+     * @param string $value
+     *
+     * @return int the length of the string after it was modified
+     *
+     * @link    https://redis.io/commands/setrange
+     * @example
+     * <pre>
+     * $redis->set('key', 'Hello world');
+     * $redis->setRange('key', 6, "redis"); // returns 11
+     * $redis->get('key');                  // "Hello redis"
+     * </pre>
+     */
+    public function setRange($key, $offset, $value)
+    {
+    }
+
+    /**
+     * Get the length of a string value.
+     *
+     * @param string $key
+     * @return int
+     *
+     * @link    https://redis.io/commands/strlen
+     * @example
+     * <pre>
+     * $redis->set('key', 'value');
+     * $redis->strlen('key'); // 5
+     * </pre>
+     */
+    public function strlen($key)
+    {
+    }
+
+    /**
+     * Return the position of the first bit set to 1 or 0 in a string. The position is returned, thinking of the
+     * string as an array of bits from left to right, where the first byte's most significant bit is at position 0,
+     * the second byte's most significant bit is at position 8, and so forth.
+     *
+     * @param string $key
+     * @param int    $bit
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return int The command returns the position of the first bit set to 1 or 0 according to the request.
+     * If we look for set bits (the bit argument is 1) and the string is empty or composed of just
+     * zero bytes, -1 is returned. If we look for clear bits (the bit argument is 0) and the string
+     * only contains bit set to 1, the function returns the first bit not part of the string on the
+     * right. So if the string is three bytes set to the value 0xff the command BITPOS key 0 will
+     * return 24, since up to bit 23 all the bits are 1. Basically, the function considers the right
+     * of the string as padded with zeros if you look for clear bits and specify no range or the
+     * start argument only. However, this behavior changes if you are looking for clear bits and
+     * specify a range with both start and end. If no clear bit is found in the specified range, the
+     * function returns -1 as the user specified a clear range and there are no 0 bits in that range.
+     *
+     * @link    https://redis.io/commands/bitpos
+     * @example
+     * <pre>
+     * $redis->set('key', '\xff\xff');
+     * $redis->bitpos('key', 1); // int(0)
+     * $redis->bitpos('key', 1, 1); // int(8)
+     * $redis->bitpos('key', 1, 3); // int(-1)
+     * $redis->bitpos('key', 0); // int(16)
+     * $redis->bitpos('key', 0, 1); // int(16)
+     * $redis->bitpos('key', 0, 1, 5); // int(-1)
+     * </pre>
+     */
+    public function bitpos($key, $bit, $start = 0, $end = null)
+    {
+    }
+
+    /**
+     * Return a single bit out of a larger string
+     *
+     * @param string $key
+     * @param int    $offset
+     *
+     * @return int the bit value (0 or 1)
+     *
+     * @link    https://redis.io/commands/getbit
+     * @example
+     * <pre>
+     * $redis->set('key', "\x7f");  // this is 0111 1111
+     * $redis->getBit('key', 0);    // 0
+     * $redis->getBit('key', 1);    // 1
+     * </pre>
+     */
+    public function getBit($key, $offset)
+    {
+    }
+
+    /**
+     * Changes a single bit of a string.
+     *
+     * @param string   $key
+     * @param int      $offset
+     * @param bool|int $value  bool or int (1 or 0)
+     *
+     * @return int 0 or 1, the value of the bit before it was set
+     *
+     * @link    https://redis.io/commands/setbit
+     * @example
+     * <pre>
+     * $redis->set('key', "*");     // ord("*") = 42 = 0x2f = "0010 1010"
+     * $redis->setBit('key', 5, 1); // returns 0
+     * $redis->setBit('key', 7, 1); // returns 0
+     * $redis->get('key');          // chr(0x2f) = "/" = b("0010 1111")
+     * </pre>
+     */
+    public function setBit($key, $offset, $value)
+    {
+    }
+
+    /**
+     * Count bits in a string
+     *
+     * @param string $key
+     *
+     * @return int The number of bits set to 1 in the value behind the input key
+     *
+     * @link    https://redis.io/commands/bitcount
+     * @example
+     * <pre>
+     * $redis->set('bit', '345'); // // 11 0011  0011 0100  0011 0101
+     * var_dump( $redis->bitCount('bit', 0, 0) ); // int(4)
+     * var_dump( $redis->bitCount('bit', 1, 1) ); // int(3)
+     * var_dump( $redis->bitCount('bit', 2, 2) ); // int(4)
+     * var_dump( $redis->bitCount('bit', 0, 2) ); // int(11)
+     * </pre>
+     */
+    public function bitCount($key)
+    {
+    }
+
+    /**
+     * Bitwise operation on multiple keys.
+     *
+     * @param string $operation    either "AND", "OR", "NOT", "XOR"
+     * @param string $retKey       return key
+     * @param string $key1         first key
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return int The size of the string stored in the destination key
+     *
+     * @link    https://redis.io/commands/bitop
+     * @example
+     * <pre>
+     * $redis->set('bit1', '1'); // 11 0001
+     * $redis->set('bit2', '2'); // 11 0010
+     *
+     * $redis->bitOp('AND', 'bit', 'bit1', 'bit2'); // bit = 110000
+     * $redis->bitOp('OR',  'bit', 'bit1', 'bit2'); // bit = 110011
+     * $redis->bitOp('NOT', 'bit', 'bit1', 'bit2'); // bit = 110011
+     * $redis->bitOp('XOR', 'bit', 'bit1', 'bit2'); // bit = 11
+     * </pre>
+     */
+    public function bitOp($operation, $retKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Removes all entries from the current database.
+     *
+     * @return bool Always TRUE
+     * @link    https://redis.io/commands/flushdb
+     * @example $redis->flushDB();
+     */
+    public function flushDB()
+    {
+    }
+
+    /**
+     * Removes all entries from all databases.
+     *
+     * @return bool Always TRUE
+     *
+     * @link    https://redis.io/commands/flushall
+     * @example $redis->flushAll();
+     */
+    public function flushAll()
+    {
+    }
+
+    /**
+     * Sort
+     *
+     * @param string $key
+     * @param array  $option array(key => value, ...) - optional, with the following keys and values:
+     * - 'by' => 'some_pattern_*',
+     * - 'limit' => array(0, 1),
+     * - 'get' => 'some_other_pattern_*' or an array of patterns,
+     * - 'sort' => 'asc' or 'desc',
+     * - 'alpha' => TRUE,
+     * - 'store' => 'external-key'
+     *
+     * @return array
+     * An array of values, or a number corresponding to the number of elements stored if that was used
+     *
+     * @link    https://redis.io/commands/sort
+     * @example
+     * <pre>
+     * $redis->del('s');
+     * $redis->sadd('s', 5);
+     * $redis->sadd('s', 4);
+     * $redis->sadd('s', 2);
+     * $redis->sadd('s', 1);
+     * $redis->sadd('s', 3);
+     *
+     * var_dump($redis->sort('s')); // 1,2,3,4,5
+     * var_dump($redis->sort('s', array('sort' => 'desc'))); // 5,4,3,2,1
+     * var_dump($redis->sort('s', array('sort' => 'desc', 'store' => 'out'))); // (int)5
+     * </pre>
+     */
+    public function sort($key, $option = null)
+    {
+    }
+
+    /**
+     * Returns an associative array of strings and integers
+     *
+     * @param string $option Optional. The option to provide redis.
+     * SERVER | CLIENTS | MEMORY | PERSISTENCE | STATS | REPLICATION | CPU | CLASTER | KEYSPACE | COMANDSTATS
+     *
+     * Returns an associative array of strings and integers, with the following keys:
+     * - redis_version
+     * - redis_git_sha1
+     * - redis_git_dirty
+     * - arch_bits
+     * - multiplexing_api
+     * - process_id
+     * - uptime_in_seconds
+     * - uptime_in_days
+     * - lru_clock
+     * - used_cpu_sys
+     * - used_cpu_user
+     * - used_cpu_sys_children
+     * - used_cpu_user_children
+     * - connected_clients
+     * - connected_slaves
+     * - client_longest_output_list
+     * - client_biggest_input_buf
+     * - blocked_clients
+     * - used_memory
+     * - used_memory_human
+     * - used_memory_peak
+     * - used_memory_peak_human
+     * - mem_fragmentation_ratio
+     * - mem_allocator
+     * - loading
+     * - aof_enabled
+     * - changes_since_last_save
+     * - bgsave_in_progress
+     * - last_save_time
+     * - total_connections_received
+     * - total_commands_processed
+     * - expired_keys
+     * - evicted_keys
+     * - keyspace_hits
+     * - keyspace_misses
+     * - hash_max_zipmap_entries
+     * - hash_max_zipmap_value
+     * - pubsub_channels
+     * - pubsub_patterns
+     * - latest_fork_usec
+     * - vm_enabled
+     * - role
+     *
+     * @return string
+     *
+     * @link    https://redis.io/commands/info
+     * @example
+     * <pre>
+     * $redis->info();
+     *
+     * or
+     *
+     * $redis->info("COMMANDSTATS"); //Information on the commands that have been run (>=2.6 only)
+     * $redis->info("CPU"); // just CPU information from Redis INFO
+     * </pre>
+     */
+    public function info($option = null)
+    {
+    }
+
+    /**
+     * Resets the statistics reported by Redis using the INFO command (`info()` function).
+     * These are the counters that are reset:
+     *      - Keyspace hits
+     *      - Keyspace misses
+     *      - Number of commands processed
+     *      - Number of connections received
+     *      - Number of expired keys
+     *
+     * @return bool `TRUE` in case of success, `FALSE` in case of failure.
+     *
+     * @example $redis->resetStat();
+     * @link https://redis.io/commands/config-resetstat
+     */
+    public function resetStat()
+    {
+    }
+
+    /**
+     * Returns the time to live left for a given key, in seconds. If the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     *
+     * @return int|bool the time left to live in seconds
+     *
+     * @link    https://redis.io/commands/ttl
+     * @example
+     * <pre>
+     * $redis->setex('key', 123, 'test');
+     * $redis->ttl('key'); // int(123)
+     * </pre>
+     */
+    public function ttl($key)
+    {
+    }
+
+    /**
+     * Returns a time to live left for a given key, in milliseconds.
+     *
+     * If the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     *
+     * @return int|bool the time left to live in milliseconds
+     *
+     * @link    https://redis.io/commands/pttl
+     * @example
+     * <pre>
+     * $redis->setex('key', 123, 'test');
+     * $redis->pttl('key'); // int(122999)
+     * </pre>
+     */
+    public function pttl($key)
+    {
+    }
+
+    /**
+     * Remove the expiration timer from a key.
+     *
+     * @param string $key
+     *
+     * @return bool TRUE if a timeout was removed, FALSE if the key didn’t exist or didn’t have an expiration timer.
+     *
+     * @link    https://redis.io/commands/persist
+     * @example $redis->persist('key');
+     */
+    public function persist($key)
+    {
+    }
+
+    /**
+     * Sets multiple key-value pairs in one atomic command.
+     * MSETNX only returns TRUE if all the keys were set (see SETNX).
+     *
+     * @param array $array Pairs: array(key => value, ...)
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/mset
+     * @example
+     * <pre>
+     * $redis->mset(array('key0' => 'value0', 'key1' => 'value1'));
+     * var_dump($redis->get('key0'));
+     * var_dump($redis->get('key1'));
+     * // Output:
+     * // string(6) "value0"
+     * // string(6) "value1"
+     * </pre>
+     */
+    public function mset(array $array)
+    {
+    }
+
+    /**
+     * Get the values of all the specified keys.
+     * If one or more keys dont exist, the array will contain FALSE at the position of the key.
+     *
+     * @param array $keys Array containing the list of the keys
+     *
+     * @return array Array containing the values related to keys in argument
+     *
+     * @deprecated use Redis::mGet()
+     * @example
+     * <pre>
+     * $redis->set('key1', 'value1');
+     * $redis->set('key2', 'value2');
+     * $redis->set('key3', 'value3');
+     * $redis->getMultiple(array('key1', 'key2', 'key3')); // array('value1', 'value2', 'value3');
+     * $redis->getMultiple(array('key0', 'key1', 'key5')); // array(`FALSE`, 'value2', `FALSE`);
+     * </pre>
+     */
+    public function getMultiple(array $keys)
+    {
+    }
+
+    /**
+     * Returns the values of all specified keys.
+     *
+     * For every key that does not hold a string value or does not exist,
+     * the special value false is returned. Because of this, the operation never fails.
+     *
+     * @param array $array
+     *
+     * @return array
+     *
+     * @link https://redis.io/commands/mget
+     * @example
+     * <pre>
+     * $redis->del('x', 'y', 'z', 'h');  // remove x y z
+     * $redis->mset(array('x' => 'a', 'y' => 'b', 'z' => 'c'));
+     * $redis->hset('h', 'field', 'value');
+     * var_dump($redis->mget(array('x', 'y', 'z', 'h')));
+     * // Output:
+     * // array(3) {
+     * //   [0]=> string(1) "a"
+     * //   [1]=> string(1) "b"
+     * //   [2]=> string(1) "c"
+     * //   [3]=> bool(false)
+     * // }
+     * </pre>
+     */
+    public function mget(array $array)
+    {
+    }
+
+    /**
+     * @see mset()
+     * @param array $array
+     * @return int 1 (if the keys were set) or 0 (no key was set)
+     *
+     * @link    https://redis.io/commands/msetnx
+     */
+    public function msetnx(array $array)
+    {
+    }
+
+    /**
+     * Pops a value from the tail of a list, and pushes it to the front of another list.
+     * Also return this value.
+     *
+     * @since   redis >= 1.1
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return string|mixed|bool The element that was moved in case of success, FALSE in case of failure.
+     *
+     * @link    https://redis.io/commands/rpoplpush
+     * @example
+     * <pre>
+     * $redis->del('x', 'y');
+     *
+     * $redis->lPush('x', 'abc');
+     * $redis->lPush('x', 'def');
+     * $redis->lPush('y', '123');
+     * $redis->lPush('y', '456');
+     *
+     * // move the last of x to the front of y.
+     * var_dump($redis->rpoplpush('x', 'y'));
+     * var_dump($redis->lRange('x', 0, -1));
+     * var_dump($redis->lRange('y', 0, -1));
+     *
+     * //Output:
+     * //
+     * //string(3) "abc"
+     * //array(1) {
+     * //  [0]=>
+     * //  string(3) "def"
+     * //}
+     * //array(3) {
+     * //  [0]=>
+     * //  string(3) "abc"
+     * //  [1]=>
+     * //  string(3) "456"
+     * //  [2]=>
+     * //  string(3) "123"
+     * //}
+     * </pre>
+     */
+    public function rpoplpush($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * A blocking version of rpoplpush, with an integral timeout in the third parameter.
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     * @param int    $timeout
+     *
+     * @return  string|mixed|bool  The element that was moved in case of success, FALSE in case of timeout
+     *
+     * @link    https://redis.io/commands/brpoplpush
+     */
+    public function brpoplpush($srcKey, $dstKey, $timeout)
+    {
+    }
+
+    /**
+     * Adds the specified member with a given score to the sorted set stored at key
+     *
+     * @param string       $key     Required key
+     * @param array        $options Options if needed
+     * @param float        $score1  Required score
+     * @param string|mixed $value1  Required value
+     * @param float        $score2  Optional score
+     * @param string|mixed $value2  Optional value
+     * @param float        $scoreN  Optional score
+     * @param string|mixed $valueN  Optional value
+     *
+     * @return int Number of values added
+     *
+     * @link    https://redis.io/commands/zadd
+     * @example
+     * <pre>
+     * <pre>
+     * $redis->zAdd('z', 1, 'v1', 2, 'v2', 3, 'v3', 4, 'v4' );  // int(2)
+     * $redis->zRem('z', 'v2', 'v3');                           // int(2)
+     * $redis->zAdd('z', ['NX'], 5, 'v5');                      // int(1)
+     * $redis->zAdd('z', ['NX'], 6, 'v5');                      // int(0)
+     * $redis->zAdd('z', 7, 'v6');                              // int(1)
+     * $redis->zAdd('z', 8, 'v6');                              // int(0)
+     *
+     * var_dump( $redis->zRange('z', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v4"
+     * //   [2]=> string(2) "v5"
+     * //   [3]=> string(2) "v8"
+     * // }
+     *
+     * var_dump( $redis->zRange('z', 0, -1, true) );
+     * // Output:
+     * // array(4) {
+     * //   ["v1"]=> float(1)
+     * //   ["v4"]=> float(4)
+     * //   ["v5"]=> float(5)
+     * //   ["v6"]=> float(8)
+     * </pre>
+     * </pre>
+     */
+    public function zAdd($key, $options, $score1, $value1, $score2 = null, $value2 = null, $scoreN = null, $valueN = null)
+    {
+    }
+
+    /**
+     * Returns a range of elements from the ordered set stored at the specified key,
+     * with values in the range [start, end]. start and stop are interpreted as zero-based indices:
+     * 0 the first element,
+     * 1 the second ...
+     * -1 the last element,
+     * -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param bool   $withscores
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrange
+     * @example
+     * <pre>
+     * $redis->zAdd('key1', 0, 'val0');
+     * $redis->zAdd('key1', 2, 'val2');
+     * $redis->zAdd('key1', 10, 'val10');
+     * $redis->zRange('key1', 0, -1); // array('val0', 'val2', 'val10')
+     * // with scores
+     * $redis->zRange('key1', 0, -1, true); // array('val0' => 0, 'val2' => 2, 'val10' => 10)
+     * </pre>
+     */
+    public function zRange($key, $start, $end, $withscores = null)
+    {
+    }
+
+    /**
+     * Deletes a specified member from the ordered set.
+     *
+     * @param string       $key
+     * @param string|mixed $member1
+     * @param string|mixed ...$otherMembers
+     *
+     * @return int Number of deleted values
+     *
+     * @link    https://redis.io/commands/zrem
+     * @example
+     * <pre>
+     * $redis->zAdd('z', 1, 'v1', 2, 'v2', 3, 'v3', 4, 'v4' );  // int(2)
+     * $redis->zRem('z', 'v2', 'v3');                           // int(2)
+     * var_dump( $redis->zRange('z', 0, -1) );
+     * //// Output:
+     * // array(2) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v4"
+     * // }
+     * </pre>
+     */
+    public function zRem($key, $member1, ...$otherMembers)
+    {
+    }
+
+    /**
+     * @see zRem()
+     * @link https://redis.io/commands/zrem
+     * @deprecated use Redis::zRem()
+     *
+     * @param string       $key
+     * @param string|mixed $member1
+     * @param string|mixed ...$otherMembers
+     *
+     * @return int Number of deleted values
+     */
+    public function zDelete($key, $member1, ...$otherMembers)
+    {
+    }
+
+    /**
+     * Returns the elements of the sorted set stored at the specified key in the range [start, end]
+     * in reverse order. start and stop are interpretated as zero-based indices:
+     * 0 the first element,
+     * 1 the second ...
+     * -1 the last element,
+     * -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param bool   $withscore
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrevrange
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRevRange('key', 0, -1); // array('val10', 'val2', 'val0')
+     *
+     * // with scores
+     * $redis->zRevRange('key', 0, -1, true); // array('val10' => 10, 'val2' => 2, 'val0' => 0)
+     * </pre>
+     */
+    public function zRevRange($key, $start, $end, $withscore = null)
+    {
+    }
+
+    /**
+     * Returns the elements of the sorted set stored at the specified key which have scores in the
+     * range [start,end]. Adding a parenthesis before start or end excludes it from the range.
+     * +inf and -inf are also valid limits.
+     *
+     * zRevRangeByScore returns the same items in reverse order, when the start and end parameters are swapped.
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param array  $options Two options are available:
+     *  - withscores => TRUE,
+     *  - and limit => array($offset, $count)
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrangebyscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRangeByScore('key', 0, 3);                                          // array('val0', 'val2')
+     * $redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE);              // array('val0' => 0, 'val2' => 2)
+     * $redis->zRangeByScore('key', 0, 3, array('limit' => array(1, 1));                        // array('val2')
+     * $redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE, 'limit' => array(1, 1));  // array('val2' => 2)
+     * </pre>
+     */
+    public function zRangeByScore($key, $start, $end, array $options = array())
+    {
+    }
+
+    /**
+     * @see zRangeByScore()
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param array  $options
+     *
+     * @return array
+     */
+    public function zRevRangeByScore($key, $start, $end, array $options = array())
+    {
+    }
+
+    /**
+     * Returns a lexigraphical range of members in a sorted set, assuming the members have the same score. The
+     * min and max values are required to start with '(' (exclusive), '[' (inclusive), or be exactly the values
+     * '-' (negative inf) or '+' (positive inf).  The command must be called with either three *or* five
+     * arguments or will return FALSE.
+     *
+     * @param string $key    The ZSET you wish to run against.
+     * @param int    $min    The minimum alphanumeric value you wish to get.
+     * @param int    $max    The maximum alphanumeric value you wish to get.
+     * @param int    $offset Optional argument if you wish to start somewhere other than the first element.
+     * @param int    $limit  Optional argument if you wish to limit the number of elements returned.
+     *
+     * @return array|bool Array containing the values in the specified range.
+     *
+     * @link    https://redis.io/commands/zrangebylex
+     * @example
+     * <pre>
+     * foreach (array('a', 'b', 'c', 'd', 'e', 'f', 'g') as $char) {
+     *     $redis->zAdd('key', $char);
+     * }
+     *
+     * $redis->zRangeByLex('key', '-', '[c'); // array('a', 'b', 'c')
+     * $redis->zRangeByLex('key', '-', '(c'); // array('a', 'b')
+     * $redis->zRangeByLex('key', '-', '[c'); // array('b', 'c')
+     * </pre>
+     */
+    public function zRangeByLex($key, $min, $max, $offset = null, $limit = null)
+    {
+    }
+
+    /**
+     * @see zRangeByLex()
+     * @param string $key
+     * @param int    $min
+     * @param int    $max
+     * @param int    $offset
+     * @param int    $limit
+     *
+     * @return array
+     *
+     * @link    https://redis.io/commands/zrevrangebylex
+     */
+    public function zRevRangeByLex($key, $min, $max, $offset = null, $limit = null)
+    {
+    }
+
+    /**
+     * Returns the number of elements of the sorted set stored at the specified key which have
+     * scores in the range [start,end]. Adding a parenthesis before start or end excludes it
+     * from the range. +inf and -inf are also valid limits.
+     *
+     * @param string $key
+     * @param string $start
+     * @param string $end
+     *
+     * @return int the size of a corresponding zRangeByScore
+     *
+     * @link    https://redis.io/commands/zcount
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zCount('key', 0, 3); // 2, corresponding to array('val0', 'val2')
+     * </pre>
+     */
+    public function zCount($key, $start, $end)
+    {
+    }
+
+    /**
+     * Deletes the elements of the sorted set stored at the specified key which have scores in the range [start,end].
+     *
+     * @param string       $key
+     * @param float|string $start double or "+inf" or "-inf" string
+     * @param float|string $end double or "+inf" or "-inf" string
+     *
+     * @return int The number of values deleted from the sorted set
+     *
+     * @link    https://redis.io/commands/zremrangebyscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRemRangeByScore('key', 0, 3); // 2
+     * </pre>
+     */
+    public function zRemRangeByScore($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see zRemRangeByScore()
+     * @deprecated use Redis::zRemRangeByScore()
+     *
+     * @param string $key
+     * @param float  $start
+     * @param float  $end
+     */
+    public function zDeleteRangeByScore($key, $start, $end)
+    {
+    }
+
+    /**
+     * Deletes the elements of the sorted set stored at the specified key which have rank in the range [start,end].
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return int The number of values deleted from the sorted set
+     *
+     * @link    https://redis.io/commands/zremrangebyrank
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 1, 'one');
+     * $redis->zAdd('key', 2, 'two');
+     * $redis->zAdd('key', 3, 'three');
+     * $redis->zRemRangeByRank('key', 0, 1); // 2
+     * $redis->zRange('key', 0, -1, array('withscores' => TRUE)); // array('three' => 3)
+     * </pre>
+     */
+    public function zRemRangeByRank($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see zRemRangeByRank()
+     * @link    https://redis.io/commands/zremrangebyscore
+     * @deprecated use Redis::zRemRangeByRank()
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     */
+    public function zDeleteRangeByRank($key, $start, $end)
+    {
+    }
+
+    /**
+     * Returns the cardinality of an ordered set.
+     *
+     * @param string $key
+     *
+     * @return int the set's cardinality
+     *
+     * @link    https://redis.io/commands/zsize
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zCard('key');            // 3
+     * </pre>
+     */
+    public function zCard($key)
+    {
+    }
+
+    /**
+     * @see zCard()
+     * @deprecated use Redis::zCard()
+     *
+     * @param string $key
+     * @return int
+     */
+    public function zSize($key)
+    {
+    }
+
+    /**
+     * Returns the score of a given member in the specified sorted set.
+     *
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return float|bool false if member or key not exists
+     *
+     * @link    https://redis.io/commands/zscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 2.5, 'val2');
+     * $redis->zScore('key', 'val2'); // 2.5
+     * </pre>
+     */
+    public function zScore($key, $member)
+    {
+    }
+
+    /**
+     * Returns the rank of a given member in the specified sorted set, starting at 0 for the item
+     * with the smallest score. zRevRank starts at 0 for the item with the largest score.
+     *
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return int|bool the item's score, or false if key or member is not exists
+     *
+     * @link    https://redis.io/commands/zrank
+     * @example
+     * <pre>
+     * $redis->del('z');
+     * $redis->zAdd('key', 1, 'one');
+     * $redis->zAdd('key', 2, 'two');
+     * $redis->zRank('key', 'one');     // 0
+     * $redis->zRank('key', 'two');     // 1
+     * $redis->zRevRank('key', 'one');  // 1
+     * $redis->zRevRank('key', 'two');  // 0
+     * </pre>
+     */
+    public function zRank($key, $member)
+    {
+    }
+
+    /**
+     * @see zRank()
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return int|bool the item's score, false - if key or member is not exists
+     *
+     * @link   https://redis.io/commands/zrevrank
+     */
+    public function zRevRank($key, $member)
+    {
+    }
+
+    /**
+     * Increments the score of a member from a sorted set by a given amount.
+     *
+     * @param string $key
+     * @param float  $value (double) value that will be added to the member's score
+     * @param string $member
+     *
+     * @return float the new value
+     *
+     * @link    https://redis.io/commands/zincrby
+     * @example
+     * <pre>
+     * $redis->del('key');
+     * $redis->zIncrBy('key', 2.5, 'member1');  // key or member1 didn't exist, so member1's score is to 0
+     *                                          // before the increment and now has the value 2.5
+     * $redis->zIncrBy('key', 1, 'member1');    // 3.5
+     * </pre>
+     */
+    public function zIncrBy($key, $value, $member)
+    {
+    }
+
+    /**
+     * Creates an union of sorted sets given in second argument.
+     * The result of the union will be stored in the sorted set defined by the first argument.
+     * The third optionnel argument defines weights to apply to the sorted sets in input.
+     * In this case, the weights will be multiplied by the score of each element in the sorted set
+     * before applying the aggregation. The forth argument defines the AGGREGATE option which
+     * specify how the results of the union are aggregated.
+     *
+     * @param string $output
+     * @param array  $zSetKeys
+     * @param array  $weights
+     * @param string $aggregateFunction  Either "SUM", "MIN", or "MAX": defines the behaviour to use on
+     * duplicate entries during the zUnionStore
+     *
+     * @return int The number of values in the new sorted set
+     *
+     * @link    https://redis.io/commands/zunionstore
+     * @example
+     * <pre>
+     * $redis->del('k1');
+     * $redis->del('k2');
+     * $redis->del('k3');
+     * $redis->del('ko1');
+     * $redis->del('ko2');
+     * $redis->del('ko3');
+     *
+     * $redis->zAdd('k1', 0, 'val0');
+     * $redis->zAdd('k1', 1, 'val1');
+     *
+     * $redis->zAdd('k2', 2, 'val2');
+     * $redis->zAdd('k2', 3, 'val3');
+     *
+     * $redis->zUnionStore('ko1', array('k1', 'k2')); // 4, 'ko1' => array('val0', 'val1', 'val2', 'val3')
+     *
+     * // Weighted zUnionStore
+     * $redis->zUnionStore('ko2', array('k1', 'k2'), array(1, 1)); // 4, 'ko2' => array('val0', 'val1', 'val2', 'val3')
+     * $redis->zUnionStore('ko3', array('k1', 'k2'), array(5, 1)); // 4, 'ko3' => array('val0', 'val2', 'val3', 'val1')
+     * </pre>
+     */
+    public function zUnionStore($output, $zSetKeys, array $weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * @see zUnionStore
+     * @deprecated use Redis::zUnionStore()
+     *
+     * @param string     $Output
+     * @param array      $ZSetKeys
+     * @param array|null $Weights
+     * @param string     $aggregateFunction
+     */
+    public function zUnion($Output, $ZSetKeys, array $Weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * Creates an intersection of sorted sets given in second argument.
+     * The result of the union will be stored in the sorted set defined by the first argument.
+     * The third optional argument defines weights to apply to the sorted sets in input.
+     * In this case, the weights will be multiplied by the score of each element in the sorted set
+     * before applying the aggregation. The forth argument defines the AGGREGATE option which
+     * specify how the results of the union are aggregated.
+     *
+     * @param string $output
+     * @param array  $zSetKeys
+     * @param array  $weights
+     * @param string $aggregateFunction Either "SUM", "MIN", or "MAX":
+     * defines the behaviour to use on duplicate entries during the zInterStore.
+     *
+     * @return int The number of values in the new sorted set.
+     *
+     * @link    https://redis.io/commands/zinterstore
+     * @example
+     * <pre>
+     * $redis->del('k1');
+     * $redis->del('k2');
+     * $redis->del('k3');
+     *
+     * $redis->del('ko1');
+     * $redis->del('ko2');
+     * $redis->del('ko3');
+     * $redis->del('ko4');
+     *
+     * $redis->zAdd('k1', 0, 'val0');
+     * $redis->zAdd('k1', 1, 'val1');
+     * $redis->zAdd('k1', 3, 'val3');
+     *
+     * $redis->zAdd('k2', 2, 'val1');
+     * $redis->zAdd('k2', 3, 'val3');
+     *
+     * $redis->zInterStore('ko1', array('k1', 'k2'));               // 2, 'ko1' => array('val1', 'val3')
+     * $redis->zInterStore('ko2', array('k1', 'k2'), array(1, 1));  // 2, 'ko2' => array('val1', 'val3')
+     *
+     * // Weighted zInterStore
+     * $redis->zInterStore('ko3', array('k1', 'k2'), array(1, 5), 'min'); // 2, 'ko3' => array('val1', 'val3')
+     * $redis->zInterStore('ko4', array('k1', 'k2'), array(1, 5), 'max'); // 2, 'ko4' => array('val3', 'val1')
+     * </pre>
+     */
+    public function zInterStore($output, $zSetKeys, array $weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * @see zInterStore
+     * @deprecated use Redis::zInterStore()
+     *
+     * @param $Output
+     * @param $ZSetKeys
+     * @param array|null $Weights
+     * @param string $aggregateFunction
+     */
+    public function zInter($Output, $ZSetKeys, array $Weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * Scan a sorted set for members, with optional pattern and count
+     *
+     * @param string $key      String, the set to scan.
+     * @param int    $iterator Long (reference), initialized to NULL.
+     * @param string $pattern  String (optional), the pattern to match.
+     * @param int    $count    How many keys to return per iteration (Redis might return a different number).
+     *
+     * @return array|bool PHPRedis will return matching keys from Redis, or FALSE when iteration is complete
+     *
+     * @link    https://redis.io/commands/zscan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while ($members = $redis-zscan('zset', $iterator)) {
+     *     foreach ($members as $member => $score) {
+     *         echo $member . ' => ' . $score . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function zScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Block until Redis can pop the highest or lowest scoring members from one or more ZSETs.
+     * There are two commands (BZPOPMIN and BZPOPMAX for popping the lowest and highest scoring elements respectively.)
+     *
+     * @param string|array $key1
+     * @param string|array $key2 ...
+     * @param int $timeout
+     *
+     * @return array Either an array with the key member and score of the higest or lowest element or an empty array
+     * if the timeout was reached without an element to pop.
+     *
+     * @since >= 5.0
+     * @link https://redis.io/commands/bzpopmax
+     * @example
+     * <pre>
+     * // Wait up to 5 seconds to pop the *lowest* scoring member from sets `zs1` and `zs2`.
+     * $redis->bzPopMin(['zs1', 'zs2'], 5);
+     * $redis->bzPopMin('zs1', 'zs2', 5);
+     *
+     * // Wait up to 5 seconds to pop the *highest* scoring member from sets `zs1` and `zs2`
+     * $redis->bzPopMax(['zs1', 'zs2'], 5);
+     * $redis->bzPopMax('zs1', 'zs2', 5);
+     * </pre>
+     */
+    public function bzPopMax($key1, $key2, $timeout)
+    {
+    }
+
+    /**
+     * @param string|array $key1
+     * @param string|array $key2 ...
+     * @param int $timeout
+     *
+     * @return array Either an array with the key member and score of the higest or lowest element or an empty array
+     * if the timeout was reached without an element to pop.
+     *
+     * @see bzPopMax
+     * @since >= 5.0
+     * @link https://redis.io/commands/bzpopmin
+     */
+    public function bzPopMin($key1, $key2, $timeout)
+    {
+    }
+
+    /**
+     * Adds a value to the hash stored at key. If this value is already in the hash, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param string $value
+     *
+     * @return int|bool
+     * - 1 if value didn't exist and was added successfully,
+     * - 0 if the value was already present and was replaced, FALSE if there was an error.
+     *
+     * @link    https://redis.io/commands/hset
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSet('h', 'key1', 'hello');  // 1, 'key1' => 'hello' in the hash at "h"
+     * $redis->hGet('h', 'key1');           // returns "hello"
+     *
+     * $redis->hSet('h', 'key1', 'plop');   // 0, value was replaced.
+     * $redis->hGet('h', 'key1');           // returns "plop"
+     * </pre>
+     */
+    public function hSet($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Adds a value to the hash stored at key only if this field isn't already in the hash.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param string $value
+     *
+     * @return  bool TRUE if the field was set, FALSE if it was already present.
+     *
+     * @link    https://redis.io/commands/hsetnx
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSetNx('h', 'key1', 'hello'); // TRUE, 'key1' => 'hello' in the hash at "h"
+     * $redis->hSetNx('h', 'key1', 'world'); // FALSE, 'key1' => 'hello' in the hash at "h". No change since the field
+     * wasn't replaced.
+     * </pre>
+     */
+    public function hSetNx($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Gets a value from the hash stored at key.
+     * If the hash table doesn't exist, or the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey
+     *
+     * @return string The value, if the command executed successfully BOOL FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/hget
+     */
+    public function hGet($key, $hashKey)
+    {
+    }
+
+    /**
+     * Returns the length of a hash, in number of items
+     *
+     * @param string $key
+     *
+     * @return int|false the number of items in a hash, FALSE if the key doesn't exist or isn't a hash
+     *
+     * @link    https://redis.io/commands/hlen
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSet('h', 'key1', 'hello');
+     * $redis->hSet('h', 'key2', 'plop');
+     * $redis->hLen('h'); // returns 2
+     * </pre>
+     */
+    public function hLen($key)
+    {
+    }
+
+    /**
+     * Removes a values from the hash stored at key.
+     * If the hash table doesn't exist, or the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey1
+     * @param string ...$otherHashKeys
+     *
+     * @return int|false Number of deleted fields
+     *
+     * @link    https://redis.io/commands/hdel
+     * @example
+     * <pre>
+     * $redis->hMSet('h',
+     *               array(
+     *                    'f1' => 'v1',
+     *                    'f2' => 'v2',
+     *                    'f3' => 'v3',
+     *                    'f4' => 'v4',
+     *               ));
+     *
+     * var_dump( $redis->hDel('h', 'f1') );        // int(1)
+     * var_dump( $redis->hDel('h', 'f2', 'f3') );  // int(2)
+     * s
+     * var_dump( $redis->hGetAll('h') );
+     * //// Output:
+     * //  array(1) {
+     * //    ["f4"]=> string(2) "v4"
+     * //  }
+     * </pre>
+     */
+    public function hDel($key, $hashKey1, ...$otherHashKeys)
+    {
+    }
+
+    /**
+     * Returns the keys in a hash, as an array of strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the keys of the hash. This works like PHP's array_keys().
+     *
+     * @link    https://redis.io/commands/hkeys
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hKeys('h'));
+     *
+     * // Output:
+     * // array(4) {
+     * // [0]=>
+     * // string(1) "a"
+     * // [1]=>
+     * // string(1) "b"
+     * // [2]=>
+     * // string(1) "c"
+     * // [3]=>
+     * // string(1) "d"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hKeys($key)
+    {
+    }
+
+    /**
+     * Returns the values in a hash, as an array of strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the values of the hash. This works like PHP's array_values().
+     *
+     * @link    https://redis.io/commands/hvals
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hVals('h'));
+     *
+     * // Output
+     * // array(4) {
+     * //   [0]=>
+     * //   string(1) "x"
+     * //   [1]=>
+     * //   string(1) "y"
+     * //   [2]=>
+     * //   string(1) "z"
+     * //   [3]=>
+     * //   string(1) "t"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hVals($key)
+    {
+    }
+
+    /**
+     * Returns the whole hash, as an array of strings indexed by strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the contents of the hash.
+     *
+     * @link    https://redis.io/commands/hgetall
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hGetAll('h'));
+     *
+     * // Output:
+     * // array(4) {
+     * //   ["a"]=>
+     * //   string(1) "x"
+     * //   ["b"]=>
+     * //   string(1) "y"
+     * //   ["c"]=>
+     * //   string(1) "z"
+     * //   ["d"]=>
+     * //   string(1) "t"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hGetAll($key)
+    {
+    }
+
+    /**
+     * Verify if the specified member exists in a key.
+     *
+     * @param string $key
+     * @param string $hashKey
+     *
+     * @return bool If the member exists in the hash table, return TRUE, otherwise return FALSE.
+     *
+     * @link    https://redis.io/commands/hexists
+     * @example
+     * <pre>
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hExists('h', 'a');               //  TRUE
+     * $redis->hExists('h', 'NonExistingKey');  // FALSE
+     * </pre>
+     */
+    public function hExists($key, $hashKey)
+    {
+    }
+
+    /**
+     * Increments the value of a member from a hash by a given amount.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param int    $value (integer) value that will be added to the member's value
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/hincrby
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hIncrBy('h', 'x', 2); // returns 2: h[x] = 2 now.
+     * $redis->hIncrBy('h', 'x', 1); // h[x] ← 2 + 1. Returns 3
+     * </pre>
+     */
+    public function hIncrBy($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Increment the float value of a hash field by the given amount
+     *
+     * @param string $key
+     * @param string $field
+     * @param float  $increment
+     *
+     * @return float
+     *
+     * @link    https://redis.io/commands/hincrbyfloat
+     * @example
+     * <pre>
+     * $redis = new Redis();
+     * $redis->connect('127.0.0.1');
+     * $redis->hset('h', 'float', 3);
+     * $redis->hset('h', 'int',   3);
+     * var_dump( $redis->hIncrByFloat('h', 'float', 1.5) ); // float(4.5)
+     *
+     * var_dump( $redis->hGetAll('h') );
+     *
+     * // Output
+     *  array(2) {
+     *    ["float"]=>
+     *    string(3) "4.5"
+     *    ["int"]=>
+     *    string(1) "3"
+     *  }
+     * </pre>
+     */
+    public function hIncrByFloat($key, $field, $increment)
+    {
+    }
+
+    /**
+     * Fills in a whole hash. Non-string values are converted to string, using the standard (string) cast.
+     * NULL values are stored as empty strings
+     *
+     * @param string $key
+     * @param array  $hashKeys key → value array
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/hmset
+     * @example
+     * <pre>
+     * $redis->del('user:1');
+     * $redis->hMSet('user:1', array('name' => 'Joe', 'salary' => 2000));
+     * $redis->hIncrBy('user:1', 'salary', 100); // Joe earns 100 more now.
+     * </pre>
+     */
+    public function hMSet($key, $hashKeys)
+    {
+    }
+
+    /**
+     * Retirieve the values associated to the specified fields in the hash.
+     *
+     * @param string $key
+     * @param array  $hashKeys
+     *
+     * @return array Array An array of elements, the values of the specified fields in the hash,
+     * with the hash keys as array keys.
+     *
+     * @link    https://redis.io/commands/hmget
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'field1', 'value1');
+     * $redis->hSet('h', 'field2', 'value2');
+     * $redis->hmGet('h', array('field1', 'field2')); // returns array('field1' => 'value1', 'field2' => 'value2')
+     * </pre>
+     */
+    public function hMGet($key, $hashKeys)
+    {
+    }
+
+    /**
+     * Scan a HASH value for members, with an optional pattern and count.
+     *
+     * @param string $key
+     * @param int    $iterator
+     * @param string $pattern    Optional pattern to match against.
+     * @param int    $count      How many keys to return in a go (only a sugestion to Redis).
+     *
+     * @return array An array of members that match our pattern.
+     *
+     * @link    https://redis.io/commands/hscan
+     * @example
+     * <pre>
+     * // $iterator = null;
+     * // while($elements = $redis->hscan('hash', $iterator)) {
+     * //     foreach($elements as $key => $value) {
+     * //         echo $key . ' => ' . $value . PHP_EOL;
+     * //     }
+     * // }
+     * </pre>
+     */
+    public function hScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Get the string length of the value associated with field in the hash stored at key
+     *
+     * @param string $key
+     * @param string $field
+     *
+     * @return int the string length of the value associated with field, or zero when field is not present in the hash
+     * or key does not exist at all.
+     *
+     * @link https://redis.io/commands/hstrlen
+     * @since >= 3.2
+     */
+    public function hStrLen(string $key, string $field)
+    {
+    }
+
+    /**
+     * Add one or more geospatial items to the specified key.
+     * This function must be called with at least one longitude, latitude, member triplet.
+     *
+     * @param string $key
+     * @param float  $longitude
+     * @param float  $latitude
+     * @param string $member
+     *
+     * @return int The number of elements added to the geospatial key
+     *
+     * @link https://redis.io/commands/geoadd
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->del("myplaces");
+     *
+     * // Since the key will be new, $result will be 2
+     * $result = $redis->geoAdd(
+     *   "myplaces",
+     *   -122.431, 37.773, "San Francisco",
+     *   -157.858, 21.315, "Honolulu"
+     * ); // 2
+     * </pre>
+     */
+    public function geoadd($key, $longitude, $latitude, $member)
+    {
+    }
+
+    /**
+     * Retrieve Geohash strings for one or more elements of a geospatial index.
+
+     * @param string $key
+     * @param string ...$member variadic list of members
+     *
+     * @return array One or more Redis Geohash encoded strings
+     *
+     * @link https://redis.io/commands/geohash
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     * $hashes = $redis->geoHash("hawaii", "Honolulu", "Maui");
+     * var_dump($hashes);
+     * // Output: array(2) {
+     * //   [0]=>
+     * //   string(11) "87z9pyek3y0"
+     * //   [1]=>
+     * //   string(11) "8e8y6d5jps0"
+     * // }
+     * </pre>
+     */
+    public function geohash($key, ...$member)
+    {
+    }
+
+    /**
+     * Return longitude, latitude positions for each requested member.
+     *
+     * @param string $key
+     * @param string $member
+     * @return array One or more longitude/latitude positions
+     *
+     * @link https://redis.io/commands/geopos
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     * $positions = $redis->geoPos("hawaii", "Honolulu", "Maui");
+     * var_dump($positions);
+     *
+     * // Output:
+     * array(2) {
+     *  [0]=> array(2) {
+     *      [0]=> string(22) "-157.85800248384475708"
+     *      [1]=> string(19) "21.3060004581273077"
+     *  }
+     *  [1]=> array(2) {
+     *      [0]=> string(22) "-156.33099943399429321"
+     *      [1]=> string(20) "20.79799924753607598"
+     *  }
+     * }
+     * </pre>
+     */
+    public function geopos(string $key, string $member)
+    {
+    }
+
+    /**
+     * Return the distance between two members in a geospatial set.
+     *
+     * If units are passed it must be one of the following values:
+     * - 'm' => Meters
+     * - 'km' => Kilometers
+     * - 'mi' => Miles
+     * - 'ft' => Feet
+     *
+     * @param string $key
+     * @param string $member1
+     * @param string $member2
+     * @param string|null $unit
+     *
+     * @return float The distance between the two passed members in the units requested (meters by default)
+     *
+     * @link https://redis.io/commands/geodist
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * $meters = $redis->geoDist("hawaii", "Honolulu", "Maui");
+     * $kilometers = $redis->geoDist("hawaii", "Honolulu", "Maui", 'km');
+     * $miles = $redis->geoDist("hawaii", "Honolulu", "Maui", 'mi');
+     * $feet = $redis->geoDist("hawaii", "Honolulu", "Maui", 'ft');
+     *
+     * echo "Distance between Honolulu and Maui:\n";
+     * echo "  meters    : $meters\n";
+     * echo "  kilometers: $kilometers\n";
+     * echo "  miles     : $miles\n";
+     * echo "  feet      : $feet\n";
+     *
+     * // Bad unit
+     * $inches = $redis->geoDist("hawaii", "Honolulu", "Maui", 'in');
+     * echo "Invalid unit returned:\n";
+     * var_dump($inches);
+     *
+     * // Output
+     * Distance between Honolulu and Maui:
+     * meters    : 168275.204
+     * kilometers: 168.2752
+     * miles     : 104.5616
+     * feet      : 552084.0028
+     * Invalid unit returned:
+     * bool(false)
+     * </pre>
+     */
+    public function geodist($key, $member1, $member2, $unit = null)
+    {
+    }
+
+    /**
+     * Return members of a set with geospatial information that are within the radius specified by the caller.
+     *
+     * @param $key
+     * @param $longitude
+     * @param $latitude
+     * @param $radius
+     * @param $unit
+     * @param array|null $options
+     * <pre>
+     * |Key         |Value          |Description                                        |
+     * |------------|---------------|---------------------------------------------------|
+     * |COUNT       |integer > 0    |Limit how many results are returned                |
+     * |            |WITHCOORD      |Return longitude and latitude of matching members  |
+     * |            |WITHDIST       |Return the distance from the center                |
+     * |            |WITHHASH       |Return the raw geohash-encoded score               |
+     * |            |ASC            |Sort results in ascending order                    |
+     * |            |DESC           |Sort results in descending order                   |
+     * |STORE       |key            |Store results in key                               |
+     * |STOREDIST   |key            |Store the results as distances in key              |
+     * </pre>
+     * Note: It doesn't make sense to pass both ASC and DESC options but if both are passed
+     * the last one passed will be used.
+     * Note: When using STORE[DIST] in Redis Cluster, the store key must has to the same slot as
+     * the query key or you will get a CROSSLOT error.
+     * @return mixed When no STORE option is passed, this function returns an array of results.
+     * If it is passed this function returns the number of stored entries.
+     *
+     * @link https://redis.io/commands/georadius
+     * @since >= 3.2
+     * @example
+     * <pre>
+     * // Add some cities
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * echo "Within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi'));
+     *
+     * echo "\nWithin 300 miles of Honolulu with distances:\n";
+     * $options = ['WITHDIST'];
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * echo "\nFirst result within 300 miles of Honolulu with distances:\n";
+     * $options['count'] = 1;
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * echo "\nFirst result within 300 miles of Honolulu with distances in descending sort order:\n";
+     * $options[] = 'DESC';
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * // Output
+     * Within 300 miles of Honolulu:
+     * array(2) {
+     *  [0]=> string(8) "Honolulu"
+     *  [1]=> string(4) "Maui"
+     * }
+     *
+     * Within 300 miles of Honolulu with distances:
+     * array(2) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(8) "Honolulu"
+     *         [1]=>
+     *     string(6) "0.0002"
+     *   }
+     *   [1]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(4) "Maui"
+     *         [1]=>
+     *     string(8) "104.5615"
+     *   }
+     * }
+     *
+     * First result within 300 miles of Honolulu with distances:
+     * array(1) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(8) "Honolulu"
+     *         [1]=>
+     *     string(6) "0.0002"
+     *   }
+     * }
+     *
+     * First result within 300 miles of Honolulu with distances in descending sort order:
+     * array(1) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(4) "Maui"
+     *         [1]=>
+     *     string(8) "104.5615"
+     *   }
+     * }
+     * </pre>
+     */
+    public function georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+    {
+    }
+
+    /**
+     * This method is identical to geoRadius except that instead of passing a longitude and latitude as the "source"
+     * you pass an existing member in the geospatial set
+     *
+     * @param string $key
+     * @param string $member
+     * @param $radius
+     * @param $units
+     * @param array|null $options see georadius
+     *
+     * @return array The zero or more entries that are close enough to the member given the distance and radius specified
+     *
+     * @link https://redis.io/commands/georadiusbymember
+     * @since >= 3.2
+     * @see georadius
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * echo "Within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadiusByMember("hawaii", "Honolulu", 300, 'mi'));
+     *
+     * echo "\nFirst match within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadiusByMember("hawaii", "Honolulu", 300, 'mi', ['count' => 1]));
+     *
+     * // Output
+     * Within 300 miles of Honolulu:
+     * array(2) {
+     *  [0]=> string(8) "Honolulu"
+     *  [1]=> string(4) "Maui"
+     * }
+     *
+     * First match within 300 miles of Honolulu:
+     * array(1) {
+     *  [0]=> string(8) "Honolulu"
+     * }
+     * </pre>
+     */
+    public function georadiusbymember($key, $member, $radius, $units, array $options = null)
+    {
+    }
+
+    /**
+     * Get or Set the redis config keys.
+     *
+     * @param string       $operation either `GET` or `SET`
+     * @param string       $key       for `SET`, glob-pattern for `GET`
+     * @param string|mixed $value     optional string (only for `SET`)
+     *
+     * @return array Associative array for `GET`, key -> value
+     *
+     * @link    https://redis.io/commands/config-get
+     * @example
+     * <pre>
+     * $redis->config("GET", "*max-*-entries*");
+     * $redis->config("SET", "dir", "/var/run/redis/dumps/");
+     * </pre>
+     */
+    public function config($operation, $key, $value)
+    {
+    }
+
+    /**
+     * Evaluate a LUA script serverside
+     *
+     * @param string $script
+     * @param array  $args
+     * @param int    $numKeys
+     *
+     * @return mixed What is returned depends on what the LUA script itself returns, which could be a scalar value
+     * (int/string), or an array. Arrays that are returned can also contain other arrays, if that's how it was set up in
+     * your LUA script.  If there is an error executing the LUA script, the getLastError() function can tell you the
+     * message that came back from Redis (e.g. compile error).
+     *
+     * @link   https://redis.io/commands/eval
+     * @example
+     * <pre>
+     * $redis->eval("return 1"); // Returns an integer: 1
+     * $redis->eval("return {1,2,3}"); // Returns Array(1,2,3)
+     * $redis->del('mylist');
+     * $redis->rpush('mylist','a');
+     * $redis->rpush('mylist','b');
+     * $redis->rpush('mylist','c');
+     * // Nested response:  Array(1,2,3,Array('a','b','c'));
+     * $redis->eval("return {1,2,3,redis.call('lrange','mylist',0,-1)}}");
+     * </pre>
+     */
+    public function eval($script, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * @see eval()
+     * @deprecated use Redis::eval()
+     *
+     * @param   string  $script
+     * @param   array   $args
+     * @param   int     $numKeys
+     * @return  mixed   @see eval()
+     */
+    public function evaluate($script, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * Evaluate a LUA script serverside, from the SHA1 hash of the script instead of the script itself.
+     * In order to run this command Redis will have to have already loaded the script, either by running it or via
+     * the SCRIPT LOAD command.
+     *
+     * @param string $scriptSha
+     * @param array  $args
+     * @param int    $numKeys
+     *
+     * @return mixed @see eval()
+     *
+     * @see     eval()
+     * @link    https://redis.io/commands/evalsha
+     * @example
+     * <pre>
+     * $script = 'return 1';
+     * $sha = $redis->script('load', $script);
+     * $redis->evalSha($sha); // Returns 1
+     * </pre>
+     */
+    public function evalSha($scriptSha, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * @see evalSha()
+     * @deprecated use Redis::evalSha()
+     *
+     * @param string $scriptSha
+     * @param array  $args
+     * @param int    $numKeys
+     */
+    public function evaluateSha($scriptSha, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * Execute the Redis SCRIPT command to perform various operations on the scripting subsystem.
+     * @param string $command load | flush | kill | exists
+     * @param string $script
+     *
+     * @return  mixed
+     *
+     * @link    https://redis.io/commands/script-load
+     * @link    https://redis.io/commands/script-kill
+     * @link    https://redis.io/commands/script-flush
+     * @link    https://redis.io/commands/script-exists
+     * @example
+     * <pre>
+     * $redis->script('load', $script);
+     * $redis->script('flush');
+     * $redis->script('kill');
+     * $redis->script('exists', $script1, [$script2, $script3, ...]);
+     * </pre>
+     *
+     * SCRIPT LOAD will return the SHA1 hash of the passed script on success, and FALSE on failure.
+     * SCRIPT FLUSH should always return TRUE
+     * SCRIPT KILL will return true if a script was able to be killed and false if not
+     * SCRIPT EXISTS will return an array with TRUE or FALSE for each passed script
+     */
+    public function script($command, $script)
+    {
+    }
+
+    /**
+     * The last error message (if any)
+     *
+     * @return string|null A string with the last returned script based error message, or NULL if there is no error
+     *
+     * @example
+     * <pre>
+     * $redis->eval('this-is-not-lua');
+     * $err = $redis->getLastError();
+     * // "ERR Error compiling script (new function): user_script:1: '=' expected near '-'"
+     * </pre>
+     */
+    public function getLastError()
+    {
+    }
+
+    /**
+     * Clear the last error message
+     *
+     * @return bool true
+     *
+     * @example
+     * <pre>
+     * $redis->set('x', 'a');
+     * $redis->incr('x');
+     * $err = $redis->getLastError();
+     * // "ERR value is not an integer or out of range"
+     * $redis->clearLastError();
+     * $err = $redis->getLastError();
+     * // NULL
+     * </pre>
+     */
+    public function clearLastError()
+    {
+    }
+
+    /**
+     * Issue the CLIENT command with various arguments.
+     * The Redis CLIENT command can be used in four ways:
+     * - CLIENT LIST
+     * - CLIENT GETNAME
+     * - CLIENT SETNAME [name]
+     * - CLIENT KILL [ip:port]
+     *
+     * @param string $command
+     * @param string $value
+     * @return mixed This will vary depending on which client command was executed:
+     * - CLIENT LIST will return an array of arrays with client information.
+     * - CLIENT GETNAME will return the client name or false if none has been set
+     * - CLIENT SETNAME will return true if it can be set and false if not
+     * - CLIENT KILL will return true if the client can be killed, and false if not
+     *
+     * Note: phpredis will attempt to reconnect so you can actually kill your own connection but may not notice losing it!
+     *
+     * @link https://redis.io/commands/client-list
+     * @link https://redis.io/commands/client-getname
+     * @link https://redis.io/commands/client-setname
+     * @link https://redis.io/commands/client-kill
+     *
+     * @example
+     * <pre>
+     * $redis->client('list'); // Get a list of clients
+     * $redis->client('getname'); // Get the name of the current connection
+     * $redis->client('setname', 'somename'); // Set the name of the current connection
+     * $redis->client('kill', <ip:port>); // Kill the process at ip:port
+     * </pre>
+     */
+    public function client($command, $value = '')
+    {
+    }
+
+    /**
+     * A utility method to prefix the value with the prefix setting for phpredis.
+     *
+     * @param mixed $value The value you wish to prefix
+     *
+     * @return string If a prefix is set up, the value now prefixed.
+     * If there is no prefix, the value will be returned unchanged.
+     *
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_PREFIX, 'my-prefix:');
+     * $redis->_prefix('my-value'); // Will return 'my-prefix:my-value'
+     * </pre>
+     */
+    public function _prefix($value)
+    {
+    }
+
+    /**
+     * A utility method to unserialize data with whatever serializer is set up.  If there is no serializer set, the
+     * value will be returned unchanged.  If there is a serializer set up, and the data passed in is malformed, an
+     * exception will be thrown. This can be useful if phpredis is serializing values, and you return something from
+     * redis in a LUA script that is serialized.
+     *
+     * @param string $value The value to be unserialized
+     *
+     * @return mixed
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+     * $redis->_unserialize('a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}'); // Will return Array(1,2,3)
+     * </pre>
+     */
+    public function _unserialize($value)
+    {
+    }
+
+    /**
+     * A utility method to serialize values manually. This method allows you to serialize a value with whatever
+     * serializer is configured, manually. This can be useful for serialization/unserialization of data going in
+     * and out of EVAL commands as phpredis can't automatically do this itself.  Note that if no serializer is
+     * set, phpredis will change Array values to 'Array', and Objects to 'Object'.
+     *
+     * @param mixed $value The value to be serialized.
+     *
+     * @return  mixed
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
+     * $redis->_serialize("foo"); // returns "foo"
+     * $redis->_serialize(Array()); // Returns "Array"
+     * $redis->_serialize(new stdClass()); // Returns "Object"
+     *
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+     * $redis->_serialize("foo"); // Returns 's:3:"foo";'
+     * </pre>
+     */
+    public function _serialize($value)
+    {
+    }
+
+    /**
+     * Dump a key out of a redis database, the value of which can later be passed into redis using the RESTORE command.
+     * The data that comes out of DUMP is a binary representation of the key as Redis stores it.
+     * @param string $key
+     *
+     * @return string|bool The Redis encoded value of the key, or FALSE if the key doesn't exist
+     *
+     * @link    https://redis.io/commands/dump
+     * @example
+     * <pre>
+     * $redis->set('foo', 'bar');
+     * $val = $redis->dump('foo'); // $val will be the Redis encoded key value
+     * </pre>
+     */
+    public function dump($key)
+    {
+    }
+
+    /**
+     * Restore a key from the result of a DUMP operation.
+     *
+     * @param string $key   The key name
+     * @param int    $ttl   How long the key should live (if zero, no expire will be set on the key)
+     * @param string $value (binary).  The Redis encoded key value (from DUMP)
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/restore
+     * @example
+     * <pre>
+     * $redis->set('foo', 'bar');
+     * $val = $redis->dump('foo');
+     * $redis->restore('bar', 0, $val); // The key 'bar', will now be equal to the key 'foo'
+     * </pre>
+     */
+    public function restore($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Migrates a key to a different Redis instance.
+     *
+     * @param string $host    The destination host
+     * @param int    $port    The TCP port to connect to.
+     * @param string $key     The key to migrate.
+     * @param int    $db      The target DB.
+     * @param int    $timeout The maximum amount of time given to this transfer.
+     * @param bool   $copy    Should we send the COPY flag to redis.
+     * @param bool   $replace Should we send the REPLACE flag to redis.
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/migrate
+     * @example
+     * <pre>
+     * $redis->migrate('backup', 6379, 'foo', 0, 3600);
+     * </pre>
+     */
+    public function migrate($host, $port, $key, $db, $timeout, $copy = false, $replace = false)
+    {
+    }
+
+    /**
+     * Return the current Redis server time.
+     *
+     * @return array If successfull, the time will come back as an associative array with element zero being the
+     * unix timestamp, and element one being microseconds.
+     *
+     * @link    https://redis.io/commands/time
+     * @example
+     * <pre>
+     * var_dump( $redis->time() );
+     * // array(2) {
+     * //   [0] => string(10) "1342364352"
+     * //   [1] => string(6) "253002"
+     * // }
+     * </pre>
+     */
+    public function time()
+    {
+    }
+
+    /**
+     * Scan the keyspace for keys
+     *
+     * @param int    $iterator Iterator, initialized to NULL.
+     * @param string $pattern  Pattern to match.
+     * @param int    $count    Count of keys per iteration (only a suggestion to Redis).
+     *
+     * @return array|bool This function will return an array of keys or FALSE if there are no more keys.
+     *
+     * @link   https://redis.io/commands/scan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while(false !== ($keys = $redis->scan($iterator))) {
+     *     foreach($keys as $key) {
+     *         echo $key . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function scan(&$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Adds all the element arguments to the HyperLogLog data structure stored at the key.
+     *
+     * @param string $key
+     * @param array  $elements
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/pfadd
+     * @example $redis->pfAdd('key', array('elem1', 'elem2'))
+     */
+    public function pfAdd($key, array $elements)
+    {
+    }
+
+    /**
+     * When called with a single key, returns the approximated cardinality computed by the HyperLogLog data
+     * structure stored at the specified variable, which is 0 if the variable does not exist.
+     *
+     * @param string|array $key
+     *
+     * @return int
+     *
+     * @link    https://redis.io/commands/pfcount
+     * @example
+     * <pre>
+     * $redis->pfAdd('key1', array('elem1', 'elem2'));
+     * $redis->pfAdd('key2', array('elem3', 'elem2'));
+     * $redis->pfCount('key1'); // int(2)
+     * $redis->pfCount(array('key1', 'key2')); // int(3)
+     */
+    public function pfCount($key)
+    {
+    }
+
+    /**
+     * Merge multiple HyperLogLog values into an unique value that will approximate the cardinality
+     * of the union of the observed Sets of the source HyperLogLog structures.
+     *
+     * @param string $destKey
+     * @param array  $sourceKeys
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/pfmerge
+     * @example
+     * <pre>
+     * $redis->pfAdd('key1', array('elem1', 'elem2'));
+     * $redis->pfAdd('key2', array('elem3', 'elem2'));
+     * $redis->pfMerge('key3', array('key1', 'key2'));
+     * $redis->pfCount('key3'); // int(3)
+     */
+    public function pfMerge($destKey, array $sourceKeys)
+    {
+    }
+
+    /**
+     * Send arbitrary things to the redis server.
+     *
+     * @param string $command   Required command to send to the server.
+     * @param mixed  $arguments Optional variable amount of arguments to send to the server.
+     *
+     * @return mixed
+     *
+     * @example
+     * <pre>
+     * $redis->rawCommand('SET', 'key', 'value'); // bool(true)
+     * $redis->rawCommand('GET", 'key'); // string(5) "value"
+     * </pre>
+     */
+    public function rawCommand($command, $arguments)
+    {
+    }
+
+    /**
+     * Detect whether we're in ATOMIC/MULTI/PIPELINE mode.
+     *
+     * @return int Either Redis::ATOMIC, Redis::MULTI or Redis::PIPELINE
+     *
+     * @example $redis->getMode();
+     */
+    public function getMode()
+    {
+    }
+
+    /**
+     * Acknowledge one or more messages on behalf of a consumer group.
+     *
+     * @param string $stream
+     * @param string $group
+     * @param array  $messages
+     *
+     * @return int The number of messages Redis reports as acknowledged.
+     *
+     * @link    https://redis.io/commands/xack
+     * @example
+     * <pre>
+     * $redis->xAck('stream', 'group1', ['1530063064286-0', '1530063064286-1']);
+     * </pre>
+     */
+    public function xAck($stream, $group, $messages)
+    {
+    }
+
+    /**
+     * Add a message to a stream
+     *
+     * @param string $key
+     * @param string $id
+     * @param array  $messages
+     * @param int    $maxLen
+     * @param bool   $isApproximate
+     *
+     * @return string The added message ID.
+     *
+     * @link    https://redis.io/commands/xadd
+     * @example
+     * <pre>
+     * $redis->xAdd('mystream', "*", ['field' => 'value']);
+     * $redis->xAdd('mystream', "*", ['field' => 'value'], 10);
+     * $redis->xAdd('mystream', "*", ['field' => 'value'], 10, true);
+     * </pre>
+     */
+    public function xAdd($key, $id, $messages, $maxLen = 0, $isApproximate = false)
+    {
+    }
+
+    /**
+     * Claim ownership of one or more pending messages
+     *
+     * @param string $key
+     * @param string $group
+     * @param string $consumer
+     * @param int    $minIdleTime
+     * @param array  $ids
+     * @param array  $options ['IDLE' => $value, 'TIME' => $value, 'RETRYCOUNT' => $value, 'FORCE', 'JUSTID']
+     *
+     * @return array Either an array of message IDs along with corresponding data, or just an array of IDs
+     * (if the 'JUSTID' option was passed).
+     *
+     * @link    https://redis.io/commands/xclaim
+     * @example
+     * <pre>
+     * $ids = ['1530113681011-0', '1530113681011-1', '1530113681011-2'];
+     *
+     * // Without any options
+     * $redis->xClaim('mystream', 'group1', 'myconsumer1', 0, $ids);
+     *
+     * // With options
+     * $redis->xClaim(
+     *     'mystream', 'group1', 'myconsumer2', 0, $ids,
+     *     [
+     *         'IDLE' => time() * 1000,
+     *         'RETRYCOUNT' => 5,
+     *         'FORCE',
+     *         'JUSTID'
+     *     ]
+     * );
+     * </pre>
+     */
+    public function xClaim($key, $group, $consumer, $minIdleTime, $ids, $options = [])
+    {
+    }
+
+    /**
+     * Delete one or more messages from a stream
+     *
+     * @param string $key
+     * @param array  $ids
+     *
+     * @return int The number of messages removed
+     *
+     * @link    https://redis.io/commands/xdel
+     * @example
+     * <pre>
+     * $redis->xDel('mystream', ['1530115304877-0', '1530115305731-0']);
+     * </pre>
+     */
+    public function xDel($key, $ids)
+    {
+    }
+
+    /**
+     * @param string $operation  e.g.: 'HELP', 'SETID', 'DELGROUP', 'CREATE', 'DELCONSUMER'
+     * @param string $key
+     * @param string $group
+     * @param string $msgId
+     * @param bool   $mkStream
+     *
+     * @return mixed This command returns different types depending on the specific XGROUP command executed.
+     *
+     * @link    https://redis.io/commands/xgroup
+     * @example
+     * <pre>
+     * $redis->xGroup('CREATE', 'mystream', 'mygroup', 0);
+     * $redis->xGroup('CREATE', 'mystream', 'mygroup', 0, true); // create stream
+     * $redis->xGroup('DESTROY', 'mystream', 'mygroup');
+     * </pre>
+     */
+    public function xGroup($operation, $key, $group, $msgId = '', $mkStream = false)
+    {
+    }
+
+    /**
+     * Get information about a stream or consumer groups
+     *
+     * @param string $operation  e.g.: 'CONSUMERS', 'GROUPS', 'STREAM', 'HELP'
+     * @param string $stream
+     * @param string $group
+     *
+     * @return mixed This command returns different types depending on which subcommand is used.
+     *
+     * @link    https://redis.io/commands/xinfo
+     * @example
+     * <pre>
+     * $redis->xInfo('STREAM', 'mystream');
+     * </pre>
+     */
+    public function xInfo($operation, $stream, $group)
+    {
+    }
+
+    /**
+     * Get the length of a given stream.
+     *
+     * @param string $stream
+     *
+     * @return int The number of messages in the stream.
+     *
+     * @link    https://redis.io/commands/xlen
+     * @example
+     * <pre>
+     * $redis->xLen('mystream');
+     * </pre>
+     */
+    public function xLen($stream)
+    {
+    }
+
+    /**
+     * Get information about pending messages in a given stream
+     *
+     * @param string $stream
+     * @param string $group
+     * @param string $start
+     * @param string $end
+     * @param int    $count
+     * @param string $consumer
+     *
+     * @return array Information about the pending messages, in various forms depending on
+     * the specific invocation of XPENDING.
+     *
+     * @link https://redis.io/commands/xpending
+     * @example
+     * <pre>
+     * $redis->xPending('mystream', 'mygroup');
+     * $redis->xPending('mystream', 'mygroup', '-', '+', 1, 'consumer-1');
+     * </pre>
+     */
+    public function xPending($stream, $group, $start = null, $end = null, $count = null, $consumer = null)
+    {
+    }
+
+    /**
+     * Get a range of messages from a given stream
+     *
+     * @param string $stream
+     * @param string $start
+     * @param string $end
+     * @param int    $count
+     *
+     * @return array The messages in the stream within the requested range.
+     *
+     * @link    https://redis.io/commands/xrange
+     * @example
+     * <pre>
+     * // Get everything in this stream
+     * $redis->xRange('mystream', '-', '+');
+     * // Only the first two messages
+     * $redis->xRange('mystream', '-', '+', 2);
+     * </pre>
+     */
+    public function xRange($stream, $start, $end, $count = null)
+    {
+    }
+
+    /**
+     * Read data from one or more streams and only return IDs greater than sent in the command.
+     *
+     * @param array      $streams
+     * @param int|string $count
+     * @param int|string $block
+     *
+     * @return array The messages in the stream newer than the IDs passed to Redis (if any)
+     *
+     * @link    https://redis.io/commands/xread
+     * @example
+     * <pre>
+     * $redis->xRead(['stream1' => '1535222584555-0', 'stream2' => '1535222584555-0']);
+     * </pre>
+     */
+    public function xRead($streams, $count = null, $block = null)
+    {
+    }
+
+    /**
+     * This method is similar to xRead except that it supports reading messages for a specific consumer group.
+     *
+     * @param string   $group
+     * @param string   $consumer
+     * @param array    $streams
+     * @param int|null $count
+     * @param int|null $block
+     *
+     * @return array The messages delivered to this consumer group (if any).
+     *
+     * @link    https://redis.io/commands/xreadgroup
+     * @example
+     * <pre>
+     * // Consume messages for 'mygroup', 'consumer1'
+     * $redis->xReadGroup('mygroup', 'consumer1', ['s1' => 0, 's2' => 0]);
+     * // Read a single message as 'consumer2' for up to a second until a message arrives.
+     * $redis->xReadGroup('mygroup', 'consumer2', ['s1' => 0, 's2' => 0], 1, 1000);
+     * </pre>
+     */
+    public function xReadGroup($group, $consumer, $streams, $count = null, $block = null)
+    {
+    }
+
+    /**
+     * This is identical to xRange except the results come back in reverse order.
+     * Also note that Redis reverses the order of "start" and "end".
+     *
+     * @param string $stream
+     * @param string $end
+     * @param string $start
+     * @param int    $count
+     *
+     * @return array The messages in the range specified
+     *
+     * @link    https://redis.io/commands/xrevrange
+     * @example
+     * <pre>
+     * $redis->xRevRange('mystream', '+', '-');
+     * </pre>
+     */
+    public function xRevRange($stream, $end, $start, $count = null)
+    {
+    }
+
+    /**
+     * Trim the stream length to a given maximum.
+     * If the "approximate" flag is pasesed, Redis will use your size as a hint but only trim trees in whole nodes
+     * (this is more efficient)
+     *
+     * @param string $stream
+     * @param int    $maxLen
+     * @param bool   $isApproximate
+     *
+     * @return int The number of messages trimed from the stream.
+     *
+     * @link    https://redis.io/commands/xtrim
+     * @example
+     * <pre>
+     * // Trim to exactly 100 messages
+     * $redis->xTrim('mystream', 100);
+     * // Let Redis approximate the trimming
+     * $redis->xTrim('mystream', 100, true);
+     * </pre>
+     */
+    public function xTrim($stream, $maxLen, $isApproximate)
+    {
+    }
+
+    /**
+     * Adds a values to the set value stored at key.
+     *
+     * @param string $key Required key
+     * @param array  $values Required values
+     *
+     * @return  int|bool The number of elements added to the set.
+     * If this value is already in the set, FALSE is returned
+     *
+     * @link    https://redis.io/commands/sadd
+     * @link    https://github.com/phpredis/phpredis/commit/3491b188e0022f75b938738f7542603c7aae9077
+     * @since   phpredis 2.2.8
+     * @example
+     * <pre>
+     * $redis->sAddArray('k', array('v1'));                // boolean
+     * $redis->sAddArray('k', array('v1', 'v2', 'v3'));    // boolean
+     * </pre>
+     */
+    public function sAddArray($key, array $values)
+    {
+    }
+}
+
+class RedisException extends Exception
+{
+}
+
+/**
+ * @mixin \Redis
+ */
+class RedisArray
+{
+    /**
+     * Constructor
+     *
+     * @param string|array $hosts Name of the redis array from redis.ini or array of hosts to construct the array with
+     * @param array        $opts  Array of options
+     *
+     * @link    https://github.com/nicolasff/phpredis/blob/master/arrays.markdown
+     */
+    public function __construct($hosts, array $opts = null)
+    {
+    }
+
+    /**
+     * @return array list of hosts for the selected array
+     */
+    public function _hosts()
+    {
+    }
+
+    /**
+     * @return string the name of the function used to extract key parts during consistent hashing
+     */
+    public function _function()
+    {
+    }
+
+    /**
+     * @param string $key The key for which you want to lookup the host
+     *
+     * @return  string  the host to be used for a certain key
+     */
+    public function _target($key)
+    {
+    }
+
+    /**
+     * Use this function when a new node is added and keys need to be rehashed.
+     */
+    public function _rehash()
+    {
+    }
+
+    /**
+     * Returns an associative array of strings and integers, with the following keys:
+     * - redis_version
+     * - redis_git_sha1
+     * - redis_git_dirty
+     * - redis_build_id
+     * - redis_mode
+     * - os
+     * - arch_bits
+     * - multiplexing_api
+     * - atomicvar_api
+     * - gcc_version
+     * - process_id
+     * - run_id
+     * - tcp_port
+     * - uptime_in_seconds
+     * - uptime_in_days
+     * - hz
+     * - lru_clock
+     * - executable
+     * - config_file
+     * - connected_clients
+     * - client_longest_output_list
+     * - client_biggest_input_buf
+     * - blocked_clients
+     * - used_memory
+     * - used_memory_human
+     * - used_memory_rss
+     * - used_memory_rss_human
+     * - used_memory_peak
+     * - used_memory_peak_human
+     * - used_memory_peak_perc
+     * - used_memory_peak
+     * - used_memory_overhead
+     * - used_memory_startup
+     * - used_memory_dataset
+     * - used_memory_dataset_perc
+     * - total_system_memory
+     * - total_system_memory_human
+     * - used_memory_lua
+     * - used_memory_lua_human
+     * - maxmemory
+     * - maxmemory_human
+     * - maxmemory_policy
+     * - mem_fragmentation_ratio
+     * - mem_allocator
+     * - active_defrag_running
+     * - lazyfree_pending_objects
+     * - mem_fragmentation_ratio
+     * - loading
+     * - rdb_changes_since_last_save
+     * - rdb_bgsave_in_progress
+     * - rdb_last_save_time
+     * - rdb_last_bgsave_status
+     * - rdb_last_bgsave_time_sec
+     * - rdb_current_bgsave_time_sec
+     * - rdb_last_cow_size
+     * - aof_enabled
+     * - aof_rewrite_in_progress
+     * - aof_rewrite_scheduled
+     * - aof_last_rewrite_time_sec
+     * - aof_current_rewrite_time_sec
+     * - aof_last_bgrewrite_status
+     * - aof_last_write_status
+     * - aof_last_cow_size
+     * - changes_since_last_save
+     * - aof_current_size
+     * - aof_base_size
+     * - aof_pending_rewrite
+     * - aof_buffer_length
+     * - aof_rewrite_buffer_length
+     * - aof_pending_bio_fsync
+     * - aof_delayed_fsync
+     * - loading_start_time
+     * - loading_total_bytes
+     * - loading_loaded_bytes
+     * - loading_loaded_perc
+     * - loading_eta_seconds
+     * - total_connections_received
+     * - total_commands_processed
+     * - instantaneous_ops_per_sec
+     * - total_net_input_bytes
+     * - total_net_output_bytes
+     * - instantaneous_input_kbps
+     * - instantaneous_output_kbps
+     * - rejected_connections
+     * - maxclients
+     * - sync_full
+     * - sync_partial_ok
+     * - sync_partial_err
+     * - expired_keys
+     * - evicted_keys
+     * - keyspace_hits
+     * - keyspace_misses
+     * - pubsub_channels
+     * - pubsub_patterns
+     * - latest_fork_usec
+     * - migrate_cached_sockets
+     * - slave_expires_tracked_keys
+     * - active_defrag_hits
+     * - active_defrag_misses
+     * - active_defrag_key_hits
+     * - active_defrag_key_misses
+     * - role
+     * - master_replid
+     * - master_replid2
+     * - master_repl_offset
+     * - second_repl_offset
+     * - repl_backlog_active
+     * - repl_backlog_size
+     * - repl_backlog_first_byte_offset
+     * - repl_backlog_histlen
+     * - master_host
+     * - master_port
+     * - master_link_status
+     * - master_last_io_seconds_ago
+     * - master_sync_in_progress
+     * - slave_repl_offset
+     * - slave_priority
+     * - slave_read_only
+     * - master_sync_left_bytes
+     * - master_sync_last_io_seconds_ago
+     * - master_link_down_since_seconds
+     * - connected_slaves
+     * - min-slaves-to-write
+     * - min-replicas-to-write
+     * - min_slaves_good_slaves
+     * - used_cpu_sys
+     * - used_cpu_user
+     * - used_cpu_sys_children
+     * - used_cpu_user_children
+     * - cluster_enabled
+     *
+     * @link    https://redis.io/commands/info
+     * @return  array
+     * @example
+     * <pre>
+     * $redis->info();
+     * </pre>
+     */
+    public function info() {
+    }
+}

.phan/internal_stubs/memcache.phan_php

@@ -0,0 +1,460 @@
+<?php
+
+// Start of memcache v.3.0.8
+
+class MemcachePool  {
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Open memcached server connection
+     * @link https://php.net/manual/en/memcache.connect.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like <em>unix:///path/to/memcached.sock</em>
+     * to use UNIX domain sockets, in this case <b>port</b> must also
+     * be set to <em>0</em>.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections. Set this
+     * parameter to <em>0</em> when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <b>port</b> defaults to
+     * {@link https://php.net/manual/ru/memcache.ini.php#ini.memcache.default-port memcache.default_port}
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param int $timeout [optional] <p>Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.</p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function connect ($host, $port, $timeout = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add a memcached server to connection pool
+     * @link https://php.net/manual/en/memcache.addserver.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like unix:///path/to/memcached.sock
+     * to use UNIX domain sockets, in this case <i>port</i> must also
+     * be set to 0.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * Set this
+     * parameter to 0 when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <i>port</i> defaults to
+     * memcache.default_port
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param bool $persistent [optional] <p>
+     * Controls the use of a persistent connection. Default to <b>TRUE</b>.
+     * </p>
+     * @param int $weight [optional] <p>
+     * Number of buckets to create for this server which in turn control its
+     * probability of it being selected. The probability is relative to the
+     * total weight of all servers.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think
+     * twice before changing the default value of 1 second - you can lose all
+     * the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <i>persistent</i> parameter has any
+     * effect when the extension is loaded dynamically via <b>dl</b>.
+     * </p>
+     * <p>
+     * Each failed connection struct has its own timeout and before it has expired
+     * the struct will be skipped when selecting backends to serve a request. Once
+     * expired the connection will be successfully reconnected or marked as failed
+     * for another <i>retry_interval</i> seconds. The typical
+     * effect is that each web server child will retry the connection about every
+     * <i>retry_interval</i> seconds when serving a page.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <i>retry_interval</i> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <i>memcache.allow_failover</i> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an
+     * error. The callback is run before failover is attempted. The function takes
+     * two parameters, the hostname and port of the failed server.
+     * </p>
+     * @param int $timeoutms [optional] <p>
+     * </p>
+     * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function addServer ($host, $port = 11211, $persistent = true, $weight = null, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null, $timeoutms = null) {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Changes server parameters and status at runtime
+     * @link https://secure.php.net/manual/en/memcache.setserverparams.php
+     * @param string $host <p>Point to the host where memcached is listening for connections.</p.
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <b>persistent</b> parameter has any
+     * effect when the extension is loaded dynamically via {@link https://secure.php.net/manual/en/function.dl.php dl()}.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <b>retry_interval</b> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <b>memcache.allow_failover</b> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an error. The callback is run before failover is attempted.
+     * The function takes two parameters, the hostname and port of the failed server.
+     * </p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function setServerParams ($host, $port = 11211, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null) {}
+
+    /**
+     *
+     */
+    public function setFailureCallback () {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Returns server status
+     * @link https://php.net/manual/en/memcache.getserverstatus.php
+     * @param string $host Point to the host where memcached is listening for connections.
+     * @param int $port Point to the port where memcached is listening for connections.
+     * @return int Returns a the servers status. 0 if server is failed, non-zero otherwise
+     */
+    public function getServerStatus ($host, $port = 11211) {}
+
+    /**
+     *
+     */
+    public function findServer () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Return version of the server
+     * @link https://php.net/manual/en/memcache.getversion.php
+     * @return string|false Returns a string of server version number or <b>FALSE</b> on failure.
+     */
+    public function getVersion () {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add an item to the server. If the key already exists, the value will not be added and <b>FALSE</b> will be returned.
+     * @link https://php.net/manual/en/memcache.add.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] <p>
+     * Use <b>MEMCACHE_COMPRESSED</b> to store the item
+     * compressed (uses zlib).
+     * </p>
+     * @param int $expire [optional] <p>Expiration time of the item.
+     * If it's equal to zero, the item will never expire.
+     * You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure. Returns <b>FALSE</b> if such key already exist. For the rest Memcache::add() behaves similarly to Memcache::set().
+     */
+    public function add ($key , $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Stores an item var with key on the memcached server. Parameter expire is expiration time in seconds.
+     * If it's 0, the item never expires (but memcached server doesn't guarantee this item to be stored all the time,
+     * it could be deleted from the cache to make place for other items).
+     * You can use MEMCACHE_COMPRESSED constant as flag value if you want to use on-the-fly compression (uses zlib).
+     * @link https://php.net/manual/en/memcache.set.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] Use MEMCACHE_COMPRESSED to store the item compressed (uses zlib).
+     * @param int $expire [optional] Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function set ($key, $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Replace value of the existing item
+     * @link https://php.net/manual/en/memcache.replace.php
+     * @param string $key <p>The key that will be associated with the item.</p>
+     * @param mixed $var <p>The variable to store. Strings and integers are stored as is, other types are stored serialized.</p>
+     * @param int $flag [optional] <p>Use <b>MEMCACHE_COMPRESSED</b> to store the item compressed (uses zlib).</p>
+     * @param int $expire [optional] <p>Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns TRUE on success or FALSE on failure.
+     */
+    public function replace ($key,  $var, $flag = null, $expire = null) {}
+
+	public function cas () {}
+
+	public function append () {}
+
+    /**
+     * @return string
+     */
+    public function prepend () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Retrieve item from the server
+     * @link https://php.net/manual/en/memcache.get.php
+     * @param string|array $key <p>
+     * The key or array of keys to fetch.
+     * </p>
+     * @param int|array $flags [optional] <p>
+     * If present, flags fetched along with the values will be written to this parameter. These
+     * flags are the same as the ones given to for example {@link https://php.net/manual/en/memcache.set.php Memcache::set()}.
+     * The lowest byte of the int is reserved for pecl/memcache internal usage (e.g. to indicate
+     * compression and serialization status).
+     * </p>
+     * @return string|array|false <p>
+     * Returns the string associated with the <b>key</b> or
+     * an array of found key-value pairs when <b>key</b> is an {@link https://php.net/manual/en/language.types.array.php array}.
+     * Returns <b>FALSE</b> on failure, <b>key</b> is not found or
+     * <b>key</b> is an empty {@link https://php.net/manual/en/language.types.array.php array}.
+     * </p>
+     */
+    public function get ($key, &$flags = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Delete item from the server
+     * https://secure.php.net/manual/ru/memcache.delete.php
+     * @param $key string The key associated with the item to delete.
+     * @param $timeout int [optional] This deprecated parameter is not supported, and defaults to 0 seconds. Do not use this parameter.
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function delete ($key, $timeout = 0 ) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Get statistics of the server
+     * @link https://php.net/manual/ru/memcache.getstats.php
+     * @param string $type [optional] <p>
+     * The type of statistics to fetch.
+     * Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}.
+     * According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit [optional] <p>
+     * Used in conjunction with <b>type</b> set to cachedump to limit the number of entries to dump.
+     * </p>
+     * @return array|false Returns an associative array of server statistics or <b>FALSE</b> on failure.
+     */
+    public function getStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Get statistics from all servers in pool
+     * @link https://php.net/manual/en/memcache.getextendedstats.php
+     * @param string $type [optional] <p>The type of statistics to fetch. Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}. According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit Used in conjunction with type set to cachedump to limit the number of entries to dump.
+     * @return array|false Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * on failure.
+     */
+    public function getExtendedStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Enable automatic compression of large values
+     * @link https://php.net/manual/en/memcache.setcompressthreshold.php
+     * @param int $thresold <p>Controls the minimum value length before attempting to compress automatically.</p>
+     * @param float $min_saving [optional] <p>Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function setCompressThreshold ($thresold, $min_saving = 0.2) {}
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Increment item's value
+     * @link https://php.net/manual/en/memcache.increment.php
+     * @param $key string Key of the item to increment.
+     * @param $value int [optional] increment the item by <b>value</b>
+     * @return int|false Returns new items value on success or <b>FALSE</b> on failure.
+     */
+    public function increment ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Decrement item's value
+     * @link https://php.net/manual/en/memcache.decrement.php
+     * @param $key string Key of the item do decrement.
+     * @param $value int Decrement the item by <b>value</b>.
+     * @return int|false Returns item's new value on success or <b>FALSE</b> on failure.
+     */
+    public function decrement ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.4.0)<br/>
+     * Close memcached server connection
+     * @link https://php.net/manual/en/memcache.close.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function close () {}
+
+    /**
+     * (PECL memcache &gt;= 1.0.0)<br/>
+     * Flush all existing items at the server
+     * @link https://php.net/manual/en/memcache.flush.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function flush () {}
+
+}
+
+/**
+ * Represents a connection to a set of memcache servers.
+ * @link https://php.net/manual/en/class.memcache.php
+ */
+class Memcache extends MemcachePool  {
+
+
+	/**
+	 * (PECL memcache &gt;= 0.4.0)<br/>
+	 * Open memcached server persistent connection
+	 * @link https://php.net/manual/en/memcache.pconnect.php
+	 * @param string $host <p>
+	 * Point to the host where memcached is listening for connections. This parameter
+	 * may also specify other transports like unix:///path/to/memcached.sock
+	 * to use UNIX domain sockets, in this case <i>port</i> must also
+	 * be set to 0.
+	 * </p>
+	 * @param int $port [optional] <p>
+	 * Point to the port where memcached is listening for connections. Set this
+	 * parameter to 0 when using UNIX domain sockets.
+	 * </p>
+	 * @param int $timeout [optional] <p>
+	 * Value in seconds which will be used for connecting to the daemon. Think
+	 * twice before changing the default value of 1 second - you can lose all
+	 * the advantages of caching if your connection is too slow.
+	 * </p>
+	 * @return mixed a Memcache object or <b>FALSE</b> on failure.
+	 */
+	public function pconnect ($host, $port, $timeout = 1) {}
+}
+
+//  string $host [, int $port [, int $timeout ]]
+
+/**
+ * (PECL memcache >= 0.2.0)</br>
+ * Memcache::connect — Open memcached server connection
+ * @link https://php.net/manual/en/memcache.connect.php
+ * @param string $host <p>
+ * Point to the host where memcached is listening for connections.
+ * This parameter may also specify other transports like
+ * unix:///path/to/memcached.sock to use UNIX domain sockets,
+ * in this case port must also be set to 0.
+ * </p>
+ * @param int $port [optional] <p>
+ * Point to the port where memcached is listening for connections.
+ * Set this parameter to 0 when using UNIX domain sockets.
+ * Note:  port defaults to memcache.default_port if not specified.
+ * For this reason it is wise to specify the port explicitly in this method call.
+ * </p>
+ * @param int $timeout [optional] <p>
+ * Value in seconds which will be used for connecting to the daemon.
+ * </p>
+ * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+ */
+function memcache_connect ($host, $port, $timeout = 1) {}
+
+/**
+ * (PECL memcache >= 0.4.0)
+ * Memcache::pconnect — Open memcached server persistent connection
+ * 
+ * @link https://php.net/manual/en/memcache.pconnect.php#example-5242
+ * @param      $host
+ * @param null $port
+ * @param int  $timeout
+ * @return Memcache
+ */
+function memcache_pconnect ($host, $port=null, $timeout=1) {}
+
+function memcache_add_server () {}
+
+function memcache_set_server_params () {}
+
+function memcache_set_failure_callback () {}
+
+function memcache_get_server_status () {}
+
+function memcache_get_version () {}
+
+function memcache_add () {}
+
+function memcache_set () {}
+
+function memcache_replace () {}
+
+function memcache_cas () {}
+
+function memcache_append () {}
+
+function memcache_prepend () {}
+
+function memcache_get () {}
+
+function memcache_delete () {}
+
+/**
+ * (PECL memcache &gt;= 0.2.0)<br/>
+ * Turn debug output on/off
+ * @link https://php.net/manual/en/function.memcache-debug.php
+ * @param bool $on_off <p>
+ * Turns debug output on if equals to <b>TRUE</b>.
+ * Turns debug output off if equals to <b>FALSE</b>.
+ * </p>
+ * @return bool <b>TRUE</b> if PHP was built with --enable-debug option, otherwise
+ * returns <b>FALSE</b>.
+ */
+function memcache_debug ($on_off) {}
+
+function memcache_get_stats () {}
+
+function memcache_get_extended_stats () {}
+
+function memcache_set_compress_threshold () {}
+
+function memcache_increment () {}
+
+function memcache_decrement () {}
+
+function memcache_close () {}
+
+function memcache_flush () {}
+
+define ('MEMCACHE_COMPRESSED', 2);
+define ('MEMCACHE_USER1', 65536);
+define ('MEMCACHE_USER2', 131072);
+define ('MEMCACHE_USER3', 262144);
+define ('MEMCACHE_USER4', 524288);
+define ('MEMCACHE_HAVE_SESSION', 1);
+
+// End of memcache v.3.0.8
+?>

.phan/internal_stubs/memcached.phan_php

@@ -0,0 +1,1308 @@
+<?php
+
+// Start of memcached v.3.0.4
+
+/**
+ * Represents a connection to a set of memcached servers.
+ * @link https://php.net/manual/en/class.memcached.php
+ */
+class Memcached  {
+
+	/**
+	 * <p>Enables or disables payload compression. When enabled,
+	 * item values longer than a certain threshold (currently 100 bytes) will be
+	 * compressed during storage and decompressed during retrieval
+	 * transparently.</p>
+	 * <p>Type: boolean, default: <b>TRUE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_COMPRESSION = -1001;
+	const OPT_COMPRESSION_TYPE = -1004;
+
+	/**
+	 * <p>This can be used to create a "domain" for your item keys. The value
+	 * specified here will be prefixed to each of the keys. It cannot be
+	 * longer than 128 characters and will reduce the
+	 * maximum available key size. The prefix is applied only to the item keys,
+	 * not to the server keys.</p>
+	 * <p>Type: string, default: "".</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_PREFIX_KEY = -1002;
+
+	/**
+	 * <p>
+	 * Specifies the serializer to use for serializing non-scalar values.
+	 * The valid serializers are <b>Memcached::SERIALIZER_PHP</b>
+	 * or <b>Memcached::SERIALIZER_IGBINARY</b>. The latter is
+	 * supported only when memcached is configured with
+	 * --enable-memcached-igbinary option and the
+	 * igbinary extension is loaded.
+	 * </p>
+	 * <p>Type: integer, default: <b>Memcached::SERIALIZER_PHP</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SERIALIZER = -1003;
+
+	/**
+	 * <p>Indicates whether igbinary serializer support is available.</p>
+	 * <p>Type: boolean.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HAVE_IGBINARY = 0;
+
+	/**
+	 * <p>Indicates whether JSON serializer support is available.</p>
+	 * <p>Type: boolean.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HAVE_JSON = 0;
+	const HAVE_SESSION = 1;
+	const HAVE_SASL = 0;
+
+	/**
+	 * <p>Specifies the hashing algorithm used for the item keys. The valid
+	 * values are supplied via <b>Memcached::HASH_*</b> constants.
+	 * Each hash algorithm has its advantages and its disadvantages. Go with the
+	 * default if you don't know or don't care.</p>
+	 * <p>Type: integer, default: <b>Memcached::HASH_DEFAULT</b></p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_HASH = 2;
+
+	/**
+	 * <p>The default (Jenkins one-at-a-time) item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_DEFAULT = 0;
+
+	/**
+	 * <p>MD5 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_MD5 = 1;
+
+	/**
+	 * <p>CRC item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_CRC = 2;
+
+	/**
+	 * <p>FNV1_64 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1_64 = 3;
+
+	/**
+	 * <p>FNV1_64A item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1A_64 = 4;
+
+	/**
+	 * <p>FNV1_32 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1_32 = 5;
+
+	/**
+	 * <p>FNV1_32A item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1A_32 = 6;
+
+	/**
+	 * <p>Hsieh item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_HSIEH = 7;
+
+	/**
+	 * <p>Murmur item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_MURMUR = 8;
+
+	/**
+	 * <p>Specifies the method of distributing item keys to the servers.
+	 * Currently supported methods are modulo and consistent hashing. Consistent
+	 * hashing delivers better distribution and allows servers to be added to
+	 * the cluster with minimal cache losses.</p>
+	 * <p>Type: integer, default: <b>Memcached::DISTRIBUTION_MODULA.</b></p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_DISTRIBUTION = 9;
+
+	/**
+	 * <p>Modulo-based key distribution algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const DISTRIBUTION_MODULA = 0;
+
+	/**
+	 * <p>Consistent hashing key distribution algorithm (based on libketama).</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const DISTRIBUTION_CONSISTENT = 1;
+	const DISTRIBUTION_VIRTUAL_BUCKET = 6;
+
+	/**
+	 * <p>Enables or disables compatibility with libketama-like behavior. When
+	 * enabled, the item key hashing algorithm is set to MD5 and distribution is
+	 * set to be weighted consistent hashing distribution. This is useful
+	 * because other libketama-based clients (Python, Ruby, etc.) with the same
+	 * server configuration will be able to access the keys transparently.
+	 * </p>
+	 * <p>
+	 * It is highly recommended to enable this option if you want to use
+	 * consistent hashing, and it may be enabled by default in future
+	 * releases.
+	 * </p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_LIBKETAMA_COMPATIBLE = 16;
+	const OPT_LIBKETAMA_HASH = 17;
+	const OPT_TCP_KEEPALIVE = 32;
+
+	/**
+	 * <p>Enables or disables buffered I/O. Enabling buffered I/O causes
+	 * storage commands to "buffer" instead of being sent. Any action that
+	 * retrieves data causes this buffer to be sent to the remote connection.
+	 * Quitting the connection or closing down the connection will also cause
+	 * the buffered data to be pushed to the remote connection.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_BUFFER_WRITES = 10;
+
+	/**
+	 * <p>Enable the use of the binary protocol. Please note that you cannot
+	 * toggle this option on an open connection.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_BINARY_PROTOCOL = 18;
+
+	/**
+	 * <p>Enables or disables asynchronous I/O. This is the fastest transport
+	 * available for storage functions.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_NO_BLOCK = 0;
+
+	/**
+	 * <p>Enables or disables the no-delay feature for connecting sockets (may
+	 * be faster in some environments).</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_TCP_NODELAY = 1;
+
+	/**
+	 * <p>The maximum socket send buffer in bytes.</p>
+	 * <p>Type: integer, default: varies by platform/kernel
+	 * configuration.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SOCKET_SEND_SIZE = 4;
+
+	/**
+	 * <p>The maximum socket receive buffer in bytes.</p>
+	 * <p>Type: integer, default: varies by platform/kernel
+	 * configuration.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SOCKET_RECV_SIZE = 5;
+
+	/**
+	 * <p>In non-blocking mode this set the value of the timeout during socket
+	 * connection, in milliseconds.</p>
+	 * <p>Type: integer, default: 1000.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_CONNECT_TIMEOUT = 14;
+
+	/**
+	 * <p>The amount of time, in seconds, to wait until retrying a failed
+	 * connection attempt.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_RETRY_TIMEOUT = 15;
+
+	/**
+	 * <p>Socket sending timeout, in microseconds. In cases where you cannot
+	 * use non-blocking I/O this will allow you to still have timeouts on the
+	 * sending of data.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SEND_TIMEOUT = 19;
+
+	/**
+	 * <p>Socket reading timeout, in microseconds. In cases where you cannot
+	 * use non-blocking I/O this will allow you to still have timeouts on the
+	 * reading of data.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_RECV_TIMEOUT = 20;
+
+	/**
+	 * <p>Timeout for connection polling, in milliseconds.</p>
+	 * <p>Type: integer, default: 1000.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_POLL_TIMEOUT = 8;
+
+	/**
+	 * <p>Enables or disables caching of DNS lookups.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_CACHE_LOOKUPS = 6;
+
+	/**
+	 * <p>Specifies the failure limit for server connection attempts. The
+	 * server will be removed after this many continuous connection
+	 * failures.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SERVER_FAILURE_LIMIT = 21;
+	const OPT_AUTO_EJECT_HOSTS = 28;
+	const OPT_HASH_WITH_PREFIX_KEY = 25;
+	const OPT_NOREPLY = 26;
+	const OPT_SORT_HOSTS = 12;
+	const OPT_VERIFY_KEY = 13;
+	const OPT_USE_UDP = 27;
+	const OPT_NUMBER_OF_REPLICAS = 29;
+	const OPT_RANDOMIZE_REPLICA_READ = 30;
+	const OPT_CORK = 31;
+	const OPT_REMOVE_FAILED_SERVERS = 35;
+	const OPT_DEAD_TIMEOUT = 36;
+	const OPT_SERVER_TIMEOUT_LIMIT = 37;
+	const OPT_MAX = 38;
+	const OPT_IO_BYTES_WATERMARK = 23;
+	const OPT_IO_KEY_PREFETCH = 24;
+	const OPT_IO_MSG_WATERMARK = 22;
+	const OPT_LOAD_FROM_FILE = 34;
+	const OPT_SUPPORT_CAS = 7;
+	const OPT_TCP_KEEPIDLE = 33;
+	const OPT_USER_DATA = 11;
+
+
+	/**
+	 * <p>The operation was successful.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SUCCESS = 0;
+
+	/**
+	 * <p>The operation failed in some fashion.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_FAILURE = 1;
+
+	/**
+	 * <p>DNS lookup failed.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_HOST_LOOKUP_FAILURE = 2;
+
+	/**
+	 * <p>Failed to read network data.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_UNKNOWN_READ_FAILURE = 7;
+
+	/**
+	 * <p>Bad command in memcached protocol.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PROTOCOL_ERROR = 8;
+
+	/**
+	 * <p>Error on the client side.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_CLIENT_ERROR = 9;
+
+	/**
+	 * <p>Error on the server side.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SERVER_ERROR = 10;
+
+	/**
+	 * <p>Failed to write network data.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_WRITE_FAILURE = 5;
+
+	/**
+	 * <p>Failed to do compare-and-swap: item you are trying to store has been
+	 * modified since you last fetched it.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_DATA_EXISTS = 12;
+
+	/**
+	 * <p>Item was not stored: but not because of an error. This normally
+	 * means that either the condition for an "add" or a "replace" command
+	 * wasn't met, or that the item is in a delete queue.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NOTSTORED = 14;
+
+	/**
+	 * <p>Item with this key was not found (with "get" operation or "cas"
+	 * operations).</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NOTFOUND = 16;
+
+	/**
+	 * <p>Partial network data read error.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PARTIAL_READ = 18;
+
+	/**
+	 * <p>Some errors occurred during multi-get.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SOME_ERRORS = 19;
+
+	/**
+	 * <p>Server list is empty.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NO_SERVERS = 20;
+
+	/**
+	 * <p>End of result set.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_END = 21;
+
+	/**
+	 * <p>System error.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_ERRNO = 26;
+
+	/**
+	 * <p>The operation was buffered.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_BUFFERED = 32;
+
+	/**
+	 * <p>The operation timed out.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_TIMEOUT = 31;
+
+	/**
+	 * <p>Bad key.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_BAD_KEY_PROVIDED = 33;
+	const RES_STORED = 15;
+	const RES_DELETED = 22;
+	const RES_STAT = 24;
+	const RES_ITEM = 25;
+	const RES_NOT_SUPPORTED = 28;
+	const RES_FETCH_NOTFINISHED = 30;
+	const RES_SERVER_MARKED_DEAD = 35;
+	const RES_UNKNOWN_STAT_KEY = 36;
+	const RES_INVALID_HOST_PROTOCOL = 34;
+	const RES_MEMORY_ALLOCATION_FAILURE = 17;
+	const RES_E2BIG = 37;
+	const RES_KEY_TOO_BIG = 39;
+	const RES_SERVER_TEMPORARILY_DISABLED = 47;
+	const RES_SERVER_MEMORY_ALLOCATION_FAILURE = 48;
+	const RES_AUTH_PROBLEM = 40;
+	const RES_AUTH_FAILURE = 41;
+	const RES_AUTH_CONTINUE = 42;
+	const RES_CONNECTION_FAILURE = 3;
+	const RES_CONNECTION_BIND_FAILURE = 4;
+	const RES_READ_FAILURE = 6;
+	const RES_DATA_DOES_NOT_EXIST = 13;
+	const RES_VALUE = 23;
+	const RES_FAIL_UNIX_SOCKET = 27;
+	const RES_NO_KEY_PROVIDED = 29;
+	const RES_INVALID_ARGUMENTS = 38;
+	const RES_PARSE_ERROR = 43;
+	const RES_PARSE_USER_ERROR = 44;
+	const RES_DEPRECATED = 45;
+	const RES_IN_PROGRESS = 46;
+	const RES_MAXIMUM_RETURN = 49;
+
+
+
+	/**
+	 * <p>Failed to create network socket.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_CONNECTION_SOCKET_CREATE_FAILURE = 11;
+
+	/**
+	 * <p>Payload failure: could not compress/decompress or serialize/unserialize the value.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PAYLOAD_FAILURE = -1001;
+
+	/**
+	 * <p>The default PHP serializer.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_PHP = 1;
+
+	/**
+	 * <p>The igbinary serializer.
+	 * Instead of textual representation it stores PHP data structures in a
+	 * compact binary form, resulting in space and time gains.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_IGBINARY = 2;
+
+	/**
+	 * <p>The JSON serializer. Requires PHP 5.2.10+.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_JSON = 3;
+	const SERIALIZER_JSON_ARRAY = 4;
+	const COMPRESSION_FASTLZ = 2;
+	const COMPRESSION_ZLIB = 1;
+
+	/**
+	 * <p>A flag for <b>Memcached::getMulti</b> and
+	 * <b>Memcached::getMultiByKey</b> to ensure that the keys are
+	 * returned in the same order as they were requested in. Non-existing keys
+	 * get a default value of NULL.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const GET_PRESERVE_ORDER = 1;
+	const GET_ERROR_RETURN_VALUE = false;
+
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Create a Memcached instance
+	 * @link https://php.net/manual/en/memcached.construct.php
+	 * @param $persistent_id [optional]
+	 * @param $callback [optional]
+	 */
+	public function __construct ($persistent_id = '', $on_new_object_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Return the result code of the last operation
+	 * @link https://php.net/manual/en/memcached.getresultcode.php
+	 * @return int Result code of the last Memcached operation.
+	 */
+	public function getResultCode () {}
+
+	/**
+	 * (PECL memcached &gt;= 1.0.0)<br/>
+	 * Return the message describing the result of the last operation
+	 * @link https://php.net/manual/en/memcached.getresultmessage.php
+	 * @return string Message describing the result of the last Memcached operation.
+	 */
+	public function getResultMessage () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve an item
+	 * @link https://php.net/manual/en/memcached.get.php
+	 * @param string $key <p>
+	 * The key of the item to retrieve.
+	 * </p>
+	 * @param callable $cache_cb [optional] <p>
+	 * Read-through caching callback or <b>NULL</b>.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the value stored in the cache or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function get ($key, callable $cache_cb = null, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve an item from a specific server
+	 * @link https://php.net/manual/en/memcached.getbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to fetch.
+	 * </p>
+	 * @param callable $cache_cb [optional] <p>
+	 * Read-through caching callback or <b>NULL</b>
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the value stored in the cache or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function getByKey ($server_key, $key, callable $cache_cb = null, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve multiple items
+	 * @link https://php.net/manual/en/memcached.getmulti.php
+	 * @param array $keys <p>
+	 * Array of keys to retrieve.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the array of found items or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getMulti (array $keys, $flags = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.getmultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * Array of keys to retrieve.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return array|false the array of found items or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getMultiByKey ($server_key, array $keys, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Request multiple items
+	 * @link https://php.net/manual/en/memcached.getdelayed.php
+	 * @param array $keys <p>
+	 * Array of keys to request.
+	 * </p>
+	 * @param bool $with_cas [optional] <p>
+	 * Whether to request CAS token values also.
+	 * </p>
+	 * @param callable $value_cb [optional] <p>
+	 * The result callback or <b>NULL</b>.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getDelayed (array $keys, $with_cas = null, callable $value_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Request multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.getdelayedbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * Array of keys to request.
+	 * </p>
+	 * @param bool $with_cas [optional] <p>
+	 * Whether to request CAS token values also.
+	 * </p>
+	 * @param callable $value_cb [optional] <p>
+	 * The result callback or <b>NULL</b>.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getDelayedByKey ($server_key, array $keys, $with_cas = null, callable $value_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Fetch the next result
+	 * @link https://php.net/manual/en/memcached.fetch.php
+	 * @return array|false the next result or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_END</b> if result set is exhausted.
+	 */
+	public function fetch () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Fetch all the remaining results
+	 * @link https://php.net/manual/en/memcached.fetchall.php
+	 * @return array|false the results or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function fetchAll () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store an item
+	 * @link https://php.net/manual/en/memcached.set.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function set ($key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store an item on a specific server
+	 * @link https://php.net/manual/en/memcached.setbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setByKey ($server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set a new expiration on an item
+	 * @link https://php.net/manual/en/memcached.touch.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param int $expiration <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function touch ($key, $expiration = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set a new expiration on an item on a specific server
+	 * @link https://php.net/manual/en/memcached.touchbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param int $expiration <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function touchByKey ($server_key, $key, $expiration) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store multiple items
+	 * @link https://php.net/manual/en/memcached.setmulti.php
+	 * @param array $items <p>
+	 * An array of key/value pairs to store on the server.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setMulti (array $items, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store multiple items on a specific server
+	 * @link https://php.net/manual/en/memcached.setmultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $items <p>
+	 * An array of key/value pairs to store on the server.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setMultiByKey ($server_key, array $items, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Compare and swap an item
+	 * @link https://php.net/manual/en/memcached.cas.php
+	 * @param float $cas_token <p>
+	 * Unique value associated with the existing item. Generated by memcache.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_DATA_EXISTS</b> if the item you are trying
+	 * to store has been modified since you last fetched it.
+	 */
+	public function cas ($cas_token, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Compare and swap an item on a specific server
+	 * @link https://php.net/manual/en/memcached.casbykey.php
+	 * @param float $cas_token <p>
+	 * Unique value associated with the existing item. Generated by memcache.
+	 * </p>
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_DATA_EXISTS</b> if the item you are trying
+	 * to store has been modified since you last fetched it.
+	 */
+	public function casByKey ($cas_token, $server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add an item under a new key
+	 * @link https://php.net/manual/en/memcached.add.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key already exists.
+	 */
+	public function add ($key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add an item under a new key on a specific server
+	 * @link https://php.net/manual/en/memcached.addbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key already exists.
+	 */
+	public function addByKey ($server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Append data to an existing item
+	 * @link https://php.net/manual/en/memcached.append.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to append.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function append ($key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Append data to an existing item on a specific server
+	 * @link https://php.net/manual/en/memcached.appendbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to append.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function appendByKey ($server_key, $key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Prepend data to an existing item
+	 * @link https://php.net/manual/en/memcached.prepend.php
+	 * @param string $key <p>
+	 * The key of the item to prepend the data to.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to prepend.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function prepend ($key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Prepend data to an existing item on a specific server
+	 * @link https://php.net/manual/en/memcached.prependbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to prepend the data to.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to prepend.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function prependByKey ($server_key, $key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Replace the item under an existing key
+	 * @link https://php.net/manual/en/memcached.replace.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function replace ($key, $value, $expiration = null, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Replace the item under an existing key on a specific server
+	 * @link https://php.net/manual/en/memcached.replacebykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function replaceByKey ($server_key, $key, $value, $expiration = null, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Delete an item
+	 * @link https://php.net/manual/en/memcached.delete.php
+	 * @param string $key <p>
+	 * The key to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the item.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function delete ($key, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Delete multiple items
+	 * @link https://php.net/manual/en/memcached.deletemulti.php
+	 * @param array $keys <p>
+	 * The keys to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the items.
+	 * </p>
+	 * @return array Returns array indexed by keys and where values are indicating whether operation succeeded or not.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteMulti (array $keys, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Delete an item from a specific server
+	 * @link https://php.net/manual/en/memcached.deletebykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the item.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteByKey ($server_key, $key, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Delete multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.deletemultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * The keys to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the items.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteMultiByKey ($server_key, array $keys, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Increment numeric item's value
+	 * @link https://php.net/manual/en/memcached.increment.php
+	 * @param string $key <p>
+	 * The key of the item to increment.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to increment the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false new item's value on success or <b>FALSE</b> on failure.
+	 */
+	public function increment ($key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Decrement numeric item's value
+	 * @link https://php.net/manual/en/memcached.decrement.php
+	 * @param string $key <p>
+	 * The key of the item to decrement.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to decrement the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false item's new value on success or <b>FALSE</b> on failure.
+	 */
+	public function decrement ($key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Increment numeric item's value, stored on a specific server
+	 * @link https://php.net/manual/en/memcached.incrementbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to increment.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to increment the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false new item's value on success or <b>FALSE</b> on failure.
+	 */
+	public function incrementByKey ($server_key, $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Decrement numeric item's value, stored on a specific server
+	 * @link https://php.net/manual/en/memcached.decrementbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to decrement.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to decrement the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false item's new value on success or <b>FALSE</b> on failure.
+	 */
+	public function decrementByKey ($server_key, $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add a server to the server pool
+	 * @link https://php.net/manual/en/memcached.addserver.php
+	 * @param string $host <p>
+	 * The hostname of the memcache server. If the hostname is invalid, data-related
+	 * operations will set
+	 * <b>Memcached::RES_HOST_LOOKUP_FAILURE</b> result code.
+	 * </p>
+	 * @param int $port <p>
+	 * The port on which memcache is running. Usually, this is
+	 * 11211.
+	 * </p>
+	 * @param int $weight [optional] <p>
+	 * The weight of the server relative to the total weight of all the
+	 * servers in the pool. This controls the probability of the server being
+	 * selected for operations. This is used only with consistent distribution
+	 * option and usually corresponds to the amount of memory available to
+	 * memcache on that server.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function addServer ($host, $port, $weight = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.1)<br/>
+	 * Add multiple servers to the server pool
+	 * @link https://php.net/manual/en/memcached.addservers.php
+	 * @param array $servers
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function addServers (array $servers) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Get the list of the servers in the pool
+	 * @link https://php.net/manual/en/memcached.getserverlist.php
+	 * @return array The list of all servers in the server pool.
+	 */
+	public function getServerList () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Map a key to a server
+	 * @link https://php.net/manual/en/memcached.getserverbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @return array an array containing three keys of host,
+	 * port, and weight on success or <b>FALSE</b>
+	 * on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getServerByKey ($server_key) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Clears all servers from the server list
+	 * @link https://php.net/manual/en/memcached.resetserverlist.php
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function resetServerList () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Close any open connections
+	 * @link https://php.net/manual/en/memcached.quit.php
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function quit () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Get server pool statistics
+	 * @link https://php.net/manual/en/memcached.getstats.php
+	 * @param string $type
+	 * @return array Array of server statistics, one entry per server.
+	 */
+	public function getStats ($type = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.5)<br/>
+	 * Get server pool version info
+	 * @link https://php.net/manual/en/memcached.getversion.php
+	 * @return array Array of server versions, one entry per server.
+	 */
+	public function getVersion () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Gets the keys stored on all the servers
+	 * @link https://php.net/manual/en/memcached.getallkeys.php
+	 * @return array|false the keys stored on all the servers on success or <b>FALSE</b> on failure.
+	 */
+	public function getAllKeys () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Invalidate all items in the cache
+	 * @link https://php.net/manual/en/memcached.flush.php
+	 * @param int $delay [optional] <p>
+	 * Numer of seconds to wait before invalidating the items.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function flush ($delay = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve a Memcached option value
+	 * @link https://php.net/manual/en/memcached.getoption.php
+	 * @param int $option <p>
+	 * One of the Memcached::OPT_* constants.
+	 * </p>
+	 * @return mixed the value of the requested option, or <b>FALSE</b> on
+	 * error.
+	 */
+	public function getOption ($option) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Set a Memcached option
+	 * @link https://php.net/manual/en/memcached.setoption.php
+	 * @param int $option
+	 * @param mixed $value
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setOption ($option, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set Memcached options
+	 * @link https://php.net/manual/en/memcached.setoptions.php
+	 * @param array $options <p>
+	 * An associative array of options where the key is the option to set and
+	 * the value is the new value for the option.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setOptions (array $options) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set the credentials to use for authentication
+	 * @link https://secure.php.net/manual/en/memcached.setsaslauthdata.php
+	 * @param string $username <p>
+	 * The username to use for authentication.
+	 * </p>
+	 * @param string $password <p>
+	 * The password to use for authentication.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setSaslAuthData (string $username , string $password) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Check if a persitent connection to memcache is being used
+	 * @link https://php.net/manual/en/memcached.ispersistent.php
+	 * @return bool true if Memcache instance uses a persistent connection, false otherwise.
+	 */
+	public function isPersistent () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Check if the instance was recently created
+	 * @link https://php.net/manual/en/memcached.ispristine.php
+	 * @return bool the true if instance is recently created, false otherwise.
+	 */
+	public function isPristine () {}
+
+	public function flushBuffers () {}
+
+	public function setEncodingKey ( $key ) {}
+
+	public function getLastDisconnectedServer () {}
+
+	public function getLastErrorErrno () {}
+
+	public function getLastErrorCode () {}
+
+	public function getLastErrorMessage () {}
+
+	public function setBucket (array $host_map, array $forward_map, $replicas) {}
+
+}
+
+/**
+ * @link https://php.net/manual/en/class.memcachedexception.php
+ */
+class MemcachedException extends RuntimeException  {
+
+}
+// End of memcached v.3.0.4
+?>

CHANGELOG.md

@@ -1,3 +1,880 @@
+# v1.7.14
+## 04/29/2021
+
+1. [](#new)
+    * Added `MediaUploadTrait::checkFileMetadata()` method
+1. [](#improved)
+    * Updating a theme should always keep the custom files [getgrav/grav-plugin-admin#2135](https://github.com/getgrav/grav-plugin-admin/issues/2135)
+1. [](#bugfix)
+    * Fixed broken numeric language codes in Flex Pages [#3332](https://github.com/getgrav/grav/issues/3332)
+    * Fixed broken `exif_imagetype()` twig function
+
+# v1.7.13
+## 04/23/2021
+
+1. [](#new)
+    * Added support for getting translated collection of Flex Pages using `$collection->withTranslated('de')`
+1. [](#improved)
+    * Moved `gregwar/Image` and `gregwar/Cache` in-house to official `getgrav/Image` and `getgrav/Cache` packagist packages. This will help environments with very strict proxy setups that don't allow VCS setup. [#3289](https://github.com/getgrav/grav/issues/3289)
+    * Improved XSS Invalid Protocol detection regex [#3298](https://github.com/getgrav/grav/issues/3298)
+    * Added support for user provided folder in Flex `$page->copy()`
+1. [](#bugfix)
+    * Fixed `The "Grav/Common/Twig/TwigExtension" extension is not enabled` when using markdown twig tag [#3317](https://github.com/getgrav/grav/issues/3317)
+    * Fixed text field maxlength validation newline issue [#3324](https://github.com/getgrav/grav/issues/3324)
+    * Fixed a bug in Flex Object `refresh()` method
+
+# v1.7.12
+## 04/15/2021
+
+1. [](#improved)
+    * Improve JSON support for the request
+1. [](#bugfix)
+    * Fixed absolute path support for Windows [#3297](https://github.com/getgrav/grav/issues/3297)
+    * Fixed adding tags in admin after upgrading Grav [#3315](https://github.com/getgrav/grav/issues/3315)
+
+# v1.7.11
+## 04/13/2021
+
+1. [](#new)
+    * Added configuration options to allow PHP methods to be used in Twig functions (`system.twig.safe_functions`) and filters (`system.twig.safe_filters`)
+    * Deprecated using PHP methods in Twig without them being in the safe lists
+    * Prevent dangerous PHP methods from being used as Twig functions and filters
+    * Restrict filesystem Twig functions to accept only local filesystem and grav streams
+1. [](#improved)
+    * Better GPM detection of unauthorized installations
+1. [](#bugfix)
+  * **IMPORTANT** Fixed security vulnerability with Twig allowing dangerous PHP functions by default [GHSA-g8r4-p96j-xfxc](https://github.com/getgrav/grav/security/advisories/GHSA-g8r4-p96j-xfxc)
+    * Fixed nxinx appending repeating `?_url=` in some redirects
+    * Fixed deleting page with language code not removing the folder if it was the last language [#3305](https://github.com/getgrav/grav/issues/3305)
+    * Fixed fatal error when using markdown links with `image://` stream [#3285](https://github.com/getgrav/grav/issues/3285)
+    * Fixed `system.languages.session_store_active` not having any effect [#3269](https://github.com/getgrav/grav/issues/3269)
+    * Fixed fatal error if `system.pages.types` is not an array [#2984](https://github.com/getgrav/grav/issues/2984)
+
+# v1.7.10
+## 04/06/2021
+
+1. [](#new)
+    * Added initial support for running Grav library from outside the webroot [#3297](https://github.com/getgrav/grav/issues/3297)
+1. [](#improved)
+    * Improved password handling when saving a user
+1. [](#bugfix)
+    * Ignore errors when using `set_time_limit` in `Archiver` and `GPM\Response` classes [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed `Folder::move()` deleting the folder if you move folder into itself, created empty file instead
+    * Fixed moving `Flex Page` to itself causing the page to be lost [#3227](https://github.com/getgrav/grav/issues/3227)
+    * Fixed `PageStorage` from detecting files as pages
+    * Fixed `UserIndex` not implementing `UserCollectionInterface`
+    * Fixed missing `onAdminAfterDelete` event call in `Flex Pages`
+    * Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
+    * Fixed incorrect routing if url path looks like a domain name [#2184](https://github.com/getgrav/grav/issues/2184)
+
+# v1.7.9
+## 03/19/2021
+
+1. [](#new)
+    * Added `Media::hide()` method to hide files from media
+    * Added `Utils::getPathFromToken()` method which works also with `Flex Objects`
+    * Added `FlexMediaTrait::getMediaField()`, which can be used to access custom media set in the blueprint fields
+    * Added `FlexMediaTrait::getFieldSettings()`, which can be used to get media field settings
+1. [](#improved)
+    * Method `Utils::getPagePathFromToken()` now calls the more generic `Utils::getPathFromToken()`
+    * Updated `SECURITY.md` to use security@getgrav.org
+1. [](#bugfix)
+    * Fixed broken media upload in `Flex` with `@self/path`, `@page` and `@theme` destinations [#3275](https://github.com/getgrav/grav/issues/3275)
+    * Fixed media fields excluding newly deleted files before saving the object
+    * Fixed method `$pages->find()` should never redirect [#3266](https://github.com/getgrav/grav/pull/3266)
+    * Fixed `Page::activeChild()` throwing an error [#3276](https://github.com/getgrav/grav/issues/3276)
+    * Fixed `Flex Page` CRUD ACL when creating a new page (needs Flex Objects plugin update) [grav-plugin-flex-objects#115](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/115)
+    * Fixed the list of pages not showing up in admin [#3280](https://github.com/getgrav/grav/issues/3280)
+    * Fixed text field min/max validation for UTF8 characters [#3281](https://github.com/getgrav/grav/issues/3281)
+    * Fixed redirects using wrong redirect code
+
+# v1.7.8
+## 03/17/2021
+
+1. [](#new)
+    * Added `ControllerResponseTrait::createDownloadResponse()` method
+    * Added full blueprint support to theme if you move existing files in `blueprints/` to `blueprints/pages/` folder [#3255](https://github.com/getgrav/grav/issues/3255)
+    * Added support for `Theme::getFormFieldTypes()` just like in plugins
+1. [](#improved)
+    * Optimized `Flex Pages` for speed
+    * Optimized saving visible/ordered pages when there are a lot of siblings [#3231](https://github.com/getgrav/grav/issues/3231)
+    * Clearing cache now deletes all clockwork files
+    * Improved `system.pages.redirect_default_route` and `system.pages.redirect_trailing_slash` configuration options to accept redirect code
+1. [](#bugfix)
+    * Fixed clockwork error when clearing cache
+    * Fixed missing method `translated()` in `Flex Pages`
+    * Fixed missing `Flex Pages` in site if multi-language support has been enabled
+    * Fixed Grav using blueprints and form fields from disabled plugins
+    * Fixed `FlexIndex::sortBy(['key' => 'ASC'])` having no effect
+    * Fixed default Flex Pages collection ordering to order by filesystem path
+    * Fixed disappearing pages on save if `pages://` stream resolves to multiple folders where the preferred folder doesn't exist
+    * Fixed Markdown image attribute `loading` [#3251](https://github.com/getgrav/grav/pull/3251)
+    * Fixed `Uri::isValidExtension()` returning false positives
+    * Fixed `page.html` returning duplicated content with `system.pages.redirect_default_route` turned on [#3130](https://github.com/getgrav/grav/issues/3130)
+    * Fixed site redirect with redirect code failing when redirecting to sub-pages [#3035](https://github.com/getgrav/grav/pull/3035/files)
+    * Fixed `Uncaught ValueError: Path cannot be empty` when failing to upload a file [#3265](https://github.com/getgrav/grav/issues/3265)
+    * Fixed `Path cannot be empty` when viewing non-existent log file [#3270](https://github.com/getgrav/grav/issues/3270)
+    * Fixed `onAdminSave` original page having empty header [#3259](https://github.com/getgrav/grav/issues/3259)
+
+# v1.7.7
+## 02/23/2021
+
+1. [](#new)
+    * Added `Utils::arrayToQueryParams()` to convert an array into query params
+1. [](#improved)
+    * Added original image support for all flex objects and media fields
+    * Improved `Pagination` class to allow custom pagination query parameter
+1. [](#bugfix)
+    * Fixed avatar of the user not being saved [grav-plugin-flex-objects#111](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/111)
+    * Replaced special space character with regular space in `system/blueprints/user/account_new.yaml`
+
+# v1.7.6
+## 02/17/2021
+
+1. [](#new)
+    * Added `Medium::attribute()` to pass arbitrary attributes [#3065](https://github.com/getgrav/grav/pull/3065)
+    * Added `Plugins::getPlugins()` and `Plugins::getPlugin($name)` to make it easier to access plugin instances [#2277](https://github.com/getgrav/grav/pull/2277)
+    * Added `regex_match` and `regex_split` twig functions [#2788](https://github.com/getgrav/grav/pull/2788)
+    * Updated all languages from [Crowdin](https://crowdin.com/project/grav-core) - Please update any translations here
+1. [](#improved)
+    * Added abstract `FlexObject`, `FlexCollection` and `FlexIndex` classes to `\Grav\Common\Flex` namespace (extend those instead of Framework or Generic classes)
+    * Updated bundled `composer.phar` binary to latest version `2.0.9`
+    * Improved session fixation handling in PHP 7.4+ (cannot fix it in PHP 7.3 due to PHP bug)
+    * Added optional password/database attributes for redis in `system.yaml`
+    * Added ability to filter enabled or disabled with bin/gpm index [#3187](https://github.com/getgrav/grav/pull/3187)
+    * Added `$grav->getVersion()` or `grav.version` in twig to get the current Grav version [#3142](https://github.com/getgrav/grav/issues/3142)
+    * Added second parameter to `$blueprint->flattenData()` to include every field, including those which have no data
+    * Added support for setting session domain [#2040](https://github.com/getgrav/grav/pull/2040)
+    * Better support inheriting languages when using child themes [#3226](https://github.com/getgrav/grav/pull/3226)
+    * Added option for `FlexForm` constructor to reset the form
+1. [](#bugfix)
+    * Fixed issue with `content-security-policy` not being properly supported with `http-equiv` + support single quotes
+    * Fixed CLI progressbar in `backup` and `security` commands to use styled output [#3198](https://github.com/getgrav/grav/issues/3198)
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed `Flex Pages` using only default language in frontend [#106](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/106)
+    * Fixed empty `route()` and `raw_route()` when getting translated pages [#3184](https://github.com/getgrav/grav/pull/3184)
+    * Fixed error on `bin/gpm plugin uninstall` [#3207](https://github.com/getgrav/grav/issues/3207)
+    * Fixed broken min/max validation for field `type: int`
+    * Fixed lowering uppercase characters in usernames when saving from frontend [#2565](https://github.com/getgrav/grav/pull/2565)
+    * Fixed save error when editing accounts that have been created with capital letters in their username [#3211](https://github.com/getgrav/grav/issues/3211)
+    * Fixed renaming flex objects key when using file storage
+    * Fixed wrong values in Admin pages list [#3214](https://github.com/getgrav/grav/issues/3214)
+    * Fixed pipelined asset using different hash when extra asset is added to before/after position [#2781](https://github.com/getgrav/grav/issues/2781)
+    * Fixed trailing slash redirect to only apply to GET/HEAD requests and use 301 status code [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed root page to always contain trailing slash [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed `<meta name="flattr:*" content="*">` to use name instead property [#3010](https://github.com/getgrav/grav/pull/3010)
+    * Fixed behavior of opposite filters in `Pages::getCollection()` to match Grav 1.6 [#3216](https://github.com/getgrav/grav/pull/3216)
+    * Fixed modular content with missing template file ending up using non-modular template [#3218](https://github.com/getgrav/grav/issues/3218)
+    * Fixed broken attachment image in Flex Objects Admin when `destination: self@` used [#3225](https://github.com/getgrav/grav/issues/3225)
+    * Fixed bug in page content with both markdown and twig enabled [#3223](https://github.com/getgrav/grav/issues/3223)
+
+# v1.7.5
+## 02/01/2021
+
+1. [](#bugfix)
+    * Revert: Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191) - breaking save
+
+# v1.7.4
+## 02/01/2021
+
+1. [](#new)
+    * Added `FlexForm::setSubmitMethod()` to customize form submit action
+1. [](#improved)
+    * Improved GPM error handling
+1. [](#bugfix)
+    * Fixed `bin/gpm uninstall` script not working because of bad typehint [#3172](https://github.com/getgrav/grav/issues/3172)
+    * Fixed `login: visibility_requires_access` not working in pages [#3176](https://github.com/getgrav/grav/issues/3176)
+    * Fixed cannot change image format [#3173](https://github.com/getgrav/grav/issues/3173)
+    * Fixed saving page in expert mode [#3174](https://github.com/getgrav/grav/issues/3174)
+    * Fixed exception in `$flexPage->frontmatter()` method when setting value
+    * Fixed `onBlueprintCreated` event being called multiple times in `Flex Pages` [grav-plugin-flex-objects#97](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/97)
+    * Fixed wrong ordering in page collections if `intl` extension has been enabled [#3167](https://github.com/getgrav/grav/issues/3167)
+    * Fixed page redirect to the first visible child page (needs to be routable and published, too)
+    * Fixed untranslated module pages showing up in the menu
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed incorrect config lookup for loading in `ImageLoadingTrait` [#3192](https://github.com/getgrav/grav/issues/3192)
+
+# v1.7.3
+## 01/21/2021
+
+1. [](#improved)
+    * IMPORTANT - Please [checkout the process](https://getgrav.org/blog/grav-170-cli-self-upgrade-bug) to `self-upgrade` from CLI if you are on **Grav 1.7.0 or 1.7.1**
+    * Added support for symlinking individual plugins and themes by using `bin/grav install -p myplugin` or `-t mytheme`
+    * Added support for symlinking plugins and themes with `hebe.json` file to support custom folder structures
+    * Added support for running post-install scripts in `bin/gpm selfupgrade` if Grav was updated manually
+1. [](#bugfix)
+    * Fixed default GPM Channel back to 'stable' - this was inadvertently left as 'testing' [#3163](https://github.com/getgrav/grav/issues/3163)
+    * Fixed broken stream initialization if `environment://` paths aren't streams
+    * Fixed Clockwork debugger in sub-folder multi-site setups
+    * Fixed `Unsupported option "curl" passed to "Symfony\Component\HttpClient\CurlHttpClient"` in `bin/gpm selfupgrade` [#3165](https://github.com/getgrav/grav/issues/3165)
+
+# v1.7.2
+## 01/21/2021
+
+1. [](#improved)
+    * This release was pulled due to a bug in the installer, 1.7.3 replaces it.
+
+# v1.7.1
+## 01/20/2021
+
+1. [](#bugfix)
+    * Fixed fatal error when `site.taxonomies` contains a bad value
+    * Sanitize valid Page extensions from `Page::template_format()`
+    * Fixed `bin/gpm index` erroring out [#3158](https://github.com/getgrav/grav/issues/3158)
+    * Fixed `bin/gpm selfupgrade` failing to report failed Grav update [#3116](https://github.com/getgrav/grav/issues/3116)
+    * Fixed `bin/gpm selfupgrade` error on `Call to undefined method` [#3160](https://github.com/getgrav/grav/issues/3160)
+    * Flex Pages: Fixed fatal error when trying to move a page to Root (/) [#3161](https://github.com/getgrav/grav/issues/3161)
+    * Fixed twig parsing errors in pages where twig is parsed after markdown [#3162](https://github.com/getgrav/grav/issues/3162)
+    * Fixed `lighttpd.conf` access-deny rule [#1876](https://github.com/getgrav/grav/issues/1876)
+    * Fixed page metadata being double-escaped [#3121](https://github.com/getgrav/grav/issues/3121)
+
+# v1.7.0
+## 01/19/2021
+
+1. [](#new)
+    * Requires **PHP 7.3.6**
+    * Read about this release in the [Grav 1.7 Released](https://getgrav.org/blog/grav-1.7-released) blog post
+    * Read the full list of all changes in the [Changelog on GitHub](https://github.com/getgrav/grav/blob/1.7.0/CHANGELOG.md)
+    * Please read [Grav 1.7 Upgrade Guide](https://learn.getgrav.org/17/advanced/grav-development/grav-17-upgrade-guide) before upgrading!
+    * Added support for overriding configuration by using environment variables
+    * Use PHP 7.4 serialization (the old `Serializable` methods are now final and cannot be overridden)
+    * Enabled `ETag` setting by default for 304 responses
+    * Added `FlexCollection::getDistinctValues()` to get all the assigned values from the field
+    * `Flex Pages` method `$page->header()` returns `\Grav\Common\Page\Header` object, old `Page` class still returns `stdClass`
+1. [](#improved)
+    * Make it possible to use an absolute path when loading a blueprint
+    * Make serialize methods final in `ContentBlock`, `AbstractFile`, `FormTrait`, `ObjectCollectionTrait` and `ObjectTrait`
+    * Added support for relative paths in `PageObject::getLevelListing()` [#3110](https://github.com/getgrav/grav/issues/3110)
+    * Better `--env` and `--lang` support for `bin/grav`, `bin/gpm` and `bin/plugin` console commands
+      * **BC BREAK** Shorthand for `--env`: `-e` will not work anymore as it conflicts with some plugins
+    * Added support for locking the `start` and `limit` in a Page Collection
+1. [](#bugfix)
+    * Fixed port issue with `system.custom_base_url`
+    * Hide errors with `exif_read_data` in `ImageFile`
+    * Fixed unserialize in `MarkdownFormatter` and `Framework\File` classes
+    * Fixed pages with session messages should never be cached [#3108](https://github.com/getgrav/grav/issues/3108)
+    * Fixed `Filesystem::normalize()` with dot-dot paths
+    * Fixed Flex sorting issues [grav-plugin-flex-objects#92](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/92)
+    * Fixed Clockwork missing dumped arrays and objects
+    * Fixed fatal error in PHP 8 when trying to access root page
+    * Fixed Array->String conversion error when `languages:translations: false` [admin#1896](https://github.com/getgrav/grav-plugin-admin/issues/1896)
+    * Fixed `Inflector` methods when translation is missing `GRAV.INFLECTOR_*` translations
+    * Fixed exception when changing parent of new page [grav-plugin-admin#2018](https://github.com/getgrav/grav-plugin-admin/issues/2018)
+    * Fixed ordering issue with moving pages [grav-plugin-admin#2015](https://github.com/getgrav/grav-plugin-admin/issues/2015)
+    * Fixed Flex Pages cache not invalidating if saving an old `Page` object [#3152](https://github.com/getgrav/grav/issues/3152)
+    * Fixed multiple issues with `system.language.translations: false`
+    * Fixed page collections containing dummy items for untranslated default language [#2985](https://github.com/getgrav/grav/issues/2985)
+    * Fixed streams in `setup.php` being overridden by `system/streams.yaml` [#2450](https://github.com/getgrav/grav/issues/2450)
+    * Fixed `ERR_TOO_MANY_REDIRECTS` with HTTPS = 'On' [#3155](https://github.com/getgrav/grav/issues/3155)
+    * Fixed page collection pagination not behaving as it did in Grav 1.6
+
+# v1.7.0-rc.20
+## 12/15/2020
+
+1. [](#new)
+    * Update phpstan to version 0.12
+    * Auto-Escape enabled by default. Manually enable **Twig Compatibility** and disable **Auto-Escape** to use the old setting.
+    * Updated unit tests to use codeception 4.1
+    * Added support for setting `GRAV_ENVIRONMENT` by using environment variable or a constant
+    * Added support for setting `GRAV_SETUP_PATH` by using environment variable (constant already worked)
+    * Added support for setting `GRAV_ENVIRONMENTS_PATH` by using environment variable or a constant
+    * Added support for setting `GRAV_ENVIRONMENT_PATH` by using environment variable or a constant
+1. [](#improved)
+    * Improved `bin/grav install` command
+1. [](#bugfix)
+    * Fixed potential error when upgrading Grav
+    * Fixed broken list in `bin/gpm index` [#3092](https://github.com/getgrav/grav/issues/3092)
+    * Fixed CLI/GPM command failures returning 0 (success) value [#3017](https://github.com/getgrav/grav/issues/3017)
+    * Fixed unimplemented `PageObject::getOriginal()` call [#3098](https://github.com/getgrav/grav/issues/3098)
+    * Fixed `Argument 1 passed to Grav\Common\User\DataUser\User::filterUsername() must be of the type string` [#3101](https://github.com/getgrav/grav/issues/3101)
+    * Fixed broken check if php exif module is enabled in `ImageFile::fixOrientation()`
+    * Fixed `StaticResizeTrait::resize()` bad image height/width attributes if `null` values are passed to the method
+    * Fixed twig script/style tag `{% script 'file.js' at 'bottom' %}`, replaces broken `in` operator [#3084](https://github.com/getgrav/grav/issues/3084)
+    * Fixed dropped query params when `?` is preceded with `/` [#2964](https://github.com/getgrav/grav/issues/2964)
+
+# v1.7.0-rc.19
+## 12/02/2020
+
+1. [](#bugfix)
+    * Updated composer libraries with latest Toolbox v1.5.6 that contains critical fixes
+
+# v1.7.0-rc.18
+## 12/02/2020
+
+1. [](#new)
+    * Set minimum requirements to **PHP 7.3.6**
+    * Updated Clockwork to v5.0
+    * Added `FlexDirectoryInterface` interface
+    * Renamed `PageCollectionInterface::nonModular()` into `PageCollectionInterface::pages()` and deprecated the old method
+    * Renamed `PageCollectionInterface::modular()` into `PageCollectionInterface::modules()` and deprecated the old method'
+    * Upgraded `bin/composer.phar` to `2.0.2` which is all new and much faster
+    * Added search option `same_as` to Flex Objects
+    * Added PHP 8 compatible `function_exists()`: `Utils::functionExists()`
+    * New sites have `compatibility` features turned off by default, upgrading from older versions will keep the settings on
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Allow `JsonFormatter` options to be passed as a string
+    * Hide Flex Pages frontend configuration (not ready for production use)
+    * Improve Flex configuration: gather views together in blueprint
+    * Added XSS detection to all forms. See [documentation](https://learn.getgrav.org/17/forms/forms/form-options#xss-checks)
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Added support for having all sites / environments under `user/env` folder [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Added `FlexObject::refresh()` method to make sure object is up to date
+1. [](#bugfix)
+    * *Menu Visibility Requires Access* Security option setting wrong frontmatter [login#265](https://github.com/getgrav/grav-plugin-login/issues/265)
+    * Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031](https://github.com/getgrav/grav/issues/3031)
+    * Fixed media crashing on a bad image
+    * Fixed bug in collections where filter `type: false` did not work
+    * Fixed `print_r()` in twig
+    * Fixed sorting by groups in `Flex Users`
+    * Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958)
+    * Fixed plugins getting initialized multiple times (by CLI commands for example)
+    * Fixed `header.admin.children_display_order` in Flex Pages to work just like with regular pages
+    * Fixed `Utils::isFunctionDisabled()` method if there are spaces in `disable_functions` [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed potential fatal error when creating flex index using cache [#3062](https://github.com/getgrav/grav/issues/3062)
+    * Fixed fatal error in `CompiledFile` if the cached version is broken
+    * Fixed updated media missing from media when editing Flex Object after page reload
+    * Fixed issue with `config-default@` breaking on set [#1972](https://github.com/getgrav/grav-plugin-admin/issues/1971)
+    * Escape titles in Flex pages list [flex-objects#84](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/84)
+    * Fixed Purge successful message only working in Scheduler but broken in CLI and Admin [#1935](https://github.com/getgrav/grav-plugin-admin/issues/1935)
+    * Fixed `system://` stream is causing issues in Admin, making Media tab to disappear and possibly causing other issues [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed CLI self-upgrade from Grav 1.6 [#3079](https://github.com/getgrav/grav/issues/3079)
+    * Fixed `bin/grav yamllinter -a` and `-f` not following symlinks [#3080](https://github.com/getgrav/grav/issues/3080)
+    * Fixed `|safe_email` filter to return safe and escaped UTF-8 HTML [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed exception in CLI GPM and backup commands when `php-zip` is not enabled [#3075](https://github.com/getgrav/grav/issues/3075)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fixed Flex and Page ordering to be natural and case insensitive [flex-objects#87](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/87)
+    * Fixed plugin/theme priority ordering to be numeric
+
+# v1.7.0-rc.17
+## 10/07/2020
+
+1. [](#new)
+    * Added a `Uri::getAllHeaders()` compatibility function
+1. [](#improved)
+    * Fall back through various templates scenarios if they don't exist in theme to avoid unhelpful error.
+    * Added default templates for `external.html.twig`, `default.html.twig`, and `modular.html.twig`
+    * Improve Media classes
+    * _POTENTIAL BREAKING CHANGE:_ Added reload argument to `FlexStorageInterface::getMetaData()`
+1. [](#bugfix)
+    * Fixed `Security::sanitizeSVG()` creating an empty file if SVG file cannot be parsed
+    * Fixed infinite loop in blueprints with `extend@` to a parent stream
+    * Added missing `Stream::create()` method
+    * Added missing `onBlueprintCreated` event for Flex Pages
+    * Fixed `onBlueprintCreated` firing multiple times recursively
+    * Fixed media upload failing with custom folders
+    * Fixed `unset()` in `ObjectProperty` class
+    * Fixed `FlexObject::freeMedia()` method causing media to become null
+    * Fixed bug in `Flex Form` making it impossible to set nested values
+    * Fixed `Flex User` avatar when using folder storage, also allow multiple images
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
+# v1.7.0-rc.16
+## 09/01/2020
+
+1. [](#new)
+    * Added a new `svg_image()` twig function to make it easier to 'include' SVG source in Twig
+    * Added a helper `Utils::fullPath()` to get the full path to a file be it stream, relative, etc.
+1. [](#improved)
+    * Added `themes` to cached blueprints and configuration
+1. [](#bugfix)
+    * Fixed `Flex Pages` issue with `getRoute()` returning path with language prefix for default language if set not to do that
+    * Fixed `Flex Pages` bug where reordering pages causes page content to disappear if default language uses wrong extension (`.md` vs `.en.md`)
+    * Fixed `Flex Pages` bug where `onAdminSave` passes page as `$event['page']` instead of `$event['object']` [#2995](https://github.com/getgrav/grav/issues/2995)
+    * Fixed `Flex Pages` bug where changing a modular page template added duplicate file [admin#1899](https://github.com/getgrav/grav-plugin-admin/issues/1899)
+    * Fixed `Flex Pages` bug where renaming slug causes bad ordering range after save [#2997](https://github.com/getgrav/grav/issues/2997)
+
+# v1.7.0-rc.15
+## 07/22/2020
+
+1. [](#bugfix)
+    * Fixed Flex index file caching [#2962](https://github.com/getgrav/grav/issues/2962)
+    * Fixed various issues with Exif data reading and images being incorrectly rotated [#1923](https://github.com/getgrav/grav-plugin-admin/issues/1923)
+
+# v1.7.0-rc.14
+## 07/09/2020
+
+1. [](#improved)
+    * Added ability to `noprocess` specific items only in Link/Image Excerpts, e.g. `http://foo.com/page?id=foo&target=_blank&noprocess=id` [#2954](https://github.com/getgrav/grav/pull/2954)
+1. [](#bugfix)
+    * Regression: Default language fix broke `Language::getLanguageURLPrefix()` and `Language::isIncludeDefaultLanguage()` methods when not using multi-language
+    * Reverted `Language::getDefault()` and `Language::getLanguage()` to return false again because of plugin compatibility (updated docblocks)
+    * Fixed UTF-8 issue in `Excerpts::getExcerptsFromHtml`
+    * Fixed some compatibility issues with recent Changes to `Assets` handling
+    * Fixed issue with `CSS_IMPORTS_REGEX` breaking with complex URLs [#2958](https://github.com/getgrav/grav/issues/2958)
+    * Moved duplicated `CSS_IMPORT_REGEX` to local variable in `AssetUtilsTrait::moveImports()`
+    * Fixed page media only accepting images [#2943](https://github.com/getgrav/grav/issues/2943)
+
+# v1.7.0-rc.13
+## 07/01/2020
+
+1. [](#new)
+    * Added support for uploading and deleting images directly in `Media`
+    * Added new `onAfterCacheClear` event
+1. [](#improved)
+    * Improved `CvsFormatter` to attempt to encode non-scalar variables into JSON before giving up
+    * Moved image loading into its own trait to be used by images+static images
+    * Adjusted asset types to enable extension of assets in class [#2937](https://github.com/getgrav/grav/pull/2937)
+    * Composer update for vendor library updates
+    * Updated bundled `composer.phar` to `2.0.0-dev`
+1. [](#bugfix)
+    * Fixed `MediaUploadTrait::copyUploadedFile()` not adding uploaded media to the collection
+    * Fixed regression in saving media to a new Flex Object [admin#1867](https://github.com/getgrav/grav-plugin-admin/issues/1867)
+    * Fixed `Trying to get property 'username' of non-object` error in Flex [flex-objects#62](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/62)
+    * Fixed retina images not working in Flex [flex-objects#64](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/64)
+    * Fixed plugin initialization in CLI
+    * Fixed broken logic in `Page::topParent()` when dealing with first-level pages
+    * Fixed broken `Flex Page` authorization for groups
+    * Fixed missing `onAdminSave` and `onAdminAfterSave` events when using `Flex Pages` and `Flex Users` [flex-objects#58](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/58)
+    * Fixed new `User Group` allowing bad group name to be saved [admin#1917](https://github.com/getgrav/grav-plugin-admin/issues/1917)
+    * Fixed `Language::getDefault()` returning false and not 'en'
+    * Fixed non-text links in `Excerpts::getExcerptFromHtml`
+    * Fixed CLI commands not properly intializing Plugins so events can fire
+
+# v1.7.0-rc.12
+## 06/08/2020
+
+1. [](#improved)
+    * Changed `Folder::hasChildren` to `Folder::countChildren`
+    * Added `Content Editor` option to user account blueprint
+1. [](#bugfix)
+    * Fixed new `Flex Page` not having correct form fields for the page type
+    * Fixed new `Flex User` erroring out on save (thanks @mikebi42)
+    * Fixed `Flex Object` request cache clear when saving object
+    * Fixed blueprint value filtering in lists [#2923](https://github.com/getgrav/grav/issues/2923)
+    * Fixed blueprint for `system.pages.hide_empty_folders` [#1925](https://github.com/getgrav/grav/issues/2925)
+    * Fixed file field in `Flex Objects` (use `Grav\Common\Flex\Types\GenericObject` instead of `FlexObject`) [flex-objects#37](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/37)
+    * Fixed saving nested file fields in `Flex Objects` [flex-objects#34](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/34)
+    * JSON Route of homepage with no ‘route’ set is valid [form#425](https://github.com/getgrav/grav-plugin-form/issues/425)
+
+# v1.7.0-rc.11
+## 05/14/2020
+
+1. [](#new)
+    * Added support for native `loading=lazy` attributes on images.  Can be set in `system.images.defaults` or per md image with `?loading=lazy` [#2910](https://github.com/getgrav/grav/issues/2910)
+1. [](#improved)
+    * Added `PageCollection::all()` to mimic Pages class
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Improved docblocks
+    * Fixed some phpstan issues
+    * Tighten vendor requirements
+1. [](#bugfix)
+    * Fix for uppercase image extensions
+    * Fix for `&` errors in HTML when passed to `Excerpts.php`
+
+# v1.7.0-rc.10
+## 04/30/2020
+
+1. [](#new)
+    * Changed `Response::get()` used by **GPM/Admin** to use [Symfony HttpClient v4.4](https://symfony.com/doc/current/components/http_client.html) (`composer install --nodev` required for Git installations)
+    * Added new `Excerpts::processLinkHtml()` method
+1. [](#bugfix)
+    * Fixed `Flex Pages` admin with PHP `intl` extension enabled when using custom page order
+    * Fixed saving non-numeric-prefix `Flex Page` changing to numeric-prefix [flex-objects#56](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/56)
+    * Copying `Flex Page` in admin does nothing [flex-objects#55](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/55)
+    * Force GPM progress to be between 0-100%
+
+# v1.7.0-rc.9
+## 04/27/2020
+
+1. [](#new)
+    * Support for `webp` image format in Page Media [#1168](https://github.com/getgrav/grav/issues/1168)
+    * Added `Route::getBase()` method
+1. [](#improved)
+    * Support symlinks when saving `File`
+1. [](#bugfix)
+    * Fixed flex objects with integer keys not working [#2863](https://github.com/getgrav/grav/issues/2863)
+    * Fixed `Pages::instances()` returning null values when using `Flex Pages` [#2889](https://github.com/getgrav/grav/issues/2889)
+    * Fixed Flex Page parent `header.admin.children_display_order` setting being ignored in Admin [#2881](https://github.com/getgrav/grav/issues/2881)
+    * Implemented missing Flex `$pageCollection->batch()` and `$pageCollection->order()` methods
+    * Fixed user avatar creation for new `Flex Users` when using folder storage
+    * Fixed `Trying to access array offset on value of type null` PHP 7.4 error in `Plugin.php`
+    * Fixed Gregwar Image library using `.jpeg` for cached images, rather use `.jpg`
+    * Fixed `Flex Pages` with `00.home` page not having ordering set
+    * Fixed `Flex Pages` not updating empty content on save [#2890](https://github.com/getgrav/grav/issues/2890)
+    * Fixed creating new Flex User with file storage
+    * Fixed saving new `Flex Object` with custom key
+    * Fixed broken `Plugin::config()` method
+
+# v1.7.0-rc.8
+## 03/19/2020
+
+1. [](#new)
+    * Added `MediaTrait::freeMedia()` method to free media (and memory)
+    * Added `Folder::hasChildren()` method to determine if a folder has child folders
+1. [](#improved)
+    * Save memory when updating large flex indexes
+    * Better `Content-Encoding` handling in Apache when content compression is disabled [#2619](https://github.com/getgrav/grav/issues/2619)
+1. [](#bugfix)
+    * Fixed creating new `Flex User` when folder storage has been selected
+    * Fixed some bugs in Flex root page methods
+    * Fixed bad default redirect code in `ControllerResponseTrait::createRedirectResponse()`
+    * Fixed issue with PHP `HTTP_X_HTTP_METHOD_OVERRIDE` [#2847](https://github.com/getgrav/grav/issues/2847)
+    * Fixed numeric usernames not working in `Flex Users`
+    * Implemented missing Flex `$page->move()` method
+
+# v1.7.0-rc.7
+## 03/05/2020
+
+1. [](#new)
+    * Added `Session::regenerateId()` method to properly prevent session fixation issues
+    * Added configuration option `system.strict_mode.blueprint_compat` to maintain old `validation: strict` behavior [#1273](https://github.com/getgrav/grav/issues/1273)
+1. [](#improved)
+    * Improved Flex events
+    * Updated CLI commands to use the new methods to initialize Grav
+1. [](#bugfix)
+    * Fixed Flex Pages having broken `isFirst()`, `isLast()`, `prevSibling()`, `nextSibling()` and `adjacentSibling()`
+    * Fixed broken ordering sometimes when saving/moving visible `Flex Page` [#2837](https://github.com/getgrav/grav/issues/2837)
+    * Fixed ordering being lost when saving modular `Flex Page`
+    * Fixed `validation: strict` not working in blueprints (see `system.strict_mode.blueprint_compat` setting) [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Blueprint::extend()` and `Blueprint::embed()` not initializing dynamic properties
+    * Fixed fatal error on storing flex flash using new object without a key
+    * Regression: Fixed unchecking toggleable having no effect in Flex forms
+    * Fixed changing page template in Flex Pages [#2828](https://github.com/getgrav/grav/issues/2828)
+
+# v1.7.0-rc.6
+## 02/11/2020
+
+1. [](#new)
+    * Plugins & Themes: Call `$plugin->autoload()` and `$theme->autoload()` automatically when object gets initialized
+    * CLI: Added `$grav->initializeCli()` method
+    * Flex Directory: Implemented customizable configuration
+    * Flex Storages: Added support for renaming directory entries
+1. [](#improved)
+    * Vendor updates to latest
+1. [](#bugfix)
+    * Regression: Fixed fatal error in blueprints [#2811](https://github.com/getgrav/grav/issues/2811)
+    * Regression: Fixed bad method call in FlexDirectory::getAuthorizeRule()
+    * Regression: Fixed fatal error in admin if the site has custom permissions in `onAdminRegisterPermissions`
+    * Regression: Fixed flex user index with folder storage
+    * Regression: Fixed fatal error in `bin/plugin` command
+    * Fixed `FlexObject::triggerEvent()` not emitting events [#2816](https://github.com/getgrav/grav/issues/2816)
+    * Grav 1.7: Fixed saving Flex configuration with ignored values becoming null
+    * Grav 1.7: Fixed `bin/plugin` initialization
+    * Grav 1.7: Fixed Flex Page cache key not taking account active language
+
+# v1.7.0-rc.5
+## 02/03/2020
+
+1. [](#bugfix)
+    * Regression: Flex not working in PHP 7.2 or older
+    * Fixed creating first user from admin not clearing Flex User directory cache [#2809](https://github.com/getgrav/grav/issues/2809)
+    * Fixed Flex Pages allowing root page to be deleted
+
+# v1.7.0-rc.4
+## 02/03/2020
+
+1. [](#new)
+    * _POTENTIAL BREAKING CHANGE:_ Upgraded Parsedown to 1.7 for Parsedown-Extra 0.8. Plugins that extend Parsedown may need a fix to render as HTML
+    * Added `$grav['flex']` to access all registered Flex Directories
+    * Added `$grav->dispatchEvent()` method for PSR-14 events
+    * Added `FlexRegisterEvent` which triggers when `$grav['flex']` is being accessed the first time
+    * Added Flex cache configuration options
+    * Added `PluginsLoadedEvent` which triggers after plugins have been loaded but not yet initialized
+    * Added `SessionStartEvent` which triggers when session is started
+    * Added `PermissionsRegisterEvent` which triggers when `$grav['permissions']` is being accessed the first time
+    * Added support for Flex Directory specific configuration
+    * Added support for more advanced ACL
+    * Added `flatten_array` filter to form field validation
+    * Added support for `security@: or: [admin.super, admin.pages]` in blueprints (nested AND/OR mode support)
+1. [](#improved)
+    * Blueprint validation: Added `validate: value_type: bool|int|float|string|trim` to `array` to filter all the values inside the array
+    * Twig `url()` takes now third parameter (`true`) to return URL on non-existing file instead of returning false
+1. [](#bugfix)
+    * Grav 1.7: Fixed blueprint loading issues [#2782](https://github.com/getgrav/grav/issues/2782)
+    * Fixed PHP 7.4 compatibility issue with `Stream`
+    * Fixed new `Flex Users` being stored with wrong filename, login issues [#2785](https://github.com/getgrav/grav/issues/2785)
+    * Fixed `ignore_empty: true` not removing empty values in blueprint filtering
+    * Fixed `{{ false|string }}` twig to return '0' instead of ''
+    * Fixed twig `url()` failing if stream has extra slash in it (e.g. `user:///data`)
+    * Fixed `Blueprint::filter()` returning null instead of array if there is nothing to return
+    * Fixed `Cannot use a scalar value as an array` error in `Utils::arrayUnflattenDotNotation()`, ignore nested structure instead
+    * Fixed `Route` instance in multi-site setups
+    * Fixed `system.translations: false` breaking `Inflector` methods
+    * Fixed filtering ignored (eg. `security@: admin.super`) fields causing `Flex Objects` to lose data on save
+    * Grav 1.7: Fixed `Flex Pages` unserialize issues if Flex-Objects Plugin has not been installed
+    * Grav 1.7: Require Flex-Objects Plugin to edit Flex Accounts
+    * Grav 1.7: Fixed bad result on testing `isPage()` when using Flex Pages
+
+# v1.7.0-rc.3
+## 01/02/2020
+
+1. [](#new)
+    * Added root page support for `Flex Pages`
+1. [](#improved)
+    * Twig filter `|yaml_serialize`: added support for `JsonSerializable` objects and other array-like objects
+    * Added support for returning Flex Page specific permissions for admin and testing
+    * Updated copyright dates to `2020`
+    * Various vendor updates
+1. [](#bugfix)
+    * Grav 1.7: Fixed error on page initialization [#2753](https://github.com/getgrav/grav/issues/2753)
+    * Fixed checking ACL for another user (who is not currently logged in) in a Flex Object or Directory
+    * Fixed bug in Windows where `Filesystem::dirname()` returns backslashes
+    * Fixed Flex object issues in Windows [#2773](https://github.com/getgrav/grav/issues/2773)
+
+# v1.7.0-rc.2
+## 12/04/2019
+
+1. [](#new)
+    * Updated Symfony Components to 4.4
+    * Added support for page specific CRUD permissions (`Flex Pages` only)
+    * Added new `-r <job-id>` option for Scheduler CLI command to force-run a job [#2720](https://github.com/getgrav/grav/issues/2720)
+    * Added `Utils::isAssoc()` and `Utils::isNegative()` helper methods
+    * Changed `UserInterface::authorize()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Changed `FlexAuthorizeInterface::isAuthorized()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Moved all Flex type classes under `Grav\Common\Flex`
+    * DEPRECATED `Grav\Common\User\Group` in favor of `$grav['user_groups']`, which contains Flex UserGroup collection
+    * DEPRECATED `$page->modular()` in favor of `$page->isModule()` for better readability
+    * Fixed phpstan issues in all code up to level 3
+1. [](#improved)
+    * Improved twig `|array` filter to work with iterators and objects with `toArray()` method
+    * Updated Flex `SimpleStorage` code to feature match the other storages
+    * Improved user and group ACL to support deny permissions (`Flex Users` only)
+    * Improved twig `authorize()` function to work better with nested rule parameters
+    * Output the current username that Scheduler is using if crontab not setup
+    * Translations: rename MODULAR to MODULE everywhere
+    * Optimized `Flex Pages` collection filtering
+    * Frontend optimizations for `Flex Pages`
+1. [](#bugfix)
+    * Regression: Fixed Grav update bug [#2722](https://github.com/getgrav/grav/issues/2722)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Grav 1.7: Reverted `$object->getStorageKey()` interface as it was not a good idea, added `getMasterKey()` for pages
+    * Grav 1.7: Fixed logged in user being able to delete his own account from admin account manager
+
+# v1.7.0-rc.1
+## 11/06/2019
+
+1. [](#new)
+    * Added `Flex Pages` to Grav core and removed Flex Objects plugin dependency
+    * Added `Utils::simpleTemplate()` method for very simple variable templating
+    * Added `array_diff()` twig function
+    * Added `template_from_string()` twig function
+    * Updated Symfony Components to 4.3
+1. [](#improved)
+    * Improved `Scheduler` cron command check and more useful CLI information
+    * Improved `Flex Users`: obey blueprints and allow Flex to be used in admin only
+    * Improved `Flex` to support custom site template paths
+    * Changed Twig `{% cache %}` tag to not need unique key, and `lifetime` is now optional
+    * Added mime support for file formatters
+    * Updated built-in `composer.phar` to latest `1.9.0`
+    * Updated vendor libraries
+    * Use `Symfony EventDispatcher` directly and not rockettheme/toolbox wrapper
+1. [](#bugfix)
+    * Fixed exception caused by missing template type based on `Accept:` header [#2705](https://github.com/getgrav/grav/issues/2705)
+    * Fixed `Page::untranslatedLanguages()` not being symmetrical to `Page::translatedLanguages()`
+    * Fixed `Flex Pages` not calling `onPageProcessed` event when cached
+    * Fixed phpstan issues in Framework up to level 7
+    * Fixed issue with duplicate configuration settings in Flex Directory
+    * Fixed fatal error if there are numeric folders in `Flex Pages`
+    * Fixed error on missing `Flex` templates in if `Flex Objects` plugin isn't installed
+    * Fixed `PageTranslateTrait::getAllLanguages()` and `getAllLanguages()` to include default language
+    * Fixed multi-language saving issues with default language in `Flex Pages`
+    * Selfupgrade CLI: Fixed broken selfupgrade assets reference [#2681](https://github.com/getgrav/grav/issues/2681)
+    * Grav 1.7: Fixed PHP 7.1 compatibility issues
+    * Grav 1.7: Fixed fatal error in multi-site setups
+    * Grav 1.7: Fixed `Flex Pages` routing if using translated slugs or `system.hide_in_urls` setting
+    * Grav 1.7: Fixed bug where Flex index file couldn't be disabled
+
+# v1.7.0-beta.10
+## 10/03/2019
+
+1. [](#improved)
+    * Flex: Removed extra exists check when creating object (messes up "non-existing" pages)
+    * Support customizable null character replacement in `CSVFormatter::decode()`
+1. [](#bugfix)
+    * Fixed wrong Grav param separator when using `Route` class
+    * Fixed Flex User Avatar not fully backwards compatible with old user
+    * Grav 1.7: Fixed prev/next page missing pages if pagination was turned on in page header
+    * Grav 1.7: Reverted setting language for every page during initialization
+    * Grav 1.7: Fixed numeric language inconsistencies
+
+# v1.7.0-beta.9
+## 09/26/2019
+
+1. [](#new)
+    * Added a new `{% cache %}` Twig tag eliminating need for `twigcache` extension.
+1. [](#improved)
+    * Improved blueprint initialization in Flex Objects (fixes content aware fields)
+    * Improved Flex FolderStorage class to better hide storage specific logic
+    * Exception will output a badly formatted line in `CsvFormatter::decode()`
+1. [](#bugfix)
+    * Fixed error when activating Flex Accounts in GRAV system configuration (PHP 7.1)
+    * Fixed Grav parameter handling in `RouteFactory::createFromString()`
+
+# v1.7.0-beta.8
+## 09/19/2019
+
+1. [](#new)
+    * Added new `Security::sanitizeSVG()` function
+    * Backwards compatibility break: `FlexStorageInterface::getStoragePath()` and `getMediaPath()` can now return null
+1. [](#improved)
+    * Several FlexObject loading improvements
+    * Added `bin/grav page-system-validator [-r|--record] [-c|--check]` to test Flex Pages
+    * Improved language support for `Route` class
+1. [](#bugfix)
+    * Regression: Fixed language fallback
+    * Regression: Fixed translations when language code is used for non-language purposes
+    * Regression: Allow SVG avatar images for users
+    * Fixed error in `Session::getFlashObject()` if Flex Form is being used
+    * Fixed broken Twig `dump()`
+    * Fixed `Page::modular()` and `Page::modularTwig()` returning `null` for folders and other non-initialized pages
+    * Fixed 404 error when you click to non-routable menu item with children: redirect to the first child instead
+    * Fixed wrong `Pages::dispatch()` calls (with redirect) when we really meant to call `Pages::find()`
+    * Fixed avatars not being displayed with flex users [#2431](https://github.com/getgrav/grav/issues/2431)
+    * Fixed initial Flex Object state when creating a new objects in a form
+
+# v1.7.0-beta.7
+## 08/30/2019
+
+1. [](#improved)
+    * Improved language support
+1. [](#bugfix)
+    * `FlexForm`: Fixed some compatibility issues with Form plugin
+
+# v1.7.0-beta.6
+## 08/29/2019
+
+1. [](#new)
+    * Added experimental support for `Flex Pages` (**Flex Objects** plugin required)
+1. [](#improved)
+    * Improved `bin/grav yamllinter` CLI command by adding an option to find YAML Linting issues from the whole site or custom folder
+    * Added support for not instantiating pages, useful to speed up tasks
+    * Greatly improved speed of loading Flex collections
+1. [](#bugfix)
+    * Fixed `$page->summary()` always striping HTML tags if the summary was set by `$page->setSummary()`
+    * Fixed `Flex->getObject()` when using Flex Key
+    * Grav 1.7: Fixed enabling PHP Debug Bar causes fatal error in Gantry [#2634](https://github.com/getgrav/grav/issues/2634)
+    * Grav 1.7: Fixed broken taxonomies [#2633](https://github.com/getgrav/grav/issues/2633)
+    * Grav 1.7: Fixed unpublished blog posts being displayed on the front-end [#2650](https://github.com/getgrav/grav/issues/2650)
+
+# v1.7.0-beta.5
+## 08/11/2019
+
+1. [](#new)
+    * Added a new `bin/grav server` CLI command to easily run Symfony or PHP built-in webservers
+    * Added `hasFlexFeature()` method to test if `FlexObject` or `FlexCollection` implements a given feature
+    * Added `getFlexFeatures()` method to return all features that `FlexObject` or `FlexCollection` implements
+    * DEPRECATED `FlexDirectory::update()` and `FlexDirectory::remove()`
+    * Added `FlexStorage::getMetaData()` to get updated object meta information for listed keys
+    * Added `Language::getPageExtensions()` to get full list of supported page language extensions
+    * Added `$grav->close()` method to properly terminate the request with a response
+    * Added `Pages::getCollection()` method
+1. [](#improved)
+    * Better support for Symfony local server `symfony server:start`
+    * Make `Route` objects immutable
+    * `FlexDirectory::getObject()` can now be called without any parameters to create a new object
+    * Flex objects no longer return temporary key if they do not have one; empty key is returned instead
+    * Updated vendor libraries
+    * Moved `collection()` and `evaluate()` logic from `Page` class into `Pages` class
+1. [](#bugfix)
+    * Fixed `Form` not to use deleted flash object until the end of the request fixing issues with reset
+    * Fixed `FlexForm` to allow multiple form instances with non-existing objects
+    * Fixed `FlexObject` search by using `key`
+    * Grav 1.7: Fixed clockwork messages with arrays and objects
+
+# v1.7.0-beta.4
+## 07/01/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.12 features, improvements & fixes
+    * Added new configuration option `system.debugger.censored` to hide potentially sensitive information
+    * Added new configuration option `system.languages.include_default_lang_file_extension` to keep default language in `.md` files if set to `false`
+    * Added configuration option to set fallback content languages individually for every language
+1. [](#improved)
+    * Updated Vendor libraries
+1. [](#bugfix)
+    * Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
+    * Fixed `Language::getFallbackPageExtensions()` to fall back only to default language instead of going through all languages
+    * Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
+
+# v1.7.0-beta.3
+## 06/24/2019
+
+1. [](#bugfix)
+    * Fixed Clockwork on Windows machines
+    * Fixed parent field issues on Windows machines
+    * Fixed unreliable Clockwork calls in sub-folders
+
+# v1.7.0-beta.2
+## 06/21/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.11 fixes
+1. [](#improved)
+    * Updated the Clockwork text
+
+# v1.7.0-beta.1
+## 06/14/2019
+
+1. [](#new)
+    * Added support for [Clockwork](https://underground.works/clockwork) developer tools (now default debugger)
+    * Added support for [Tideways XHProf](https://github.com/tideways/php-xhprof-extension) PHP Extension for profiling method calls
+    * Added Twig profiling for Clockwork debugger
+    * Added support for Twig 2.11 (compatible with Twig 1.40+)
+    * Optimization: Initialize debugbar only after the configuration has been loaded
+    * Optimization: Combine some early Grav processors into a single one
+
+# v1.6.31
+## 12/14/2020
+
+1. [](#improved)
+    * Allow all CSS and JS via `robots.txt` [#2006](https://github.com/getgrav/grav/issues/2006) [#3067](https://github.com/getgrav/grav/issues/3067)
+1. [](#bugfix)
+    * Fixed `pages` field escaping issues, needs admin update, too [admin#1990](https://github.com/getgrav/grav-plugin-admin/issues/1990)
+    * Fix `svg-image` issue with classes applied to all elements [#3068](https://github.com/getgrav/grav/issues/3068)
+
+# v1.6.30
+## 12/03/2020
+
+1. [](#bugfix)
+    * Rollback `samesite` cookie logic as it causes issues with PHP < 7.3 [#309](https://github.com/getgrav/grav/issues/3089)
+    * Fixed issue with `.travis.yml` due to GitHub API deprecated functionality
+
+# v1.6.29
+## 12/02/2020
+
+1. [](#new)
+    * Added basic support for `user/config/versions.yaml`
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Set `grav_cli` as referrer when using `Response` from CLI
+    * Add option for timeout in `self-upgrade` command [#3013](https://github.com/getgrav/grav/pull/3013)
+    * Allow to set SameSite from system.yaml [#3063](https://github.com/getgrav/grav/pull/3063)
+    * Update media.yaml with some MS Office mimetypes [#3070](https://github.com/getgrav/grav/pull/3070)
+1. [](#bugfix)
+    * Fixed hardcoded system folder in blueprints, config and language streams
+    * Added `.htaccess` rule to block attempts to use Twig in the request URL
+    * Fix compatibility with Symfony 4.2 and up. [#3048](https://github.com/getgrav/grav/pull/3048)
+    * Fix failing example custom shceduled job. [#3050](https://github.com/getgrav/grav/pull/3050)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fix uploads_dangerous_extensions checking [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Remove redundant prefixing of `.` to extension [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Check exact extension in checkFilename utility [#3061](https://github.com/getgrav/grav/pull/3061)
+
+# v1.6.28
+## 10/07/2020
+
+1. [](#new)
+    * Back-ported twig `{% cache %}` tag from Grav 1.7
+    * Back-ported `Utils::fullPath()` helper function from Grav 1.7
+    * Back-ported `{{ svg_image() }}` Twig function from Grav 1.7
+    * Back-ported `Folder::countChildren()` function from Grav 1.7
+1. [](#improved)
+    * Use new `{{ theme_var() }}` enhanced logic from Grav 1.7
+    * Improved `Excerpts` class with fixes and functionality from Grav 1.7
+    * Ensure `onBlueprintCreated()` is initialized first
+    * Do not cache default `404` error page
+    * Composer update of vendor libraries
+    * Switched `Caddyfile` to use new Caddy2 syntax + improved usability
+1. [](#bugfix)
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
 # v1.6.27
 ## 09/01/2020
 

CODE_OF_CONDUCT.md

@@ -1,46 +1,133 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@getgrav.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Grav
+Copyright (c) 2021 Grav
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@
 [![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
 [![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://chat.getgrav.org)
- [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
+ [![PHP Tests](https://github.com/getgrav/grav/workflows/PHP%20Tests/badge.svg?branch=develop)](https://github.com/getgrav/grav/actions?query=workflow%3A%22PHP+Tests%22) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
@@ -21,9 +21,13 @@ The underlying architecture of Grav is designed to use well-established and _bes
 
 # Requirements
 
-- PHP 7.1.3 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
+- PHP 7.3.6 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
 - Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
 
+# Documentation
+
+The full documentation can be found from [learn.getgrav.org](https://learn.getgrav.org).
+
 # QuickStart
 
 These are the options to get Grav:
@@ -84,6 +88,11 @@ To update plugins and themes:
 $ bin/gpm update
 ```
 
+## Upgrading from older version
+
+* [Upgrading to Grav 1.7](https://learn.getgrav.org/16/advanced/grav-development/grav-17-upgrade-guide)
+* [Upgrading to Grav 1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-16-upgrade-guide)
+* [Upgrading from Grav <1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-15-upgrade-guide)
 
 # Contributing
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
@@ -128,7 +137,14 @@ See [LICENSE](LICENSE.txt)
 
 # Running Tests
 
-First install the dev dependencies by running `composer update` from the Grav root.
+First install the dev dependencies by running `composer install` from the Grav root.
+
 Then `composer test` will run the Unit Tests, which should be always executed successfully on any site.
 Windows users should use the `composer test-windows` command.
 You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`
+
+To run phpstan tests, you should run:
+
+* `composer phpstan` for global tests
+* `composer phpstan-framework` for more strict tests
+* `composer phpstan-plugins` to test all installed plugins

SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+We are focusing our security updates on the following versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.7.x   | :white_check_mark: |
+| 1.6.x   | :warning:          |
+| < 1.6   | :x:                |
+
+## :warning: Versions
+
+Versions with :warning: will be supported for security issues, however you won't be able to update to them, you will need to manually update through the [`direct-install` command](https://learn.getgrav.org/17/admin-panel/tools).
+
+If you cannot update to the latest stable version available because, for example, your server does not meet the minimum PHP requirements, you can manually install a previous version by downloading the package from our Releases directory (https://github.com/getgrav/grav/releases).
+
+## Reporting a Vulnerability
+
+Please contact security@getgrav.org with a detailed explaination of the security issue found and we will work with you to get it resolved as fast as possible.

assets/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

bin/gpm

@@ -1,9 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
 use Grav\Common\Grav;
+use Grav\Console\Application\GpmApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -43,37 +48,7 @@ if (!function_exists('curl_version')) {
     exit('FATAL: GPM requires PHP Curl module to be installed');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
-
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
-$grav['config']->init();
-$grav['uri']->init();
-$grav['accounts'];
-
-$app = new Application('Grav Package Manager', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Gpm\IndexCommand(),
-    new \Grav\Console\Gpm\VersionCommand(),
-    new \Grav\Console\Gpm\InfoCommand(),
-    new \Grav\Console\Gpm\InstallCommand(),
-    new \Grav\Console\Gpm\UninstallCommand(),
-    new \Grav\Console\Gpm\UpdateCommand(),
-    new \Grav\Console\Gpm\SelfupgradeCommand(),
-    new \Grav\Console\Gpm\DirectInstallCommand(),
-));
 
+$app = new GpmApplication('Grav Package Manager', GRAV_VERSION);
 $app->run();

bin/grav

@@ -1,10 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
 use Grav\Common\Grav;
-use League\CLImate\CLImate;
-use Symfony\Component\Console\Application;
+use Grav\Console\Application\GravApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -36,39 +40,11 @@ if (!\extension_loaded('mbstring')) {
 @ini_set('default_charset', 'UTF-8');
 mb_internal_encoding('UTF-8');
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
-
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
 
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Cli\InstallCommand(),
-    new \Grav\Console\Cli\ComposerCommand(),
-    new \Grav\Console\Cli\SandboxCommand(),
-    new \Grav\Console\Cli\CleanCommand(),
-    new \Grav\Console\Cli\ClearCacheCommand(),
-    new \Grav\Console\Cli\BackupCommand(),
-    new \Grav\Console\Cli\NewProjectCommand(),
-    new \Grav\Console\Cli\SchedulerCommand(),
-    new \Grav\Console\Cli\SecurityCommand(),
-    new \Grav\Console\Cli\LogViewerCommand(),
-    new \Grav\Console\Cli\YamlLinterCommand(),
-));
+$app = new GravApplication('Grav CLI Application', GRAV_VERSION);
 $app->run();

bin/plugin

@@ -1,13 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Grav\Common\Grav;
-use Grav\Common\Filesystem\Folder;
+use Grav\Console\Application\PluginApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -43,110 +44,8 @@ if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-$environment = $climate->arguments->get('environment');
-
+// Bootstrap Grav container.
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-$grav->initializeCli();
-
-$app     = new Application('Grav Plugins Commands', GRAV_VERSION);
-$pattern = '([A-Z]\w+Command\.php)';
-
-// get arguments and  strip the application name
-if (null === $argv) {
-    $argv = $_SERVER['argv'];
-}
-
-$bin  = array_shift($argv);
-$name = array_shift($argv);
-$argv = array_merge([$bin], $argv);
-
-$input = new ArgvInput($argv);
-
-/** @var \Grav\Common\Data\Data $plugin */
-$plugin = $grav['plugins']->get($name);
-
-$output = new ConsoleOutput();
-$output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
-$output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
-
-if (!$name) {
-    $output->writeln('');
-    $output->writeln('<red>Usage:</red>');
-    $output->writeln("  {$bin} [slug] [command] [arguments]");
-    $output->writeln('');
-    $output->writeln('<red>Example:</red>');
-    $output->writeln("  {$bin} error log -l 1 --trace");
-    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
-
-    $total = 0;
-    if (count($list)) {
-        $available = [];
-        $output->writeln('');
-        $output->writeln('<red>Plugins with CLI available:</red>');
-        foreach ($list as $index => $entry) {
-            $split = explode('/', $entry);
-            $entry = array_shift($split);
-            $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
-            $total = str_pad($total++ + 1, 2, '0', STR_PAD_LEFT);
-            if (\in_array($entry, $available, true)) {
-                $total--;
-                continue;
-            }
-
-            $available[] = $entry;
-            $commands_count = $index - $total + 1;
-            $output->writeln('  ' . $total . '. <red>' . str_pad($entry, 15) . "</red> <white>{$bin} {$entry} list</white>");
-        }
-    }
-
-    exit;
-} else {
-    if (is_null($plugin)) {
-        $output->writeln('');
-        $output->writeln("<red>$name plugin not found</red>");
-        die;
-    }
-
-    if (!$plugin->enabled) {
-        $output->writeln('');
-        $output->writeln("<red>$name not enabled</red>");
-        die;
-    }
-}
-
-if ($plugin === null) {
-    $output->writeln("<red>Grav Plugin <white>'{$name}'</white> is not installed</red>");
-    exit;
-}
-
-$path = 'plugins://' . $name . '/cli';
-
-try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
-} catch (\RuntimeException $e) {
-    $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
-    exit;
-}
-
-foreach ($commands as $command_path) {
-    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
-    require_once $full_path;
-
-    $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
-    $command = new $command_class();
-    $app->add($command);
-}
 
-$app->run($input);
+$app = new PluginApplication('Grav Plugins Commands', GRAV_VERSION);
+$app->run();

composer.json

@@ -12,55 +12,73 @@
     "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=7.1.3",
+        "php": "^7.3.6 || ^8.0",
         "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
         "ext-dom": "*",
-        "symfony/polyfill-iconv": "^1.9",
-        "symfony/polyfill-php72": "^1.9",
-        "symfony/polyfill-php73": "^1.9",
+        "ext-libxml": "*",
+        "symfony/polyfill-mbstring": "~1.20",
+        "symfony/polyfill-iconv": "^1.20",
+        "symfony/polyfill-php74": "^1.20",
+        "symfony/polyfill-php80": "^1.20",
         "psr/simple-cache": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "kodus/psr7-server": "*",
-        "nyholm/psr7": "^1.0",
-        "twig/twig": "~1.40",
-        "symfony/yaml": "~4.2.0",
-        "symfony/console": "~4.2.0",
-        "symfony/event-dispatcher": "~4.2.0",
-        "symfony/var-dumper": "~4.2.0",
-        "symfony/process": "~4.2.0",
-        "doctrine/cache": "^1.8",
-        "doctrine/collections": "^1.5",
-        "guzzlehttp/psr7": "^1.4",
-        "filp/whoops": "~2.2",
+        "psr/container": "~1.0.0",
+        "nyholm/psr7-server": "^1.0",
+        "nyholm/psr7": "^1.3",
+        "twig/twig": "~1.44",
+        "erusev/parsedown": "^1.7",
+        "erusev/parsedown-extra": "~0.8",
+        "symfony/contracts": "~1.1",
+        "symfony/yaml": "~4.4",
+        "symfony/console": "~4.4",
+        "symfony/event-dispatcher": "~4.4",
+        "symfony/var-dumper": "~4.4",
+        "symfony/process": "~4.4",
+        "doctrine/cache": "^1.10",
+        "doctrine/collections": "^1.6",
+        "guzzlehttp/psr7": "^1.7",
+        "filp/whoops": "~2.9",
         "matthiasmullie/minify": "^1.3",
-        "monolog/monolog": "~1.0",
-        "gregwar/image": "2.*",
-        "donatj/phpuseragentparser": "~1.0",
-        "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "~1.4.0",
-        "maximebf/debugbar": "~1.15",
-        "league/climate": "^3.4",
+        "monolog/monolog": "~1.25",
+        "getgrav/image": "^3.0",
+        "getgrav/cache": "^2.0",
+        "donatj/phpuseragentparser": "~1.1",
+        "pimple/pimple": "~3.3.0",
+        "rockettheme/toolbox": "~1.5",
+        "maximebf/debugbar": "~1.16",
+        "league/climate": "^3.6",
         "antoligy/dom-string-iterators": "^1.0",
-        "miljar/php-exif": "^0.6.4",
-        "composer/ca-bundle": "^1.0",
+        "miljar/php-exif": "^0.6",
+        "composer/ca-bundle": "^1.2",
         "dragonmantank/cron-expression": "^1.2",
         "phive/twig-extensions-deferred": "^1.0",
-        "willdurand/negotiation": "2.x-dev"
+        "willdurand/negotiation": "^3.0",
+        "itsgoingd/clockwork": "^5.0",
+        "enshrined/svg-sanitize": "~0.13",
+        "symfony/http-client": "^4.4",
+        "composer/semver": "^1.4"
     },
     "require-dev": {
-        "codeception/codeception": "^2.4",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-deprecation-rules": "^0.11.0",
-        "phpunit/php-code-coverage": "~6.0",
-        "fzaninotto/faker": "^1.8",
-        "victorjonsson/markdowndocs": "dev-master"
+        "codeception/codeception": "^4.1",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
+        "phpunit/php-code-coverage": "~9.2",
+        "getgrav/markdowndocs": "^2.0",
+        "codeception/module-asserts": "^1.3",
+        "codeception/module-phpbrowser": "^1.0",
+        "symfony/service-contracts": "*"
+    },
+    "replace": {
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*"
     },
     "suggest": {
+        "ext-mbstring": "Recommended for better performance",
+        "ext-iconv": "Recommended for better performance",
         "ext-zend-opcache": "Recommended for better performance",
         "ext-intl": "Recommended for multi-language sites",
         "ext-memcache": "Needed to support Memcache servers",
@@ -70,22 +88,15 @@
     "config": {
         "apcu-autoloader": true,
         "platform": {
-            "php": "7.1.3"
+            "php": "7.3.6"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
         },
         "files": [
-            "system/defines.php",
-            "system/aliases.php"
+            "system/defines.php"
         ]
     },
     "archive": {
@@ -94,12 +105,11 @@
         ]
     },
     "scripts": {
-        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
-        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
+        "api-17": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.17.md",
         "post-create-project-cmd": "bin/grav install",
-        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
-        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
-        "phpstan-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
+        "phpstan": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
+        "phpstan-plugins": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/plugins.neon --memory-limit=400M user/plugins",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },

index.php

@@ -3,21 +3,25 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav;
 
 \define('GRAV_REQUEST_TIME', microtime(true));
-\define('GRAV_PHP_MIN', '7.1.3');
+\define('GRAV_PHP_MIN', '7.3.6');
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
-if (PHP_SAPI === 'cli-server' && !isset($_SERVER['PHP_CLI_ROUTER'])) {
-    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+if (PHP_SAPI === 'cli-server') {
+    $symfony_server = stripos(getenv('_'), 'symfony') !== false || stripos($_SERVER['SERVER_SOFTWARE'], 'symfony
+') !== false;
+    if (!isset($_SERVER['PHP_CLI_ROUTER']) && !$symfony_server) {
+        die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    }
 }
 
 // Set timezone to default, falls back to system if php.ini not set

now.json

@@ -1,4 +1,4 @@
-    {
+{
   "version": 2,
   "builds": [{ "src": "*.php", "use": "@now/php" }]
 }

system/aliases.php

@@ -1,5 +0,0 @@
-<?php
-
-/** Moved from non-namespaced classes to Grav Framework */
-class_alias(Grav\Framework\Parsedown\Parsedown::class, '\Parsedown');
-class_alias(Grav\Framework\Parsedown\ParsedownExtra::class, '\ParsedownExtra');

system/assets/debugger.css

@@ -1,70 +0,0 @@
-div.phpdebugbar {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.phpdebugbar pre {
-    padding: 1rem;
-}
-
-.phpdebugbar div.phpdebugbar-header > div > * {
-    padding: 5px 15px;
-}
-
-.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * {
-    padding: 5px 8px;
-}
-
-.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn {
-    background-image: url(grav.png);
-}
-
-.phpdebugbar a.phpdebugbar-restore-btn {
-    width: 13px;
-}
-
-.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active {
-    background: #3DB9EC;
-    color: #fff;
-    margin-top: -1px;
-    padding-top: 6px;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar {
-    border-top: 1px solid #ddd;
-    padding-left: 5px;
-    padding-right: 2px;
-    padding-top: 2px;
-    background-color: #fafafa !important;
-    width: auto !important;
-    left: 0;
-    right: 0;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar input {
-    background: transparent !important;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
-
-}
-
-
-.phpdebugbar input[type=text] {
-    padding: 0;
-    display: inline;
-}
-
-.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 12px;
-}
-
-ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
-    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
-    top: 0;
-}
-
-.phpdebugbar pre, .phpdebugbar code {
-    margin: 0;
-    font-size: 14px;
-}

system/assets/debugger/clockwork.js

@@ -0,0 +1,3 @@
+/** Clockwork Debugger JS **/
+document.addEventListener("DOMContentLoaded",function () {
+    var e=document.createElement("div");e.appendChild(document.createElement("i")),e.className="clockwork-badge",document.body.appendChild(e)});

system/blueprints/config/scheduler.yaml

@@ -39,12 +39,13 @@ form:
             .command:
               type: text
               label: PLUGIN_ADMIN.COMMAND
-              placeholder: 'cd ~;ls -lah;'
+              placeholder: 'ls'
               validate:
                   required: true
             .args:
               type: text
               label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
+              placeholder: '-lah'
             .at:
               type: cron
               label: PLUGIN_ADMIN.SCHEDULER_RUNAT

system/blueprints/config/security.yaml

@@ -105,3 +105,15 @@ form:
             validate:
                 type: commalist
 
+
+        sanitize_svg:
+            type: toggle
+            label: PLUGIN_ADMIN.SANITIZE_SVG
+            help: PLUGIN_ADMIN.SANITIZE_SVG_HELP
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool

system/blueprints/config/system.yaml

@@ -1,1467 +1,1722 @@
 title: PLUGIN_ADMIN.SYSTEM
 
 form:
-    validation: loose
-    fields:
-
-        system_tabs:
-            type: tabs
-            classes: side-tabs
-
-            fields:
-                content:
-                    type: tab
-                    title: PLUGIN_ADMIN.CONTENT
-
-                    fields:
-                        content_section:
-                            type: section
-                            title: PLUGIN_ADMIN.CONTENT
-                            underline: true
-
-                        home.alias:
-                            type: pages
-                            size: large
-                            classes: fancy
-                            label: PLUGIN_ADMIN.HOME_PAGE
-                            show_all: false
-                            show_modular: false
-                            show_root: false
-                            show_slug: true
-                            help: PLUGIN_ADMIN.HOME_PAGE_HELP
-
-                        home.hide_in_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.HIDE_HOME_IN_URLS
-                            help: PLUGIN_ADMIN.HIDE_HOME_IN_URLS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.theme:
-                            type: themeselect
-                            classes: fancy
-                            selectize: true
-                            size: medium
-                            label: PLUGIN_ADMIN.DEFAULT_THEME
-                            help: PLUGIN_ADMIN.DEFAULT_THEME_HELP
-
-                        pages.process:
-                            type: checkboxes
-                            label: PLUGIN_ADMIN.PROCESS
-                            help: PLUGIN_ADMIN.PROCESS_HELP
-                            default: [markdown: true, twig: true]
-                            options:
-                                markdown: Markdown
-                                twig: Twig
-                            use: keys
-
-                        pages.types:
-                            type: array
-                            label: PLUGIN_ADMIN.PAGE_TYPES
-                            help: PLUGIN_ADMIN.PAGE_TYPES_HELP
-                            size: small
-                            default: ['html','htm','json','xml','txt','rss','atom']
-                            value_only: true
-
-                        timezone:
-                            type: select
-                            label: PLUGIN_ADMIN.TIMEZONE
-                            size: medium
-                            classes: fancy
-                            help: PLUGIN_ADMIN.TIMEZONE_HELP
-                            data-options@: '\Grav\Common\Utils::timezones'
-                            default: ''
-                            options:
-                                '': 'Default (Server Timezone)'
-
-                        pages.dateformat.default:
-                            type: select
-                            size: medium
-                            selectize:
-                                create: true
-                            label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
-                            help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
-                            placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
-                            data-options@: '\Grav\Common\Utils::dateFormats'
-                            validate:
-                                type: string
-
-                        pages.dateformat.short:
-                            type: dateformat
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.SHORT_DATE_FORMAT
-                            help: PLUGIN_ADMIN.SHORT_DATE_FORMAT_HELP
-                            default: "jS M Y"
-                            options:
-                                "F jS \\a\\t g:ia": Date1
-                                "l jS \\of F g:i A": Date2
-                                "D, d M Y G:i:s": Date3
-                                "d-m-y G:i": Date4
-                                "jS M Y": Date5
-
-                        pages.dateformat.long:
-                            type: dateformat
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.LONG_DATE_FORMAT
-                            help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP
-                            options:
-                                "F jS \\a\\t g:ia": Date1
-                                "l jS \\of F g:i A": Date2
-                                "D, d M Y G:i:s": Date3
-                                "d-m-y G:i": Date4
-                                "jS M Y": Date5
-
-                        pages.order.by:
-                            type: select
-                            size: large
-                            classes: fancy
-                            label: PLUGIN_ADMIN.DEFAULT_ORDERING
-                            help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
-                            options:
-                                default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
-                                folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
-                                title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
-                                date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
-
-                        pages.order.dir:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION
-                            highlight: asc
-                            default: desc
-                            help: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION_HELP
-                            options:
-                                asc: PLUGIN_ADMIN.ASCENDING
-                                desc: PLUGIN_ADMIN.DESCENDING
-
-                        pages.list.count:
-                            type: text
-                            size: x-small
-                            append: PLUGIN_ADMIN.PAGES
-                            label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
-                            help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
-                            validate:
-                                type: number
-                                min: 1
-
-                        pages.publish_dates:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DATE_BASED_PUBLISHING
-                            help: PLUGIN_ADMIN.DATE_BASED_PUBLISHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.events:
-                             type: checkboxes
-                             label: PLUGIN_ADMIN.EVENTS
-                             help: PLUGIN_ADMIN.EVENTS_HELP
-                             default: [page: true, twig: true]
-                             options:
-                                 page: Page Events
-                                 twig: Twig Events
-                             use: keys
-
-                        pages.append_url_extension:
-                            type: text
-                            size: x-small
-                            placeholder: "e.g. .html"
-                            label: PLUGIN_ADMIN.APPEND_URL_EXT
-                            help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
-
-                        pages.redirect_default_route:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
-                            help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.redirect_default_code:
-                            type: select
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
-                            help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
-                            options:
-                                301: 301 - Permanent
-                                302: 302 - Found
-                                303: 303 - Other
-                                304: 304 - Not Modified
-
-                        pages.redirect_trailing_slash:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
-                            help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.ignore_hidden:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IGNORE_HIDDEN
-                            help: PLUGIN_ADMIN.IGNORE_HIDDEN_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.ignore_files:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.IGNORE_FILES
-                            help: PLUGIN_ADMIN.IGNORE_FILES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        pages.ignore_folders:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.IGNORE_FOLDERS
-                            help: PLUGIN_ADMIN.IGNORE_FOLDERS_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        pages.hide_empty_folders:
-                          type: toggle
-                          label: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS
-                          help: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS_HELP
-                          highlight: 0
-                          options:
-                            1: PLUGIN_ADMIN.YES
-                            0: PLUGIN_ADMIN.NO
-                          validate:
-                            type: bool
-
-                        pages.url_taxonomy_filters:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS
-                            help: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.twig_first:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_FIRST
-                            help: PLUGIN_ADMIN.TWIG_FIRST_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.never_cache_twig:
-                            type: toggle
-                            label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
-                            help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.frontmatter.process_twig:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
-                            help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.frontmatter.ignore_fields:
-                            type: selectize
-                            size: large
-                            placeholder: "e.g. forms"
-                            label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
-                            help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                languages:
-                    type: tab
-                    title: PLUGIN_ADMIN.LANGUAGES
-
-                    fields:
-                        languages-section:
-                            type: section
-                            title: PLUGIN_ADMIN.LANGUAGES
-                            underline: true
-
-                        languages.supported:
-                            type: selectize
-                            size: large
-                            placeholder: "e.g. en, fr"
-                            label: PLUGIN_ADMIN.SUPPORTED
-                            help: PLUGIN_ADMIN.SUPPORTED_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        languages.default_lang:
-                            type: text
-                            size: x-small
-                            label: PLUGIN_ADMIN.DEFAULT_LANG
-                            help: PLUGIN_ADMIN.DEFAULT_LANG_HELP
-
-                        languages.include_default_lang:
-                            type: toggle
-                            label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG
-                            help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.pages_fallback_only:
-                            type: toggle
-                            label: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY
-                            help: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.translations:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TRANSLATIONS_ENABLED
-                            help: PLUGIN_ADMIN.TRANSLATIONS_ENABLED_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.translations_fallback:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK
-                            help: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.session_store_active:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION
-                            help: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.http_accept_language:
-                            type: toggle
-                            label: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE
-                            help: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.override_locale:
-                            type: toggle
-                            label: PLUGIN_ADMIN.OVERRIDE_LOCALE
-                            help: PLUGIN_ADMIN.OVERRIDE_LOCALE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                http_headers:
-                    type: tab
-                    title: PLUGIN_ADMIN.HTTP_HEADERS
-
-                    fields:
-                        http_headers_section:
-                            type: section
-                            title: PLUGIN_ADMIN.HTTP_HEADERS
-                            underline: true
-
-                        pages.expires:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.EXPIRES
-                            help: PLUGIN_ADMIN.EXPIRES_HELP
-                            validate:
-                                type: number
-                                min: 1
-                        pages.cache_control:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.CACHE_CONTROL
-                            help: PLUGIN_ADMIN.CACHE_CONTROL_HELP
-                            placeholder: 'e.g. public, max-age=31536000'
-                        pages.last_modified:
-                            type: toggle
-                            label: PLUGIN_ADMIN.LAST_MODIFIED
-                            help: PLUGIN_ADMIN.LAST_MODIFIED_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.etag:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ETAG
-                            help: PLUGIN_ADMIN.ETAG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.vary_accept_encoding:
-                            type: toggle
-                            label: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING
-                            help: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                markdown:
-                    type: tab
-                    title: PLUGIN_ADMIN.MARKDOWN
-
-                    fields:
-                        markdow_section:
-                            type: section
-                            title: PLUGIN_ADMIN.MARKDOWN
-                            underline: true
-
-                        pages.markdown.extra:
-                            type: toggle
-                            label: Markdown extra
-                            help: PLUGIN_ADMIN.MARKDOWN_EXTRA_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.auto_line_breaks:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTO_LINE_BREAKS
-                            help: PLUGIN_ADMIN.AUTO_LINE_BREAKS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.auto_url_links:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTO_URL_LINKS
-                            help: PLUGIN_ADMIN.AUTO_URL_LINKS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.escape_markup:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ESCAPE_MARKUP
-                            help: PLUGIN_ADMIN.ESCAPE_MARKUP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.markdown.valid_link_attributes:
-                          type: selectize
-                          size: large
-                          label: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES
-                          help: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES_HELP
-                          placeholder: "rel, target, id, class, classes"
-                          classes: fancy
-                          validate:
-                            type: commalist
-
-                caching:
-                    type: tab
-                    title: PLUGIN_ADMIN.CACHING
-
-                    fields:
-                        caching_section:
-                            type: section
-                            title: PLUGIN_ADMIN.CACHING
-                            underline: true
-
-                        cache.enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CACHING
-                            help: PLUGIN_ADMIN.CACHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.check.method:
-                            type: select
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
-                            help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
-                            options:
-                                file: Markdown + Yaml file timestamps
-                                folder: Folder timestamps
-                                hash: All files timestamps
-                                none: No timestamp checking
-
-                        cache.driver:
-                            type: select
-                            size: small
-                            classes: fancy
-                            label: PLUGIN_ADMIN.CACHE_DRIVER
-                            help: PLUGIN_ADMIN.CACHE_DRIVER_HELP
-                            options:
-                                auto: Auto detect
-                                file: File
-                                apc: APC
-                                apcu: APCu
-                                xcache: Xcache
-                                memcache: Memcache
-                                memcached: Memcached
-                                wincache: WinCache
-                                redis: Redis
-
-                        cache.prefix:
-                            type: text
-                            size: x-small
-                            label: PLUGIN_ADMIN.CACHE_PREFIX
-                            help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
-                            placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
-
-                        cache.purge_at:
-                            type: cron
-                            label: PLUGIN_ADMIN.CACHE_PURGE_JOB
-                            help: PLUGIN_ADMIN.CACHE_PURGE_JOB_HELP
-                            default: '* 4 * * *'
-
-                        cache.clear_at:
-                            type: cron
-                            label: PLUGIN_ADMIN.CACHE_CLEAR_JOB
-                            help: PLUGIN_ADMIN.CACHE_CLEAR_JOB_HELP
-                            default: '* 3 * * *'
-
-                        cache.clear_job_type:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.CACHE_JOB_TYPE
-                            help: PLUGIN_ADMIN.CACHE_JOB_TYPE_HELP
-                            options:
-                                standard: Standard Cache Folders
-                                all: All Cache Folders
-
-                        cache.clear_images_by_default:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT
-                            help: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.cli_compatibility:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CLI_COMPATIBILITY
-                            help: PLUGIN_ADMIN.CLI_COMPATIBILITY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.lifetime:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.LIFETIME
-                            help: PLUGIN_ADMIN.LIFETIME_HELP
-                            validate:
-                                type: number
-
-                        cache.gzip:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GZIP_COMPRESSION
-                            help: PLUGIN_ADMIN.GZIP_COMPRESSION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.allow_webserver_gzip:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP
-                            help: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.memcache.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.MEMCACHE_SERVER
-                            help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.memcache.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.MEMCACHE_PORT
-                            help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
-                            placeholder: "11211"
-
-                        cache.memcached.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.MEMCACHED_SERVER
-                            help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.memcached.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.MEMCACHED_PORT
-                            help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
-                            placeholder: "11211"
-
-                        cache.redis.socket:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.REDIS_SOCKET
-                            help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
-                            placeholder: "/var/run/redis/redis.sock"
-
-                        cache.redis.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.REDIS_SERVER
-                            help: PLUGIN_ADMIN.REDIS_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.redis.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.REDIS_PORT
-                            help: PLUGIN_ADMIN.REDIS_PORT_HELP
-                            placeholder: "6379"
-
-                        cache.redis.password:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.REDIS_PASSWORD
-
-                twig:
-                    type: tab
-                    title: PLUGIN_ADMIN.TWIG_TEMPLATING
-
-                    fields:
-                        twig_section:
-                            type: section
-                            title: PLUGIN_ADMIN.TWIG_TEMPLATING
-                            underline: true
-
-                        twig.cache:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_CACHING
-                            help: PLUGIN_ADMIN.TWIG_CACHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.debug:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_DEBUG
-                            help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.auto_reload:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DETECT_CHANGES
-                            help: PLUGIN_ADMIN.DETECT_CHANGES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.autoescape:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
-                            help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.umask_fix:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_UMASK_FIX
-                            help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                assets:
-                    type: tab
-                    title: PLUGIN_ADMIN.ASSETS
-
-                    fields:
-                        assets_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ASSETS
-                            underline: true
-
-                        assets.css_pipeline:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_pipeline_include_externals:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_pipeline_before_excludes:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_minify:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_MINIFY
-                            help: PLUGIN_ADMIN.CSS_MINIFY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_minify_windows:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE
-                            help: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.css_rewrite:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_REWRITE
-                            help: PLUGIN_ADMIN.CSS_REWRITE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.js_pipeline:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.js_pipeline_include_externals:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.js_pipeline_before_excludes:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.js_minify:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
-                            help: PLUGIN_ADMIN.JAVASCRIPT_MINIFY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.enable_asset_timestamp:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS
-                            help: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.collections:
-                            type: multilevel
-                            label: PLUGIN_ADMIN.COLLECTIONS
-                            placeholder_key: collection_name
-                            placeholder_value: collection_path
-                            validate:
-                                type: array
-
-                errors:
-                    type: tab
-                    title: PLUGIN_ADMIN.ERROR_HANDLER
-
-                    fields:
-                        errors_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ERROR_HANDLER
-                            underline: true
-
-                        errors.display:
-                            type: select
-                            label: PLUGIN_ADMIN.DISPLAY_ERRORS
-                            help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
-                            size: medium
-                            highlight: 1
-                            options:
-                                -1: PLUGIN_ADMIN.ERROR_SYSTEM
-                                0: PLUGIN_ADMIN.ERROR_SIMPLE
-                                1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
-                            validate:
-                                type: int
-
-
-                        errors.log:
-                            type: toggle
-                            label: PLUGIN_ADMIN.LOG_ERRORS
-                            help: PLUGIN_ADMIN.LOG_ERRORS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        log.handler:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.LOG_HANDLER
-                            help: PLUGIN_ADMIN.LOG_HANDLER_HELP
-                            default: 'file'
-                            options:
-                                'file': 'File'
-                                'syslog': 'Syslog'
-
-                        log.syslog.facility:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.SYSLOG_FACILITY
-                            help: PLUGIN_ADMIN.SYSLOG_FACILITY_HELP
-                            default: local6
-                            options:
-                              auth: auth
-                              authpriv: authpriv
-                              cron: cron
-                              daemon: daemon
-                              kern: kern
-                              lpr: lpr
-                              mail: mail
-                              news: news
-                              syslog: syslog
-                              user: user
-                              uucp: uucp
-                              local0: local0
-                              local1: local1
-                              local2: local2
-                              local3: local3
-                              local4: local4
-                              local5: local5
-                              local6: local6
-                              local7: local7
-
-                debugger:
-                    type: tab
-                    title: PLUGIN_ADMIN.DEBUGGER
-
-                    fields:
-                        debugger_section:
-                            type: section
-                            title: PLUGIN_ADMIN.DEBUGGER
-                            underline: true
-
-                        debugger.enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DEBUGGER
-                            help: PLUGIN_ADMIN.DEBUGGER_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        debugger.shutdown.close_connection:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION
-                            help: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                media:
-                    type: tab
-                    title: PLUGIN_ADMIN.MEDIA
-
-                    fields:
-                        media_section:
-                            type: section
-                            title: PLUGIN_ADMIN.MEDIA
-                            underline: true
-
-                        images.default_image_quality:
-                            type: range
-                            append: '%'
-                            label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
-                            help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
-                            validate:
-                                min: 1
-                                max: 100
-
-                        images.cache_all:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CACHE_ALL
-                            help: PLUGIN_ADMIN.CACHE_ALL_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.cache_perms:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.CACHE_PERMS
-                            help: PLUGIN_ADMIN.CACHE_PERMS_HELP
-                            highlight: '0755'
-                            options:
-                                '0755': '0755'
-                                '0775': '0775'
-
-                        images.debug:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_DEBUG
-                            help: PLUGIN_ADMIN.IMAGES_DEBUG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.auto_fix_orientation:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
-                            help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.seofriendly:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY
-                            help: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        media.enable_media_timestamp:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP
-                            help: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        media.auto_metadata_exif:
-                              type: toggle
-                              label: PLUGIN_ADMIN.ENABLE_AUTO_METADATA
-                              help: PLUGIN_ADMIN.ENABLE_AUTO_METADATA_HELP
-                              highlight: 0
-                              options:
-                                  1: PLUGIN_ADMIN.YES
-                                  0: PLUGIN_ADMIN.NO
-                              validate:
-                                  type: bool
-
-
-                        media.allowed_fallback_types:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.FALLBACK_TYPES
-                            help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        media.unsupported_inline_types:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.INLINE_TYPES
-                            help: PLUGIN_ADMIN.INLINE_TYPES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                session:
-                    type: tab
-                    title: PLUGIN_ADMIN.SESSION
-
-                    fields:
-                        session_section:
-                            type: section
-                            title: PLUGIN_ADMIN.SESSION
-                            underline: true
-
-                        session.enabled:
-                            type: hidden
-                            label: PLUGIN_ADMIN.ENABLED
-                            help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.initialize:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_INITIALIZE
-                            help: PLUGIN_ADMIN.SESSION_INITIALIZE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.timeout:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.TIMEOUT
-                            help: PLUGIN_ADMIN.TIMEOUT_HELP
-                            validate:
-                                type: number
-                                min: 0
-
-                        session.name:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.NAME
-                            help: PLUGIN_ADMIN.SESSION_NAME_HELP
-
-                        session.uniqueness:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.SESSION_UNIQUENESS
-                            help: PLUGIN_ADMIN.SESSION_UNIQUENESS_HELP
-                            highlight: path
-                            default: path
-                            options:
-                                path: Grav's root file path
-                                salt: Grav's random security salt
-
-                        session.secure:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_SECURE
-                            help: PLUGIN_ADMIN.SESSION_SECURE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: false
-                            validate:
-                                type: bool
-
-                        session.httponly:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_HTTPONLY
-                            help: PLUGIN_ADMIN.SESSION_HTTPONLY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.path:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.SESSION_PATH
-                            help: PLUGIN_ADMIN.SESSION_PATH_HELP
-
-                        session.split:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_SPLIT
-                            help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                advanced:
-                    type: tab
-                    title: PLUGIN_ADMIN.ADVANCED
-
-                    fields:
-                        advanced_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ADVANCED
-                            underline: true
-
-                        gpm.releases:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_RELEASES
-                            highlight: stable
-                            help: PLUGIN_ADMIN.GPM_RELEASES_HELP
-                            options:
-                                stable: PLUGIN_ADMIN.STABLE
-                                testing: PLUGIN_ADMIN.TESTING
-
-                        gpm.proxy_url:
-                            type: text
-                            size: medium
-                            placeholder: "e.g. 127.0.0.1:3128"
-                            label: PLUGIN_ADMIN.PROXY_URL
-                            help: PLUGIN_ADMIN.PROXY_URL_HELP
-
-                        gpm.method:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_METHOD
-                            highlight: auto
-                            help: PLUGIN_ADMIN.GPM_METHOD_HELP
-                            options:
-                                auto: PLUGIN_ADMIN.AUTO
-                                fopen: PLUGIN_ADMIN.FOPEN
-                                curl: PLUGIN_ADMIN.CURL
-
-                        gpm.official_gpm_only:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY
-                            highlight: 1
-                            help: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        gpm.verify_peer:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_VERIFY_PEER
-                            highlight: 1
-                            help: PLUGIN_ADMIN.GPM_VERIFY_PEER_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        reverse_proxy_setup:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REVERSE_PROXY
-                            highlight: 0
-                            help: PLUGIN_ADMIN.REVERSE_PROXY_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        username_regex:
-                            type: text
-                            size: large
-                            label: PLUGIN_ADMIN.USERNAME_REGEX
-                            help: PLUGIN_ADMIN.USERNAME_REGEX_HELP
-
-                        pwd_regex:
-                            type: text
-                            size: large
-                            label: PLUGIN_ADMIN.PWD_REGEX
-                            help: PLUGIN_ADMIN.PWD_REGEX_HELP
-
-                        intl_enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.INTL_ENABLED
-                            highlight: 1
-                            help: PLUGIN_ADMIN.INTL_ENABLED_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        wrapped_site:
-                            type: toggle
-                            label: PLUGIN_ADMIN.WRAPPED_SITE
-                            highlight: 0
-                            help: PLUGIN_ADMIN.WRAPPED_SITE_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        absolute_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ABSOLUTE_URLS
-                            highlight: 0
-                            help: PLUGIN_ADMIN.ABSOLUTE_URLS_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        param_sep:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
-                            classes: fancy
-                            help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
-                            default: ''
-                            options:
-                                ':': ': (default)'
-                                ';': '; (for Apache running on Windows)'
-
-                        force_ssl:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FORCE_SSL
-                            highlight: 0
-                            help: PLUGIN_ADMIN.FORCE_SSL_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        force_lowercase_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        custom_base_url:
-                            type: text
-                            size: medium
-                            placeholder: "e.g. http://yoursite.com/yourpath"
-                            label: PLUGIN_ADMIN.CUSTOM_BASE_URL
-                            help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP
-
-                        http_x_forwarded.protocol:
-                          type: toggle
-                          label: HTTP_X_FORWARDED_PROTO Enabled
-                          highlight: 1
-                          default: 1
-                          options:
-                            1: PLUGIN_ADMIN.YES
-                            0: PLUGIN_ADMIN.NO
-                          validate:
-                            type: bool
-
-                        http_x_forwarded.host:
-                          type: toggle
-                          label: HTTP_X_FORWARDED_HOST Enabled
-                          highlight: 0
-                          default: 0
-                          options:
-                            1: PLUGIN_ADMIN.YES
-                            0: PLUGIN_ADMIN.NO
-                          validate:
-                            type: bool
-
-                        http_x_forwarded.port:
-                          type: toggle
-                          label: HTTP_X_FORWARDED_PORT Enabled
-                          highlight: 1
-                          default: 1
-                          options:
-                            1: PLUGIN_ADMIN.YES
-                            0: PLUGIN_ADMIN.NO
-                          validate:
-                            type: bool
-
-                        http_x_forwarded.ip:
-                          type: toggle
-                          label: HTTP_X_FORWARDED IP Enabled
-                          highlight: 1
-                          default: 1
-                          options:
-                            1: PLUGIN_ADMIN.YES
-                            0: PLUGIN_ADMIN.NO
-                          validate:
-                            type: bool
-
-
-                        accounts.type:
-                            type: hidden
-
-                        accounts.storage:
-                            type: hidden
-
-                        strict_mode.yaml_compat:
-                            type: toggle
-                            label: PLUGIN_ADMIN.STRICT_YAML_COMPAT
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.STRICT_YAML_COMPAT_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        strict_mode.twig_compat:
-                            type: toggle
-                            label: PLUGIN_ADMIN.STRICT_TWIG_COMPAT
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.STRICT_TWIG_COMPAT_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
+  validation: loose
+  fields:
+
+    system_tabs:
+      type: tabs
+      classes: side-tabs
+
+      fields:
+        content:
+          type: tab
+          title: PLUGIN_ADMIN.CONTENT
+
+          fields:
+            content_section:
+              type: section
+              title: PLUGIN_ADMIN.CONTENT
+              underline: true
+
+            home.alias:
+              type: pages
+              size: large
+              classes: fancy
+              label: PLUGIN_ADMIN.HOME_PAGE
+              show_all: false
+              show_modular: false
+              show_root: false
+              show_slug: true
+              help: PLUGIN_ADMIN.HOME_PAGE_HELP
+
+            home.hide_in_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.HIDE_HOME_IN_URLS
+              help: PLUGIN_ADMIN.HIDE_HOME_IN_URLS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.theme:
+              type: themeselect
+              classes: fancy
+              selectize: true
+              size: medium
+              label: PLUGIN_ADMIN.DEFAULT_THEME
+              help: PLUGIN_ADMIN.DEFAULT_THEME_HELP
+
+            pages.process:
+              type: checkboxes
+              label: PLUGIN_ADMIN.PROCESS
+              help: PLUGIN_ADMIN.PROCESS_HELP
+              default: [markdown: true, twig: true]
+              options:
+                markdown: Markdown
+                twig: Twig
+              use: keys
+
+            pages.types:
+              type: array
+              label: PLUGIN_ADMIN.PAGE_TYPES
+              help: PLUGIN_ADMIN.PAGE_TYPES_HELP
+              size: small
+              default: ['html','htm','json','xml','txt','rss','atom']
+              value_only: true
+
+            timezone:
+              type: select
+              label: PLUGIN_ADMIN.TIMEZONE
+              size: medium
+              classes: fancy
+              help: PLUGIN_ADMIN.TIMEZONE_HELP
+              data-options@: '\Grav\Common\Utils::timezones'
+              default: ''
+              options:
+                '': 'Default (Server Timezone)'
+
+            pages.dateformat.default:
+              type: select
+              size: medium
+              selectize:
+                create: true
+              label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+              help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+              placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+              data-options@: '\Grav\Common\Utils::dateFormats'
+              validate:
+                type: string
+
+            pages.dateformat.short:
+              type: dateformat
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.SHORT_DATE_FORMAT
+              help: PLUGIN_ADMIN.SHORT_DATE_FORMAT_HELP
+              default: "jS M Y"
+              options:
+                "F jS \\a\\t g:ia": Date1
+                "l jS \\of F g:i A": Date2
+                "D, d M Y G:i:s": Date3
+                "d-m-y G:i": Date4
+                "jS M Y": Date5
+
+            pages.dateformat.long:
+              type: dateformat
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.LONG_DATE_FORMAT
+              help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP
+              options:
+                "F jS \\a\\t g:ia": Date1
+                "l jS \\of F g:i A": Date2
+                "D, d M Y G:i:s": Date3
+                "d-m-y G:i": Date4
+                "jS M Y": Date5
+
+            pages.order.by:
+              type: select
+              size: large
+              classes: fancy
+              label: PLUGIN_ADMIN.DEFAULT_ORDERING
+              help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
+              options:
+                default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
+                folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
+                title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
+                date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
+
+            pages.order.dir:
+              type: toggle
+              label: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION
+              highlight: asc
+              default: desc
+              help: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION_HELP
+              options:
+                asc: PLUGIN_ADMIN.ASCENDING
+                desc: PLUGIN_ADMIN.DESCENDING
+
+            pages.list.count:
+              type: text
+              size: x-small
+              append: PLUGIN_ADMIN.PAGES
+              label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
+              help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
+              validate:
+                type: number
+                min: 1
+
+            pages.publish_dates:
+              type: toggle
+              label: PLUGIN_ADMIN.DATE_BASED_PUBLISHING
+              help: PLUGIN_ADMIN.DATE_BASED_PUBLISHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.events:
+              type: checkboxes
+              label: PLUGIN_ADMIN.EVENTS
+              help: PLUGIN_ADMIN.EVENTS_HELP
+              default: [page: true, twig: true]
+              options:
+                page: Page Events
+                twig: Twig Events
+              use: keys
+
+            pages.append_url_extension:
+              type: text
+              size: x-small
+              placeholder: "e.g. .html"
+              label: PLUGIN_ADMIN.APPEND_URL_EXT
+              help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
+
+            pages.redirect_default_code:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
+              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
+              default: 302
+              options:
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+                303: PLUGIN_ADMIN.REDIRECT_OPTION_303
+
+            pages.redirect_default_route:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
+              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
+              default: 0
+              options:
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+              validate:
+                type: int
+
+            pages.redirect_trailing_slash:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
+              help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
+              default: 1
+              options:
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+              validate:
+                type: int
+
+            pages.ignore_hidden:
+              type: toggle
+              label: PLUGIN_ADMIN.IGNORE_HIDDEN
+              help: PLUGIN_ADMIN.IGNORE_HIDDEN_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.ignore_files:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.IGNORE_FILES
+              help: PLUGIN_ADMIN.IGNORE_FILES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            pages.ignore_folders:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.IGNORE_FOLDERS
+              help: PLUGIN_ADMIN.IGNORE_FOLDERS_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            pages.hide_empty_folders:
+              type: toggle
+              label: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS
+              help: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.url_taxonomy_filters:
+              type: toggle
+              label: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS
+              help: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.twig_first:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_FIRST
+              help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.never_cache_twig:
+              type: toggle
+              label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+              help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.frontmatter.process_twig:
+              type: toggle
+              label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
+              help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.frontmatter.ignore_fields:
+              type: selectize
+              size: large
+              placeholder: "e.g. forms"
+              label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
+              help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+        languages:
+          type: tab
+          title: PLUGIN_ADMIN.LANGUAGES
+
+          fields:
+            languages-section:
+              type: section
+              title: PLUGIN_ADMIN.LANGUAGES
+              underline: true
+
+            languages.supported:
+              type: selectize
+              size: large
+              placeholder: "e.g. en, fr"
+              label: PLUGIN_ADMIN.SUPPORTED
+              help: PLUGIN_ADMIN.SUPPORTED_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            languages.default_lang:
+              type: text
+              size: x-small
+              label: PLUGIN_ADMIN.DEFAULT_LANG
+              help: PLUGIN_ADMIN.DEFAULT_LANG_HELP
+
+            languages.include_default_lang:
+              type: toggle
+              label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG
+              help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.include_default_lang_file_extension:
+              type: toggle
+              label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_FILE_EXTENSION
+              help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP_FILE_EXTENSION
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.content_fallback:
+              type: list
+              label: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACKS
+              help: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACKS_HELP
+              fields:
+                key:
+                  type: key
+                  label: PLUGIN_ADMIN.LANGUAGE
+                  help: PLUGIN_ADMIN.CONTENT_FALLBACK_LANGUAGE_HELP
+                  placeholder: fr-ca
+                value:
+                  type: selectize
+                  size: large
+                  placeholder: "fr, en"
+                  label: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACK
+                  help: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACK_HELP
+                  classes: fancy
+# TODO: does not work.
+#                  validate:
+#                    type: commalist
+
+            languages.pages_fallback_only:
+              type: toggle
+              label: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY
+              help: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.translations:
+              type: toggle
+              label: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS
+              help: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.translations_fallback:
+              type: toggle
+              label: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK
+              help: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.session_store_active:
+              type: toggle
+              label: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION
+              help: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.http_accept_language:
+              type: toggle
+              label: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE
+              help: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.override_locale:
+              type: toggle
+              label: PLUGIN_ADMIN.OVERRIDE_LOCALE
+              help: PLUGIN_ADMIN.OVERRIDE_LOCALE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        http_headers:
+          type: tab
+          title: PLUGIN_ADMIN.HTTP_HEADERS
+
+          fields:
+            http_headers_section:
+              type: section
+              title: PLUGIN_ADMIN.HTTP_HEADERS
+              underline: true
+
+            pages.expires:
+              type: text
+              size: x-small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.EXPIRES
+              help: PLUGIN_ADMIN.EXPIRES_HELP
+              validate:
+                type: number
+                min: 1
+            pages.cache_control:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.CACHE_CONTROL
+              help: PLUGIN_ADMIN.CACHE_CONTROL_HELP
+              placeholder: 'e.g. public, max-age=31536000'
+            pages.last_modified:
+              type: toggle
+              label: PLUGIN_ADMIN.LAST_MODIFIED
+              help: PLUGIN_ADMIN.LAST_MODIFIED_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.etag:
+              type: toggle
+              label: PLUGIN_ADMIN.ETAG
+              help: PLUGIN_ADMIN.ETAG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.vary_accept_encoding:
+              type: toggle
+              label: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING
+              help: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        markdown:
+          type: tab
+          title: PLUGIN_ADMIN.MARKDOWN
+
+          fields:
+            markdow_section:
+              type: section
+              title: PLUGIN_ADMIN.MARKDOWN
+              underline: true
+
+            pages.markdown.extra:
+              type: toggle
+              label: Markdown extra
+              help: PLUGIN_ADMIN.MARKDOWN_EXTRA_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.auto_line_breaks:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTO_LINE_BREAKS
+              help: PLUGIN_ADMIN.AUTO_LINE_BREAKS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.auto_url_links:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTO_URL_LINKS
+              help: PLUGIN_ADMIN.AUTO_URL_LINKS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.escape_markup:
+              type: toggle
+              label: PLUGIN_ADMIN.ESCAPE_MARKUP
+              help: PLUGIN_ADMIN.ESCAPE_MARKUP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.valid_link_attributes:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES
+              help: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES_HELP
+              placeholder: "rel, target, id, class, classes"
+              classes: fancy
+              validate:
+                type: commalist
+
+        caching:
+          type: tab
+          title: PLUGIN_ADMIN.CACHING
+
+          fields:
+            caching_section:
+              type: section
+              title: PLUGIN_ADMIN.CACHING
+              underline: true
+
+            cache.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.CACHING
+              help: PLUGIN_ADMIN.CACHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.check.method:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
+              help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
+              options:
+                file: Markdown + Yaml file timestamps
+                folder: Folder timestamps
+                hash: All files timestamps
+                none: No timestamp checking
+
+            cache.driver:
+              type: select
+              size: small
+              classes: fancy
+              label: PLUGIN_ADMIN.CACHE_DRIVER
+              help: PLUGIN_ADMIN.CACHE_DRIVER_HELP
+              options:
+                auto: Auto detect
+                file: File
+                apc: APC
+                apcu: APCu
+                xcache: Xcache
+                memcache: Memcache
+                memcached: Memcached
+                wincache: WinCache
+                redis: Redis
+
+            cache.prefix:
+              type: text
+              size: x-small
+              label: PLUGIN_ADMIN.CACHE_PREFIX
+              help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
+              placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
+
+            cache.purge_at:
+              type: cron
+              label: PLUGIN_ADMIN.CACHE_PURGE_JOB
+              help: PLUGIN_ADMIN.CACHE_PURGE_JOB_HELP
+              default: '* 4 * * *'
+
+            cache.clear_at:
+              type: cron
+              label: PLUGIN_ADMIN.CACHE_CLEAR_JOB
+              help: PLUGIN_ADMIN.CACHE_CLEAR_JOB_HELP
+              default: '* 3 * * *'
+
+            cache.clear_job_type:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.CACHE_JOB_TYPE
+              help: PLUGIN_ADMIN.CACHE_JOB_TYPE_HELP
+              options:
+                standard: Standard Cache Folders
+                all: All Cache Folders
+
+            cache.clear_images_by_default:
+              type: toggle
+              label: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT
+              help: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.cli_compatibility:
+              type: toggle
+              label: PLUGIN_ADMIN.CLI_COMPATIBILITY
+              help: PLUGIN_ADMIN.CLI_COMPATIBILITY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.lifetime:
+              type: text
+              size: small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.LIFETIME
+              help: PLUGIN_ADMIN.LIFETIME_HELP
+              validate:
+                type: number
+
+            cache.gzip:
+              type: toggle
+              label: PLUGIN_ADMIN.GZIP_COMPRESSION
+              help: PLUGIN_ADMIN.GZIP_COMPRESSION_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.allow_webserver_gzip:
+              type: toggle
+              label: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP
+              help: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.memcache.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.MEMCACHE_SERVER
+              help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.memcache.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.MEMCACHE_PORT
+              help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
+              placeholder: "11211"
+
+            cache.memcached.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.MEMCACHED_SERVER
+              help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.memcached.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.MEMCACHED_PORT
+              help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
+              placeholder: "11211"
+
+            cache.redis.socket:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_SOCKET
+              help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
+              placeholder: "/var/run/redis/redis.sock"
+
+            cache.redis.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_SERVER
+              help: PLUGIN_ADMIN.REDIS_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.redis.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.REDIS_PORT
+              help: PLUGIN_ADMIN.REDIS_PORT_HELP
+              placeholder: "6379"
+
+            cache.redis.password:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.REDIS_PASSWORD
+
+            cache.redis.database:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_DATABASE
+              help: PLUGIN_ADMIN.REDIS_DATABASE_HELP
+              placeholder: "0"
+              validate:
+                type: number
+                min: 0
+
+            flex_caching:
+              type: section
+              title: PLUGIN_ADMIN.FLEX_CACHING
+
+            flex.cache.index.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.index.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              default: 60
+              validate:
+                type: int
+
+            flex.cache.object.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.object.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
+            flex.cache.render.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.render.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
+        twig:
+          type: tab
+          title: PLUGIN_ADMIN.TWIG_TEMPLATING
+
+          fields:
+            twig_section:
+              type: section
+              title: PLUGIN_ADMIN.TWIG_TEMPLATING
+              underline: true
+
+            twig.cache:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_CACHING
+              help: PLUGIN_ADMIN.TWIG_CACHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.debug:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_DEBUG
+              help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.auto_reload:
+              type: toggle
+              label: PLUGIN_ADMIN.DETECT_CHANGES
+              help: PLUGIN_ADMIN.DETECT_CHANGES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.autoescape:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
+              help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.umask_fix:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_UMASK_FIX
+              help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        assets:
+          type: tab
+          title: PLUGIN_ADMIN.ASSETS
+
+          fields:
+            assets_section:
+              type: section
+              title: PLUGIN_ADMIN.ASSETS
+              underline: true
+
+            assets.css_pipeline:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE
+              help: PLUGIN_ADMIN.CSS_PIPELINE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_pipeline_include_externals:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
+              help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_pipeline_before_excludes:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
+              help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_minify:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_MINIFY
+              help: PLUGIN_ADMIN.CSS_MINIFY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_minify_windows:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE
+              help: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_rewrite:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_REWRITE
+              help: PLUGIN_ADMIN.CSS_REWRITE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_pipeline:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_pipeline_include_externals:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_pipeline_before_excludes:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_minify:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
+              help: PLUGIN_ADMIN.JAVASCRIPT_MINIFY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.enable_asset_timestamp:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS
+              help: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.enable_asset_sri:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS
+              help: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.collections:
+              type: multilevel
+              label: PLUGIN_ADMIN.COLLECTIONS
+              placeholder_key: collection_name
+              placeholder_value: collection_path
+              validate:
+                type: array
+
+        errors:
+          type: tab
+          title: PLUGIN_ADMIN.ERROR_HANDLER
+
+          fields:
+            errors_section:
+              type: section
+              title: PLUGIN_ADMIN.ERROR_HANDLER
+              underline: true
+
+            errors.display:
+              type: select
+              label: PLUGIN_ADMIN.DISPLAY_ERRORS
+              help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
+              size: medium
+              highlight: 1
+              options:
+                -1: PLUGIN_ADMIN.ERROR_SYSTEM
+                0: PLUGIN_ADMIN.ERROR_SIMPLE
+                1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
+              validate:
+                type: int
+
+
+            errors.log:
+              type: toggle
+              label: PLUGIN_ADMIN.LOG_ERRORS
+              help: PLUGIN_ADMIN.LOG_ERRORS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            log.handler:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.LOG_HANDLER
+              help: PLUGIN_ADMIN.LOG_HANDLER_HELP
+              default: 'file'
+              options:
+                'file': 'File'
+                'syslog': 'Syslog'
+
+            log.syslog.facility:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.SYSLOG_FACILITY
+              help: PLUGIN_ADMIN.SYSLOG_FACILITY_HELP
+              default: local6
+              options:
+                auth: auth
+                authpriv: authpriv
+                cron: cron
+                daemon: daemon
+                kern: kern
+                lpr: lpr
+                mail: mail
+                news: news
+                syslog: syslog
+                user: user
+                uucp: uucp
+                local0: local0
+                local1: local1
+                local2: local2
+                local3: local3
+                local4: local4
+                local5: local5
+                local6: local6
+                local7: local7
+
+        debugger:
+          type: tab
+          title: PLUGIN_ADMIN.DEBUGGER
+
+          fields:
+            debugger_section:
+              type: section
+              title: PLUGIN_ADMIN.DEBUGGER
+              underline: true
+
+            debugger.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.DEBUGGER
+              help: PLUGIN_ADMIN.DEBUGGER_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            debugger.provider:
+              type: select
+              label: PLUGIN_ADMIN.DEBUGGER_PROVIDER
+              help: PLUGIN_ADMIN.DEBUGGER_PROVIDER_HELP
+              size: medium
+              default: debugbar
+              options:
+                debugbar: PLUGIN_ADMIN.DEBUGGER_DEBUGBAR
+                clockwork: PLUGIN_ADMIN.DEBUGGER_CLOCKWORK
+
+            debugger.censored:
+              type: toggle
+              label: PLUGIN_ADMIN.DEBUGGER_CENSORED
+              help: PLUGIN_ADMIN.DEBUGGER_CENSORED_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            debugger.shutdown.close_connection:
+              type: toggle
+              label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION
+              help: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        media:
+          type: tab
+          title: PLUGIN_ADMIN.MEDIA
+
+          fields:
+            media_section:
+              type: section
+              title: PLUGIN_ADMIN.MEDIA
+              underline: true
+
+            images.default_image_quality:
+              type: range
+              append: '%'
+              label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
+              help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
+              validate:
+                min: 1
+                max: 100
+
+            images.cache_all:
+              type: toggle
+              label: PLUGIN_ADMIN.CACHE_ALL
+              help: PLUGIN_ADMIN.CACHE_ALL_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cache_perms:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.CACHE_PERMS
+              help: PLUGIN_ADMIN.CACHE_PERMS_HELP
+              highlight: '0755'
+              options:
+                '0755': '0755'
+                '0775': '0775'
+
+            images.debug:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_DEBUG
+              help: PLUGIN_ADMIN.IMAGES_DEBUG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.auto_fix_orientation:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
+              help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.defaults.loading:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.IMAGES_LOADING
+              help: PLUGIN_ADMIN.IMAGES_LOADING_HELP
+              highlight: auto
+              options:
+                auto: Auto
+                lazy: Lazy
+                eager: Eager
+
+            images.seofriendly:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY
+              help: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.enable_media_timestamp:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP
+              help: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.auto_metadata_exif:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLE_AUTO_METADATA
+              help: PLUGIN_ADMIN.ENABLE_AUTO_METADATA_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.allowed_fallback_types:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.FALLBACK_TYPES
+              help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            media.unsupported_inline_types:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.INLINE_TYPES
+              help: PLUGIN_ADMIN.INLINE_TYPES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            section_images_cls:
+              type: section
+              title: PLUGIN_ADMIN.IMAGES_CLS_TITLE
+              underline: true
+
+            images.cls.auto_sizes:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES
+              help: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.aspect_ratio:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO
+              help: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.retina_scale:
+              type: select
+              label: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE
+              help: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE_HELP
+              size: small
+              highlight: 1
+              options:
+                1: 1X
+                2: 2X
+                3: 3X
+                4: 4X
+
+        session:
+          type: tab
+          title: PLUGIN_ADMIN.SESSION
+
+          fields:
+            session_section:
+              type: section
+              title: PLUGIN_ADMIN.SESSION
+              underline: true
+
+            session.enabled:
+              type: hidden
+              label: PLUGIN_ADMIN.ENABLED
+              help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.initialize:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_INITIALIZE
+              help: PLUGIN_ADMIN.SESSION_INITIALIZE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.timeout:
+              type: text
+              size: small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.TIMEOUT
+              help: PLUGIN_ADMIN.TIMEOUT_HELP
+              validate:
+                type: number
+                min: 0
+
+            session.name:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.NAME
+              help: PLUGIN_ADMIN.SESSION_NAME_HELP
+
+            session.uniqueness:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.SESSION_UNIQUENESS
+              help: PLUGIN_ADMIN.SESSION_UNIQUENESS_HELP
+              highlight: path
+              default: path
+              options:
+                path: Grav's root file path
+                salt: Grav's random security salt
+
+            session.secure:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_SECURE
+              help: PLUGIN_ADMIN.SESSION_SECURE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: false
+              validate:
+                type: bool
+
+            session.httponly:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_HTTPONLY
+              help: PLUGIN_ADMIN.SESSION_HTTPONLY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.domain:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_DOMAIN
+              help: PLUGIN_ADMIN.SESSION_DOMAIN_HELP
+
+            session.path:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_PATH
+              help: PLUGIN_ADMIN.SESSION_PATH_HELP
+
+            session.samesite:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_SAMESITE
+              help: PLUGIN_ADMIN.SESSION_SAMESITE_HELP
+
+            session.split:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_SPLIT
+              help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+        advanced:
+          type: tab
+          title: PLUGIN_ADMIN.ADVANCED
+
+          fields:
+            advanced_section:
+              type: section
+              title: PLUGIN_ADMIN.ADVANCED
+              underline: true
+
+            gpm.releases:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_RELEASES
+              highlight: stable
+              help: PLUGIN_ADMIN.GPM_RELEASES_HELP
+              options:
+                stable: PLUGIN_ADMIN.STABLE
+                testing: PLUGIN_ADMIN.TESTING
+
+            gpm.proxy_url:
+              type: text
+              size: medium
+              placeholder: "e.g. 127.0.0.1:3128"
+              label: PLUGIN_ADMIN.PROXY_URL
+              help: PLUGIN_ADMIN.PROXY_URL_HELP
+
+            gpm.method:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_METHOD
+              highlight: auto
+              help: PLUGIN_ADMIN.GPM_METHOD_HELP
+              options:
+                auto: PLUGIN_ADMIN.AUTO
+                fopen: PLUGIN_ADMIN.FOPEN
+                curl: PLUGIN_ADMIN.CURL
+
+            gpm.official_gpm_only:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY
+              highlight: 1
+              help: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            gpm.verify_peer:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_VERIFY_PEER
+              highlight: 1
+              help: PLUGIN_ADMIN.GPM_VERIFY_PEER_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            reverse_proxy_setup:
+              type: toggle
+              label: PLUGIN_ADMIN.REVERSE_PROXY
+              highlight: 0
+              help: PLUGIN_ADMIN.REVERSE_PROXY_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            username_regex:
+              type: text
+              size: large
+              label: PLUGIN_ADMIN.USERNAME_REGEX
+              help: PLUGIN_ADMIN.USERNAME_REGEX_HELP
+
+            pwd_regex:
+              type: text
+              size: large
+              label: PLUGIN_ADMIN.PWD_REGEX
+              help: PLUGIN_ADMIN.PWD_REGEX_HELP
+
+            intl_enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.INTL_ENABLED
+              highlight: 1
+              help: PLUGIN_ADMIN.INTL_ENABLED_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            wrapped_site:
+              type: toggle
+              label: PLUGIN_ADMIN.WRAPPED_SITE
+              highlight: 0
+              help: PLUGIN_ADMIN.WRAPPED_SITE_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            absolute_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.ABSOLUTE_URLS
+              highlight: 0
+              help: PLUGIN_ADMIN.ABSOLUTE_URLS_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            param_sep:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
+              classes: fancy
+              help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
+              default: ''
+              options:
+                ':': ': (default)'
+                ';': '; (for Apache running on Windows)'
+
+            force_ssl:
+              type: toggle
+              label: PLUGIN_ADMIN.FORCE_SSL
+              highlight: 0
+              help: PLUGIN_ADMIN.FORCE_SSL_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            force_lowercase_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS
+              highlight: 1
+              default: 1
+              help: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            custom_base_url:
+              type: text
+              size: medium
+              placeholder: "e.g. http://yoursite.com/yourpath"
+              label: PLUGIN_ADMIN.CUSTOM_BASE_URL
+              help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP
+
+            http_x_forwarded.protocol:
+              type: toggle
+              label: HTTP_X_FORWARDED_PROTO Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.host:
+              type: toggle
+              label: HTTP_X_FORWARDED_HOST Enabled
+              highlight: 0
+              default: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.port:
+              type: toggle
+              label: HTTP_X_FORWARDED_PORT Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.ip:
+              type: toggle
+              label: HTTP_X_FORWARDED IP Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+
+            strict_mode.blueprint_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            strict_mode.yaml_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_YAML_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_YAML_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            strict_mode.twig_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_TWIG_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_TWIG_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        experimental:
+          type: tab
+          title: PLUGIN_ADMIN.EXPERIMENTAL
+
+          fields:
+            experimental_section:
+              type: section
+              title: PLUGIN_ADMIN.EXPERIMENTAL
+              underline: true
+
+#            flex_pages:
+#              type: section
+#              title: Flex Pages
+#
+#            pages.type:
+#              type: select
+#              label: PLUGIN_ADMIN.PAGES_TYPE
+#              highlight: regular
+#              help: PLUGIN_ADMIN.PAGES_TYPE_HELP
+#              options:
+#                regular: PLUGIN_ADMIN.REGULAR
+#                flex: PLUGIN_ADMIN.FLEX
+
+            pages.type:
+              type: hidden
+
+            flex_accounts:
+              type: section
+              title: Flex Accounts
+
+            accounts.type:
+              type: select
+              label: PLUGIN_ADMIN.ACCOUNTS_TYPE
+              highlight: stable
+              help: PLUGIN_ADMIN.ACCOUNTS_TYPE_HELP
+              options:
+                regular: PLUGIN_ADMIN.REGULAR
+                flex: PLUGIN_ADMIN.FLEX
+
+            accounts.storage:
+              type: select
+              label: PLUGIN_ADMIN.ACCOUNTS_STORAGE
+              highlight: stable
+              help: PLUGIN_ADMIN.ACCOUNTS_STORAGE_HELP
+              options:
+                file: PLUGIN_ADMIN.FILE
+                folder: PLUGIN_ADMIN.FOLDER

system/blueprints/flex/accounts.yaml

@@ -0,0 +1,8 @@
+title: Flex User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Deprecated in Grav 1.7.0-rc.4: file was renamed to user-accounts.yaml
+extends@:
+  type: user-accounts
+  context: blueprints://flex

system/blueprints/flex/configure/compat.yaml

@@ -0,0 +1,17 @@
+form:
+  compatibility:
+    type: tab
+    title: Compatibility
+    fields:
+      object.compat.events:
+        type: toggle
+        toggleable: true
+        label: Admin event compatibility
+        help: Enables onAdminSave and onAdminAfterSave events for plugins
+        highlight: 1
+        default: 1
+        options:
+          1: PLUGIN_ADMIN.ENABLED
+          0: PLUGIN_ADMIN.DISABLED
+        validate:
+          type: bool

system/blueprints/flex/pages.yaml

@@ -0,0 +1,212 @@
+title: Pages
+description: Manage your Grav Pages in Flex.
+type: flex-objects
+
+# Extends a page (blueprint gets overridden inside the object)
+extends@:
+  type: default
+  context: blueprints://pages
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING PAGES AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/pages'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.pages:
+        type: crudl
+        label: Pages
+      admin.configuration.pages:
+        type: default
+        label: Pages Configuration
+
+    # Admin menu
+    menu:
+      list:
+        route: '/pages'
+        title: PLUGIN_ADMIN.PAGES
+        icon: fa-file-text
+        authorize: ['admin.pages.list', 'admin.super']
+        priority: 5
+
+    # Admin template type (folder)
+    template: pages
+
+    # Allowed admin actions
+    actions:
+      list: true
+      create: true
+      read: true
+      update: true
+      delete: true
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        published:
+          width: 8
+          alias: header.published
+        visible:
+          width: 8
+          field:
+            label: Visible
+            type: toggle
+        menu:
+          link: edit
+          alias: header.menu
+        full_route:
+          field:
+            label: Route
+            type: text
+          link: edit
+          sort:
+            field: key
+        name:
+          width: 8
+          field:
+            label: Type
+            type: text
+        translations:
+          width: 8
+          field:
+            label: Translations
+            type: text
+#        updated_date:
+#          alias: header.update_date
+
+      # Extra options
+      options:
+        # Default number of records for pagination
+        per_page: 20
+        # Default ordering
+        order:
+          by: key
+          dir: asc
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+
+    edit:
+      title:
+        template: "{% if object.root %}Root <small>( &lt;root&gt; ){% else %}{{ (form.value('header.title') ?? form.value('folder'))|e }} <small>( {{ (object.getRoute().toString(false) ?: '/')|e }} )</small>{% endif %}"
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        preview:
+          icon: eye
+          title: PLUGIN_ADMIN.PREVIEW
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+        copy:
+          icon: copy
+          label: PLUGIN_ADMIN.COPY
+        move:
+          icon: arrows
+          label: PLUGIN_ADMIN.MOVE
+        delete:
+          icon: close
+          label: PLUGIN_ADMIN.DELETE
+        save:
+          icon: check
+          label: PLUGIN_ADMIN.SAVE
+
+    # Preview View
+    preview:
+      enabled: true
+
+    # Configure view
+    configure:
+      authorize: 'admin.configuration.pages'
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: pages
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+    # Default filters for frontend.
+    filter:
+      - withPublished
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Pages\PageObject'
+    collection: 'Grav\Common\Flex\Types\Pages\PageCollection'
+    index: 'Grav\Common\Flex\Types\Pages\PageIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Pages\Storage\PageStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\MarkdownFormatter'
+        folder: 'page://'
+        # Keep index file in filesystem to speed up lookups
+        indexed: true
+    # Set default ordering of the pages
+    ordering:
+      storage_key: ASC
+    search:
+       # Search options
+      options:
+        contains: 1
+      # Fields to be searched
+      fields:
+        - key
+        - menu
+        - title
+        - name
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    lang:
+      type: hidden
+      value: ''
+
+    tabs:
+      fields:
+        security:
+          type: tab
+          title: PLUGIN_ADMIN.SECURITY
+          import@:
+            type: partials/security
+            context: blueprints://pages

system/blueprints/flex/shared/configure.yaml

@@ -0,0 +1,70 @@
+form:
+  validation: loose
+
+  fields:
+    tabs:
+      type: tabs
+      fields:
+        cache:
+          type: tab
+          title: Caching
+          fields:
+            object.cache.index.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.index.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.index.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              config-default@: system.flex.cache.index.lifetime
+              validate:
+                type: int
+
+            object.cache.object.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.object.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.object.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              config-default@: system.flex.cache.object.lifetime
+              validate:
+                type: int
+
+            object.cache.render.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.render.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.render.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              config-default@: system.flex.cache.render.lifetime
+              validate:
+                type: int

system/blueprints/flex/user-accounts.yaml

@@ -0,0 +1,142 @@
+title: User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Extends user account
+extends@:
+  type: account
+  context: blueprints://user
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING USER ACCOUNTS AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/users'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/user': '/accounts/users'
+        '/accounts': '/accounts/users'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/users'
+        index: 0
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-accounts
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        username:
+          link: edit
+          search: true
+          field:
+            label: PLUGIN_ADMIN.USERNAME
+        email:
+          search: true
+        fullname:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: username
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('fullname') ?? form.value('username') }} <{{ form.value('email') }}>"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-accounts
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Users\UserObject'
+    collection: 'Grav\Common\Flex\Types\Users\UserCollection'
+    index: 'Grav\Common\Flex\Types\Users\UserIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Users\Storage\UserFileStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'account://'
+        pattern: '{FOLDER}/{KEY}{EXT}'
+        indexed: true
+        key: username
+        case_sensitive: false
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - email
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    username:
+      flex-disabled@: exists
+      disabled: false
+      flex-readonly@: exists
+      readonly: false
+      validate:
+        required: true

system/blueprints/flex/user-groups.yaml

@@ -0,0 +1,123 @@
+title: User Groups
+description: Manage your User Groups in Flex.
+type: flex-objects
+
+# Extends user group
+extends@:
+  type: group
+  context: blueprints://user
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/groups'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/groups': '/accounts/groups'
+        '/accounts': '/accounts/groups'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/groups'
+        index: 1
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-groups
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        groupname:
+          link: edit
+          search: true
+        readableName:
+          search: true
+        description:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: groupname
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('readableName') ?? form.value('groupname') }}"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-groups
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\UserGroups\UserGroupObject'
+    collection: 'Grav\Common\Flex\Types\UserGroups\UserGroupCollection'
+    index: 'Grav\Common\Flex\Types\UserGroups\UserGroupIndex'
+    storage:
+      class: 'Grav\Framework\Flex\Storage\SimpleStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'user://config/groups.yaml'
+        key: groupname
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - groupname
+        - description
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex

system/blueprints/pages/default.yaml

@@ -121,7 +121,7 @@ form:
                       underline: true
 
                     folder:
-                      type: text
+                      type: folder-slug
                       label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
                         rule: slug

system/blueprints/pages/modular.yaml

@@ -1,4 +1,4 @@
-title: PLUGIN_ADMIN.MODULAR
+title: PLUGIN_ADMIN.MODULE
 extends@: default
 
 form:
@@ -13,7 +13,7 @@ form:
 
             modular_title:
               type: spacer
-              title: PLUGIN_ADMIN.MODULAR_SETUP
+              title: PLUGIN_ADMIN.MODULE_SETUP
 
             header.content.items:
               type: text
@@ -34,5 +34,3 @@ form:
               help: '"desc" or "asc" are valid values'
               placeholder: desc
               size: small
-
-

system/blueprints/pages/partials/security.yaml

@@ -0,0 +1,71 @@
+form:
+  fields:
+    _site:
+      type: section
+      title: PLUGIN_ADMIN.PAGE_ACCESS
+      underline: true
+
+      fields:
+
+        header.login.visibility_requires_access:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS
+          help: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS_HELP
+          highlight: 0
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+
+        header.access:
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_ACCESS
+          help: PLUGIN_ADMIN.PAGE_ACCESS_HELP
+          ignore_empty: true
+          data_type: access
+          validate:
+            type: array
+            value_type: bool
+
+    _admin:
+      security@: {or: [admin.super, admin.configuration.pages]}
+      type: section
+      title: PLUGIN_ADMIN.PAGE PERMISSIONS
+      underline: true
+
+      fields:
+
+        header.permissions.inherit:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS
+          help: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS_HELP
+          highlight: 1
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+        header.permissions.authors:
+          type: list
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_AUTHORS
+          help: PLUGIN_ADMIN.PAGE_AUTHORS_HELP
+
+          fields:
+            value:
+              type: text
+              placeholder: PLUGIN_ADMIN.USERNAME
+              style: vertical
+
+        header.permissions.groups:
+          ignore@: true
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_GROUPS
+          help: PLUGIN_ADMIN.PAGE_GROUPS_HELP
+          ignore_empty: true
+          data_type: permissions

system/blueprints/pages/root.yaml

@@ -0,0 +1,16 @@
+title: PLUGIN_ADMIN.ROOT
+
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
+form:
+  validation: loose
+
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1

system/blueprints/user/account.yaml

@@ -67,6 +67,15 @@ form:
             default: 'en'
             help: PLUGIN_ADMIN.LANGUAGE_HELP
 
+        content_editor:
+            type: select
+            label: PLUGIN_ADMIN.CONTENT_EDITOR
+            size: medium
+            classes: fancy
+            data-options@: 'Grav\Plugin\Admin\Admin::contentEditor'
+            default: 'default'
+            help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP
+
         twofa_check:
             type: conditional
             condition: config.plugins.admin.twofa_enabled
@@ -99,6 +108,8 @@ form:
                     sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
 
+
+
         security:
             security@: admin.super
             title: PLUGIN_ADMIN.ACCESS_LEVELS
@@ -121,7 +132,9 @@ form:
                 access:
                     security@: admin.super
                     type: permissions
+                    check_authorize: true
                     label: PLUGIN_ADMIN.PERMISSIONS
                     ignore_empty: true
                     validate:
                         type: array
+                        value_type: bool

system/blueprints/user/account_new.yaml

@@ -13,6 +13,6 @@ form:
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
       unset-disabled@: true
-      unset-readonly@: true
+      unset-readonly@: true
       validate:
         required: true

system/blueprints/user/accounts.yaml

@@ -1,39 +0,0 @@
-title: User Accounts
-description: User Accounts
-type: flex-objects
-
-extends@: 'user/account'
-
-config:
-  admin:
-    list:
-      fields:
-        username:
-          link: edit
-          search: true
-        email:
-          search: true
-        fullname:
-          search: true
-      options:
-        per_page: 20
-        order:
-          by: username
-          dir: asc
-
-    menu:
-      list:
-        route: '/accounts'
-        title: Accounts
-        icon: fa-users
-        authorize: ['admin.users', 'admin.accounts', 'admin.super']
-
-form:
-  fields:
-    username:
-      flex-disabled@: exists
-      disabled: false
-      flex-readonly@: exists
-      readonly: false
-      validate:
-        required: true

system/blueprints/user/group.yaml

@@ -1,37 +1,55 @@
 title: Group
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
-    validation: loose
+  validation: loose
 
-    fields:
-        spacer:
-            type: spacer
-            text: '<br>'
+  fields:
+    groupname:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.GROUP_NAME
+      flex-disabled@: exists
+      flex-readonly@: exists
+      validate:
+        required: true
+        rule: slug
 
-        groupname:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.NAME
-            disabled: true
-            readonly: true
+    readableName:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DISPLAY_NAME
 
-        readableName:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN_PRO.READABLE_NAME
+    description:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DESCRIPTION
 
-        description:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.DESCRIPTION
+    icon:
+      type: text
+      size: small
+      label: PLUGIN_ADMIN.ICON
 
-        icon:
-            type: text
-            size: small
-            label: PLUGIN_ADMIN_PRO.ICON
+    enabled:
+      type: toggle
+      label: PLUGIN_ADMIN.ENABLED
+      highlight: 1
+      default: 1
+      options:
+        1: PLUGIN_ADMIN.YES
+        0: PLUGIN_ADMIN.NO
+      validate:
+        type: bool
 
-        access:
-            type: permissions
-            label: PLUGIN_ADMIN.PERMISSIONS
-            ignore_empty: true
-            validate:
-                type: array
+    access:
+      type: permissions
+      check_authorize: false
+      label: PLUGIN_ADMIN.PERMISSIONS
+      ignore_empty: true
+      validate:
+        type: array
+        value_type: bool

system/blueprints/user/group_new.yaml

@@ -1,5 +1,11 @@
 title: PLUGIN_ADMIN_PRO.ADD_GROUP
 
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
   validation: loose
   fields:
@@ -14,3 +20,4 @@ form:
       help: PLUGIN_ADMIN_PRO.GROUP_NAME_HELP
       validate:
         required: true
+        rule: slug

system/config/media.yaml

@@ -24,6 +24,10 @@ types:
     type: image
     thumb: media/thumb-png.png
     mime: image/png
+  webp:
+    type: image
+    thumb: media/thumb-webp.png
+    mime: image/webp
   gif:
     type: animated
     thumb: media/thumb-gif.png
@@ -103,7 +107,7 @@ types:
   docx:
     type: file
     thumb: media/thumb-docx.png
-    mime: application/msword
+    mime: application/vnd.openxmlformats-officedocument.wordprocessingml.document
   xls:
     type: file
     thumb: media/thumb-xls.png
@@ -111,7 +115,7 @@ types:
   xlsx:
     type: file
     thumb: media/thumb-xlsx.png
-    mime: application/vnd.ms-excel
+    mime: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
   ppt:
     type: file
     thumb: media/thumb-ppt.png
@@ -119,7 +123,7 @@ types:
   pptx:
     type: file
     thumb: media/thumb-pptx.png
-    mime: application/vnd.ms-powerpoint
+    mime: application/vnd.openxmlformats-officedocument.presentationml.presentation
   pps:
     type: file
     thumb: media/thumb-pps.png

system/config/permissions.yaml

@@ -0,0 +1,53 @@
+actions:
+  site:
+    type: access
+    label: Site
+  admin:
+    type: access
+    label: Admin
+  admin.pages:
+    type: access
+    label: Pages
+  admin.users:
+    type: access
+    label: User Accounts
+
+types:
+  default:
+    type: access
+
+  crud:
+    type: compact
+    letters:
+      c:
+        action: create
+        label: PLUGIN_ADMIN.CREATE
+      r:
+        action: read
+        label: PLUGIN_ADMIN.READ
+      u:
+        action: update
+        label: PLUGIN_ADMIN.UPDATE
+      d:
+        action: delete
+        label: PLUGIN_ADMIN.DELETE
+
+  crudp:
+    type: crud
+    letters:
+      p:
+        action: publish
+        label: PLUGIN_ADMIN.PUBLISH
+
+  crudl:
+    type: crud
+    letters:
+      l:
+        action: list
+        label: PLUGIN_ADMIN.LIST
+
+  crudpl:
+    type: crud
+    use:
+      - crudp
+      - crudl

system/config/security.yaml

@@ -36,3 +36,4 @@ uploads_dangerous_extensions:
     - htm
     - js
     - exe
+sanitize_svg: true

system/config/streams.yaml

@@ -1,16 +0,0 @@
-schemes:
-  image:
-    type: Stream
-    paths:
-      - user://images
-      - system://images
-
-  page:
-    type: ReadOnlyStream
-    paths:
-      - user://pages
-
-  account:
-    type: ReadOnlyStream
-    paths:
-      - user://accounts

system/config/system.yaml

@@ -20,18 +20,21 @@ languages:
   supported: []                                  # List of languages supported. eg: [en, fr, de]
   default_lang:                                  # Default is the first supported language. Must be one of the supported languages
   include_default_lang: true                     # Include the default lang prefix in all URLs
-  pages_fallback_only: false                     # Only fallback to find page content through supported languages
-  translations: true                             # Enable translations by default
+  include_default_lang_file_extension: true      # If true, include language code for the default language in file extension: default.en.md
+  translations: true                             # If false, translation keys are used instead of translated strings
   translations_fallback: true                    # Fallback through supported translations if active lang doesn't exist
   session_store_active: false                    # Store active language in session
   http_accept_language: false                    # Attempt to set the language based on http_accept_language header in the browser
   override_locale: false                         # Override the default or system locale with language specific one
+  content_fallback: {}                           # Custom language fallbacks. eg: {fr: ['fr', 'en']}
+  pages_fallback_only: false                     # DEPRECATED: Use `content_fallback` instead
 
 home:
   alias: '/home'                                 # Default path for home, ie /
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
+  type: regular                                  # EXPERIMENTAL: Page type: regular or flex
   theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
@@ -70,11 +73,11 @@ pages:
   expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
   last_modified: false                           # Set the last modified date header based on file modification timestamp
-  etag: false                                    # Set the etag header tag
+  etag: true                                     # Set the etag header tag
   vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
-  redirect_default_route: false                  # Automatically redirect to a page's default route
-  redirect_default_code: 302                     # Default code to use for redirects
-  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
+  redirect_default_code: 302                     # Default code to use for redirects: 301|302|303
+  redirect_trailing_slash: 1                     # Always redirect trailing slash with redirect code 0|1|301|302 (0: no redirect, 1: use default code)
+  redirect_default_route: 0                      # Always redirect to page's default route using code 0|1|301|302, also removes .htm and .html extensions
   ignore_files: [.DS_Store]                      # Files to ignore in Pages
   ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
   ignore_hidden: true                            # Ignore all Hidden files and folders
@@ -100,14 +103,18 @@ cache:
   allow_webserver_gzip: false                    # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
   redis:
     socket: false                                # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
+    password:                                    # Optional password
+    database:                                    # Optional database ID
 
 twig:
   cache: true                                    # Set to true to enable Twig caching
   debug: true                                    # Enable Twig debug
   auto_reload: true                              # Refresh cache on changes
-  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
+  autoescape: true                               # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
   undefined_functions: true                      # Allow undefined functions
   undefined_filters: true                        # Allow undefined filters
+  safe_functions: []                             # List of PHP functions which are allowed to be used as Twig functions
+  safe_filters: []                               # List of PHP functions which are allowed to be used as Twig filters
   umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775
 
 assets:                                          # Configuration for Assets Manager (JS, CSS)
@@ -122,6 +129,7 @@ assets:                                          # Configuration for Assets Mana
   js_pipeline_before_excludes: true              # Render the pipeline before any excluded files
   js_minify: true                                # Minify the JS during pipelining
   enable_asset_timestamp: false                  # Enable asset timestamps
+  enable_asset_sri: false                        # Enable asset SRI
   collections:
     jquery: system://assets/jquery/jquery-2.x.min.js
 
@@ -136,6 +144,8 @@ log:
 
 debugger:
   enabled: false                                 # Enable Grav debugger and following settings
+  provider: clockwork                            # Debugger provider: debugbar | clockwork
+  censored: false                                # Censor potentially sensitive information (POST parameters, cookies, files, configuration and most array/object data in log messages)
   shutdown:
     close_connection: true                       # Close the connection before calling onShutdown(). false for debugging
 
@@ -144,8 +154,14 @@ images:
   cache_all: false                               # Cache all image by default
   cache_perms: '0755'                            # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                                   # Show an overlay over images indicating the pixel depth of the image when working with retina for example
-  auto_fix_orientation: false                    # Automatically fix the image orientation based on the Exif data
+  auto_fix_orientation: true                     # Automatically fix the image orientation based on the Exif data
   seofriendly: false                             # SEO-friendly processed image names
+  cls:                                           # Cumulative Layout Shift: See https://web.dev/optimize-cls/
+    auto_sizes: false                            # Automatically add height/width to image
+    aspect_ratio: false                          # Reserve space with aspect ratio style
+    retina_scale: 1                              # scale to adjust auto-sizes for better handling of HiDPI resolutions
+  defaults:
+    loading: auto                                # Let browser pick [auto|lazy|eager]
 
 media:
   enable_media_timestamp: false                  # Enable media timestamps
@@ -161,8 +177,10 @@ session:
   uniqueness: path                               # Should sessions be `path` based or `security.salt` based
   secure: false                                  # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
   httponly: true                                 # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  samesite: Lax                                  # Set session SameSite. Possible values are Lax, Strict and None. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
   split: true                                    # Sessions should be independent between site and plugins (such as admin)
-  path:
+  domain:                                        # Domain used by sessions.
+  path:                                          # Path used by sessions.
 
 gpm:
   releases: stable                               # Set to either 'stable' or 'testing'
@@ -172,9 +190,22 @@ gpm:
   official_gpm_only: true                        # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security
 
 accounts:
-  type: data                                     # Account type: data or flex
-  storage: file                                  # Flex storage type: file or folder
+  type: regular                                  # EXPERIMENTAL: Account type: regular or flex
+  storage: file                                  # EXPERIMENTAL: Flex storage type: file or folder
+
+flex:
+  cache:
+    index:
+      enabled: true                             # Set to true to enable Flex index caching. Is used to cache timestamps in files
+      lifetime: 60                              # Lifetime of cached index in seconds (0 = infinite)
+    object:
+      enabled: true                             # Set to true to enable Flex object caching. Is used to cache object data
+      lifetime: 600                             # Lifetime of cached objects in seconds (0 = infinite)
+    render:
+      enabled: true                             # Set to true to enable Flex render caching. Is used to cache rendered output
+      lifetime: 600                             # Lifetime of cached HTML in seconds (0 = infinite)
 
 strict_mode:
-  yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
-  twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)
+  yaml_compat: false                            # Set to true to enable YAML backwards compatibility
+  twig_compat: false                            # Set to true to enable deprecated Twig settings (autoescape: false)
+  blueprint_compat: false                       # Set to true to enable backward compatible strict support for blueprints

system/defines.php

@@ -1,42 +1,90 @@
 <?php
+
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.27');
+define('GRAV_VERSION', '1.7.14');
+define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
 define('GRAV_TESTING', false);
-define('DS', '/');
 
+// PHP minimum requirement
 if (!defined('GRAV_PHP_MIN')) {
-    define('GRAV_PHP_MIN', '7.1.3');
+    define('GRAV_PHP_MIN', '7.3.6');
+}
+
+// Directory separator
+if (!defined('DS')) {
+    define('DS', '/');
 }
 
-// Directories and Paths
+// Absolute path to Grav root. This is where Grav is installed into.
 if (!defined('GRAV_ROOT')) {
-    define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, DS, getcwd()));
+    $path = rtrim(str_replace(DIRECTORY_SEPARATOR, DS, getenv('GRAV_ROOT') ?: getcwd()), DS);
+    define('GRAV_ROOT', $path);
+}
+// Absolute path to Grav webroot. This is the path where your site is located in.
+if (!defined('GRAV_WEBROOT')) {
+    $path = rtrim(getenv('GRAV_WEBROOT') ?: GRAV_ROOT, DS);
+    define('GRAV_WEBROOT', $path);
+}
+// Relative path to user folder. This path needs to be located under GRAV_WEBROOT.
+if (!defined('GRAV_USER_PATH')) {
+    $path = rtrim(getenv('GRAV_USER_PATH') ?: 'user', DS);
+    define('GRAV_USER_PATH', $path);
+}
+// Absolute or relative path to system folder. Defaults to GRAV_ROOT/system
+// If system folder is outside of webroot, see https://github.com/getgrav/grav/issues/3297#issuecomment-810294972
+if (!defined('GRAV_SYSTEM_PATH')) {
+    $path = rtrim(getenv('GRAV_SYSTEM_PATH') ?: 'system', DS);
+    define('GRAV_SYSTEM_PATH', $path);
 }
-define('ROOT_DIR', GRAV_ROOT . '/');
-define('USER_PATH', 'user/');
-define('USER_DIR', ROOT_DIR . USER_PATH);
-define('CACHE_DIR', ROOT_DIR . 'cache/');
+// Absolute or relative path to cache folder. Defaults to GRAV_ROOT/cache
+if (!defined('GRAV_CACHE_PATH')) {
+    $path = rtrim(getenv('GRAV_CACHE_PATH') ?: 'cache', DS);
+    define('GRAV_CACHE_PATH', $path);
+}
+// Absolute or relative path to logs folder. Defaults to GRAV_ROOT/logs
+if (!defined('GRAV_LOG_PATH')) {
+    $path = rtrim(getenv('GRAV_LOG_PATH') ?: 'logs', DS);
+    define('GRAV_LOG_PATH', $path);
+}
+// Absolute or relative path to tmp folder. Defaults to GRAV_ROOT/tmp
+if (!defined('GRAV_TMP_PATH')) {
+    $path = rtrim(getenv('GRAV_TMP_PATH') ?: 'tmp', DS);
+    define('GRAV_TMP_PATH', $path);
+}
+// Absolute or relative path to backup folder. Defaults to GRAV_ROOT/backup
+if (!defined('GRAV_BACKUP_PATH')) {
+    $path = rtrim(getenv('GRAV_BACKUP_PATH') ?: 'backup', DS);
+    define('GRAV_BACKUP_PATH', $path);
+}
+unset($path);
+
+// INTERNAL: Do not use!
+define('USER_DIR', GRAV_WEBROOT . '/' . GRAV_USER_PATH . '/');
+define('CACHE_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_CACHE_PATH) ? GRAV_ROOT . '/' : '') . GRAV_CACHE_PATH . '/');
 
 // DEPRECATED: Do not use!
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
-define('ACCOUNTS_DIR', USER_DIR .'accounts/');
-define('PAGES_DIR', USER_DIR .'pages/');
-define('DATA_DIR', USER_DIR .'data/');
-define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('LIB_DIR', SYSTEM_DIR .'src/');
-define('PLUGINS_DIR', USER_DIR .'plugins/');
-define('THEMES_DIR', USER_DIR .'themes/');
-define('VENDOR_DIR', ROOT_DIR .'vendor/');
-define('LOG_DIR', ROOT_DIR .'logs/');
+define('CACHE_PATH', GRAV_CACHE_PATH . DS);
+define('USER_PATH', GRAV_USER_PATH . DS);
+define('ROOT_DIR', GRAV_ROOT . DS);
+define('ASSETS_DIR', GRAV_WEBROOT . '/assets/');
+define('IMAGES_DIR', GRAV_WEBROOT . '/images/');
+define('ACCOUNTS_DIR', USER_DIR . 'accounts/');
+define('PAGES_DIR', USER_DIR . 'pages/');
+define('DATA_DIR', USER_DIR . 'data/');
+define('PLUGINS_DIR', USER_DIR . 'plugins/');
+define('THEMES_DIR', USER_DIR . 'themes/');
+define('SYSTEM_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_SYSTEM_PATH) ? GRAV_ROOT . '/' : '') . GRAV_SYSTEM_PATH . '/');
+define('LIB_DIR', SYSTEM_DIR . 'src/');
+define('VENDOR_DIR', GRAV_ROOT . '/vendor/');
+define('LOG_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_LOG_PATH) ? GRAV_ROOT . '/' : '') . GRAV_LOG_PATH . '/');
 // END DEPRECATED
 
 // Some extensions

system/install.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,8 +10,6 @@ if (!defined('GRAV_ROOT')) {
     die();
 }
 
-use Grav\Installer\Install;
-
 require_once __DIR__ . '/src/Grav/Installer/Install.php';
 
-return Install::instance();
+return Grav\Installer\Install::instance();

system/languages/ar.yaml

@@ -1,6 +1,17 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nالعنوان: %1$s\n---\n# خطأ: مادة أمامية غير صحيحة\n\nمسار: '%2$s'\n\n**%3$s**\n\n, , ,\n\n%4$s\n, , ,"
+  INFLECTOR_UNCOUNTABLE:
+    - 'معدّات'
+    - 'معلومات'
+    - 'أرز'
+    - 'مال'
+    - 'نوع'
+    - 'سلسلة'
+    - 'سمك'
+    - 'خروف'
+  INFLECTOR_IRREGULAR:
+    'person': 'أشخاص'
   NICETIME:
     NO_DATE_PROVIDED: لم يتم تقديم التاريخ
     BAD_DATE: تاريخ خاطئ
@@ -37,8 +48,8 @@ GRAV:
     YR_PLURAL: سنوات
     DEC_PLURAL: عقود
   FORM:
-    VALIDATION_FAIL: <b>فشل التحقق من صحة:</b>
-    INVALID_INPUT: إدخال غير صحيح في
+    VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+    INVALID_INPUT: 'إدخال غير صحيح في'
     MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
   MONTHS_OF_THE_YEAR:
     - 'كانون الثاني'
@@ -61,3 +72,11 @@ GRAV:
     - 'الجمعة'
     - 'السبت'
     - 'الأحد'
+  CRON:
+    EVERY: كل
+    EVERY_HOUR: كل ساعة
+    EVERY_MINUTE: كل دقيقة
+    EVERY_DAY_OF_WEEK: كل يوم في الأسبوع
+    EVERY_DAY_OF_MONTH: كل يوم في الشهر
+    EVERY_MONTH: ' كل شهر'
+    TEXT_PERIOD: كل <b />

system/languages/bg.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Неуспешна проверка:</b>
-    INVALID_INPUT: Невалидно въвеждане в
+    VALIDATION_FAIL: '<b>Неуспешна проверка:</b>'
+    INVALID_INPUT: 'Невалидно въвеждане в'
     MISSING_REQUIRED_FIELD: 'Липсва задължително поле:'
   MONTHS_OF_THE_YEAR:
     - 'януари'

system/languages/ca.yaml

@@ -1,6 +1,15 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# S'ha produït un error: Frontmatter invàlid\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'informació'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'
   NICETIME:
     NO_DATE_PROVIDED: No s'ha proporcionat data
     BAD_DATE: Data invàlida
@@ -36,8 +45,8 @@ GRAV:
     YR_PLURAL: anys
     DEC_PLURAL: dèc.
   FORM:
-    VALIDATION_FAIL: <b>Ha fallat la validació:</b>
-    INVALID_INPUT: Entrada no vàlida a
+    VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+    INVALID_INPUT: 'Entrada no vàlida a'
     MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
   MONTHS_OF_THE_YEAR:
     - 'Gener'

system/languages/cs.yaml

@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: r
     DEC_PLURAL: dek
   FORM:
-    VALIDATION_FAIL: <b>Ověření se nezdařilo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
+    XSS_ISSUES: "Byly zjištěny možné problémy XSS v poli '%s'"
   MONTHS_OF_THE_YEAR:
     - 'leden'
     - 'únor'
@@ -125,6 +126,8 @@ GRAV:
     - 'pátek'
     - 'sobota'
     - 'neděle'
+  YES: "Ano"
+  NO: "Ne"
   CRON:
     EVERY: každý
     EVERY_HOUR: každou hodinu

system/languages/da.yaml

@@ -1,11 +1,27 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nTitel: %1$s\n---\n\n# Fejl: Ugyldigt frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'udstyr'
+    - 'information'
+    - 'ris'
+    - 'penge'
+    - 'arter'
+    - 'Serier'
+    - 'fisk'
+    - 'får'
+  INFLECTOR_IRREGULAR:
+    'person': 'personer'
+    'man': 'mænd'
+    'child': 'børn'
+    'sex': 'køn'
+    'move': 'flyt'
   NICETIME:
     NO_DATE_PROVIDED: Ingen dato angivet
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nu
+    JUST_NOW: lige nu
     SECOND: sekund
     MINUTE: minut
     HOUR: time
@@ -15,6 +31,7 @@ GRAV:
     YEAR: år
     DECADE: årti
     SEC: sek
+    MIN: min.
     HR: t
     WK: u
     MO: md
@@ -36,8 +53,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Validering mislykkedes:</b>
-    INVALID_INPUT: Ugyldigt input i
+    VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+    INVALID_INPUT: 'Ugyldigt input i'
     MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -60,3 +77,14 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minut
+    EVERY_DAY_OF_WEEK: alle ugens dage
+    EVERY_DAY_OF_MONTH: alle dage i måneden
+    EVERY_MONTH: hver måned
+    TEXT_PERIOD: Hver <b />
+    TEXT_MINS: ' ved <b /> minut(ter) over timen'
+    ERROR1: Tagget %s understøttes ikke!
+    ERROR2: Ugyldigt antal elementer

system/languages/de.yaml

@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: Jahre
     DEC_PLURAL: Jahrzehnten
   FORM:
-    VALIDATION_FAIL: <b>Überprüfung fehlgeschlagen:</b>
-    INVALID_INPUT: Ungültige Eingabe in
+    VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
+    INVALID_INPUT: 'Ungültige Eingabe in'
     MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:'
+    XSS_ISSUES: "Potenzielle XSS-Probleme im Feld '%s' erkannt"
   MONTHS_OF_THE_YEAR:
     - 'Januar'
     - 'Februar'
@@ -125,6 +126,8 @@ GRAV:
     - 'Freitag'
     - 'Samstag'
     - 'Sonntag'
+  YES: "Ja"
+  NO: "Nein"
   CRON:
     EVERY: jede
     EVERY_HOUR: jede Stunde

system/languages/el.yaml

@@ -1,11 +1,75 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nΤίτλος: %1$s\n---\n\n# Σφάλμα: Μη έγκυρη διαδρομή Frontmatter\n\nΔιαδρομή: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'εξοπλισμός'
+    - 'πληροφοριες'
+    - 'rice'
+    - 'χρήματα'
+    - 'είδη'
+    - 'σειρές'
+    - 'ψάρι'
+    - 'πρόβατο'
+  INFLECTOR_IRREGULAR:
+    'person': 'άνθρωποι'
+    'man': 'άνδρες'
+    'child': 'παιδιά'
+    'sex': 'φύλο'
+    'move': 'κινήσεις'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
   NICETIME:
     NO_DATE_PROVIDED: Δεν δόθηκε καμία ημερομηνία
     BAD_DATE: Εσφαλμένη ημερομηνία
     AGO: πρίν
     FROM_NOW: από τώρα
+    JUST_NOW: μόλις τώρα
     SECOND: δευτερόλεπτο
     MINUTE: λεπτό
     HOUR: ώρα
@@ -37,8 +101,8 @@ GRAV:
     YR_PLURAL: έτη
     DEC_PLURAL: δεκαετίες
   FORM:
-    VALIDATION_FAIL: <b>Η επικύρωση απέτυχε:</b>
-    INVALID_INPUT: Μη έγκυρα δεδομένα σε
+    VALIDATION_FAIL: '<b>Η επικύρωση απέτυχε:</b>'
+    INVALID_INPUT: 'Μη έγκυρα δεδομένα σε'
     MISSING_REQUIRED_FIELD: 'Λείπει το απαιτούμενο πεδίο:'
   MONTHS_OF_THE_YEAR:
     - 'Ιανουάριος'
@@ -61,3 +125,20 @@ GRAV:
     - 'Παρασκευή'
     - 'Σάββατο'
     - 'Κυριακή'
+  CRON:
+    EVERY: κάθε
+    EVERY_HOUR: κάθε ώρα
+    EVERY_MINUTE: κάθε λεπτό
+    EVERY_DAY_OF_WEEK: κάθε μέρα της εβδομάδος
+    EVERY_DAY_OF_MONTH: κάθε μέρα του μήνα
+    EVERY_MONTH: κάθε μήνα
+    TEXT_PERIOD: Κάθε <b />
+    TEXT_MINS: ' κατά <b /> λεπτό(ά) μετά την ώρα'
+    TEXT_TIME: ' στο <b />:<b />'
+    TEXT_DOW: ' στις <b />'
+    TEXT_MONTH: ' από <b />'
+    TEXT_DOM: ' στις <b />'
+    ERROR1: Η ετικέτα %s δεν υποστηρίζεται!
+    ERROR2: Μη έγκυρος αριθμός στοιχείων
+    ERROR3: Το jquery_element θα έπρεπε να οριστεί στις ρυθμίσεις του jqCron
+    ERROR4: Μη αναγνωρισμένη έκφραση

system/languages/en.yaml

@@ -94,9 +94,10 @@ GRAV:
         YR_PLURAL: yrs
         DEC_PLURAL: decs
     FORM:
-        VALIDATION_FAIL: <b>Validation failed:</b>
-        INVALID_INPUT: Invalid input in
-        MISSING_REQUIRED_FIELD: Missing required field:
+        VALIDATION_FAIL: '<b>Validation failed:</b>'
+        INVALID_INPUT: 'Invalid input in'
+        MISSING_REQUIRED_FIELD: 'Missing required field:'
+        XSS_ISSUES: "Potential XSS issues detected in '%s' field"
     MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
     DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
     YES: "Yes"

system/languages/es.yaml

@@ -1,19 +1,25 @@
 ---
 GRAV:
-  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Frontmatter no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Prefacio no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1ios'
+    '/s$/i': 's'
+    '/$/': 's'
   INFLECTOR_UNCOUNTABLE:
-    - 'equipo'
+    - 'equipamiento'
     - 'información'
-    - 'rice'
+    - 'arroz'
     - 'dinero'
-    - 'species'
+    - 'especies'
     - 'series'
     - 'pescado'
     - 'oveja'
   INFLECTOR_IRREGULAR:
+    'person': 'personas'
     'man': 'hombres'
     'child': 'niños'
     'sex': 'sexos'
+    'move': 'movido'
   INFLECTOR_ORDINALS:
     'first': 'ro'
     'second': 'do'
@@ -33,10 +39,12 @@ GRAV:
     YEAR: año
     DECADE: década
     SEC: seg
+    MIN: min
     HR: h
     WK: sem
     MO: mes
     YR: año
+    DEC: dic
     SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
     HOUR_PLURAL: horas
@@ -46,6 +54,7 @@ GRAV:
     YEAR_PLURAL: años
     DECADE_PLURAL: décadas
     SEC_PLURAL: segs
+    MIN_PLURAL: mins
     HR_PLURAL: hs
     WK_PLURAL: sem
     MO_PLURAL: mes
@@ -55,6 +64,7 @@ GRAV:
     VALIDATION_FAIL: '<b>Falló la validación: </b>'
     INVALID_INPUT: 'Dato inválido en: '
     MISSING_REQUIRED_FIELD: 'Falta el campo requerido: '
+    XSS_ISSUES: "Se detectaron problemas XSS potenciales en el campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Enero'
     - 'Febrero'
@@ -76,6 +86,8 @@ GRAV:
     - 'Viernes'
     - 'Sábado'
     - 'Domingo'
+  YES: "Si"
+  NO: "No"
   CRON:
     EVERY: cada
     EVERY_HOUR: cada hora

system/languages/et.yaml

@@ -1,11 +1,22 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(octop|vir)us$/i': '\1i'
+  INFLECTOR_SINGULAR:
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
   INFLECTOR_UNCOUNTABLE:
     - 'equipment'
     - 'informatsioon'
-    - 'rice'
-    - 'money'
+    - 'riis'
+    - 'raha'
     - 'species'
     - 'series'
     - 'kala'
@@ -34,6 +45,7 @@ GRAV:
     YEAR: aasta
     DECADE: 10 aastat
     SEC: sek
+    MIN: min
     HR: t
     WK: näd
     MO: k.
@@ -55,7 +67,7 @@ GRAV:
     YR_PLURAL: aastat
     DEC_PLURAL: dek.
   FORM:
-    VALIDATION_FAIL: <b>Kinnitamine nurjus:</b>
+    VALIDATION_FAIL: '<b>Kinnitamine nurjus:</b>'
     INVALID_INPUT: 'Vigane sisend:'
     MISSING_REQUIRED_FIELD: 'Nõutud väli puudub:'
   MONTHS_OF_THE_YEAR:
@@ -81,5 +93,12 @@ GRAV:
     - 'pühapäev'
   CRON:
     EVERY: iga
+    EVERY_HOUR: iga tund
+    EVERY_MINUTE: iga minut
+    EVERY_DAY_OF_WEEK: iga nädala päev
     EVERY_MONTH: iga kuu
     TEXT_PERIOD: Iga <b />
+    ERROR1: Silt %s pole toetatud!
+    ERROR2: Vale elementide arv
+    ERROR3: jqCron seadetes peaks olema määratud jquery_element
+    ERROR4: Tundmatu väljend

system/languages/eu.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: urt
     DEC_PLURAL: ham
   FORM:
-    VALIDATION_FAIL: <b>Balidazioak huts egin du</b>
-    INVALID_INPUT: Baliogabeko sarrera
+    VALIDATION_FAIL: '<b>Balidazioak huts egin du</b>'
+    INVALID_INPUT: 'Baliogabeko sarrera'
     MISSING_REQUIRED_FIELD: 'Derrigorrezko eremua bete gabe:'
   MONTHS_OF_THE_YEAR:
     - 'Urtarrila'

system/languages/fa.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: سال
     DEC_PLURAL: دهه
   FORM:
-    VALIDATION_FAIL: <b>سنجش اعتبار ناموفق بود</b>
-    INVALID_INPUT: ورودی نامعتبر در
+    VALIDATION_FAIL: '<b>سنجش اعتبار ناموفق بود</b>'
+    INVALID_INPUT: 'ورودی نامعتبر در'
     MISSING_REQUIRED_FIELD: 'قسمت ضروری جا افتاده:'
   MONTHS_OF_THE_YEAR:
     - 'ژانویه'

system/languages/fi.yaml

@@ -100,8 +100,8 @@ GRAV:
     YR_PLURAL: v
     DEC_PLURAL: vuosikymmentä
   FORM:
-    VALIDATION_FAIL: <b>Vahvistus epäonnistui:</b>
-    INVALID_INPUT: Syöte ei kelpaa
+    VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+    INVALID_INPUT: 'Syöte ei kelpaa'
     MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
   MONTHS_OF_THE_YEAR:
     - 'Tammikuu'

system/languages/fr.yaml

@@ -16,6 +16,7 @@ GRAV:
     '/(buffal|tomat)o$/i': '\1es'
     '/(bu)s$/i': 'Bus'
     '/(alias|status)/i': 'alias|status'
+    '/(octop|vir)us$/i': 'virus'
     '/(ax|test)is$/i': '\1s'
     '/s$/i': 's'
     '/$/': 's'
@@ -80,30 +81,30 @@ GRAV:
     YR_PLURAL: a
     DEC_PLURAL: décs
   FORM:
-    VALIDATION_FAIL: <b>La validation a échoué :</b>
-    INVALID_INPUT: Saisie non valide
+    VALIDATION_FAIL: '<b>La validation a échoué :</b>'
+    INVALID_INPUT: 'Saisie non valide'
     MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :'
   MONTHS_OF_THE_YEAR:
-    - 'Janvier'
-    - 'Février'
-    - 'Mars'
-    - 'Avril'
-    - 'Mai'
-    - 'Juin'
-    - 'Juillet'
-    - 'Août'
-    - 'Septembre'
-    - 'Octobre'
-    - 'Novembre'
-    - 'Décembre'
+    - 'janvier'
+    - 'février'
+    - 'mars'
+    - 'avril'
+    - 'mai'
+    - 'juin'
+    - 'juillet'
+    - 'août'
+    - 'septembre'
+    - 'octobre'
+    - 'novembre'
+    - 'décembre'
   DAYS_OF_THE_WEEK:
-    - 'Lundi'
-    - 'Mardi'
-    - 'Mercredi'
-    - 'Jeudi'
-    - 'Vendredi'
-    - 'Samedi'
-    - 'Dimanche'
+    - 'lundi'
+    - 'mardi'
+    - 'mercredi'
+    - 'jeudi'
+    - 'vendredi'
+    - 'samedi'
+    - 'dimanche'
   CRON:
     EVERY: chaque
     EVERY_HOUR: toutes les heures

system/languages/gl.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Erro: Limiar incorrecto\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1'
+    '/(octop|vir)us$/i': '\1'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1ces'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1'
+    '/(cris|ax|test)es$/i': '\1es'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1se'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2se'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipo'
+    - 'información'
+    - 'arroz'
+    - 'diñeiro'
+    - 'especies'
+    - 'series'
+    - 'peixe'
+    - 'ovella'
+  INFLECTOR_IRREGULAR:
+    'person': 'xente'
+    'man': 'home'
+    'child': 'neno'
+    'sex': 'sexos'
+    'move': 'move'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
+  NICETIME:
+    NO_DATE_PROVIDED: Non fornece unha data
+    BAD_DATE: Data errada
+    AGO: hai
+    FROM_NOW: dende agora
+    JUST_NOW: xusto agora
+    SECOND: segundo
+    MINUTE: minuto
+    HOUR: hora
+    DAY: día
+    WEEK: semana
+    MONTH: mes
+    YEAR: ano
+    DECADE: década
+    SEC: seg
+    MIN: min
+    HR: hr 
+    WK: Sem
+    MO: m
+    YR: a
+    DEC: dec
+    SECOND_PLURAL: segundos
+    MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
+    DAY_PLURAL: días
+    WEEK_PLURAL: semanas
+    MONTH_PLURAL: meses
+    YEAR_PLURAL: anos
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sem
+    MO_PLURAL: mes
+    YR_PLURAL: a
+    DEC_PLURAL: deca
+  FORM:
+    VALIDATION_FAIL: '<b>Fallou a validación:</b>'
+    INVALID_INPUT: 'Entrada incorrecta en'
+    MISSING_REQUIRED_FIELD: 'Falta un campo requirido:'
+  MONTHS_OF_THE_YEAR:
+    - 'xaneiro'
+    - 'febreiro'
+    - 'marzo'
+    - 'abril'
+    - 'maio'
+    - 'xuño'
+    - 'xullo'
+    - 'agosto'
+    - 'setembro'
+    - 'outubro'
+    - 'novembro'
+    - 'decembro'
+  DAYS_OF_THE_WEEK:
+    - 'luns'
+    - 'martes'
+    - 'mércores'
+    - 'xoves'
+    - 'venres'
+    - 'sábado'
+    - 'domingo'
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: Cada hora
+    EVERY_MINUTE: Cada minuto
+    EVERY_DAY_OF_WEEK: cada día da semana
+    EVERY_DAY_OF_MONTH: cada día do mes
+    EVERY_MONTH: cada mes
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' dentro de <b /> minuto(s) despois da hora'
+    TEXT_TIME: ' dentro <b />:<b />'
+    TEXT_DOW: ' o <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' o <b />'
+    ERROR1: A etiqueta %s non é compatíbel!
+    ERROR2: Mal número de elementos
+    ERROR3: O jquery_element debería estar determinado na configuración de jqCron
+    ERROR4: Expresión non recoñecida

system/languages/he.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: שני'
     DEC_PLURAL: עש'
   FORM:
-    VALIDATION_FAIL: <b>האימות נכשל:</b>
-    INVALID_INPUT: קלט לא חוקי
+    VALIDATION_FAIL: '<b>האימות נכשל:</b>'
+    INVALID_INPUT: 'קלט לא חוקי'
     MISSING_REQUIRED_FIELD: 'שדות חובה חסרים:'
   MONTHS_OF_THE_YEAR:
     - 'ינואר'

system/languages/hr.yaml

@@ -50,8 +50,8 @@ GRAV:
     YR_PLURAL: g
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Validacija nije uspjela:</b>
-    INVALID_INPUT: Pogrešan unos u
+    VALIDATION_FAIL: '<b>Validacija nije uspjela:</b>'
+    INVALID_INPUT: 'Pogrešan unos u'
     MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Siječanj'

system/languages/hu.yaml

@@ -58,7 +58,7 @@ GRAV:
     YR_PLURAL: év
     DEC_PLURAL: évt
   FORM:
-    VALIDATION_FAIL: <b>Érvényesítés nem sikerült:</b>
+    VALIDATION_FAIL: '<b>Érvényesítés nem sikerült:</b>'
     INVALID_INPUT: 'A megadott érték érvénytelen:'
     MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
   MONTHS_OF_THE_YEAR:

system/languages/id.yaml

@@ -1,6 +1,8 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Frontmatter tidak valid\n\nLokasi: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
   INFLECTOR_UNCOUNTABLE:
     - 'peralatan'
     - 'informasi'
@@ -53,8 +55,8 @@ GRAV:
     YR_PLURAL: thn
     DEC_PLURAL: dekade
   FORM:
-    VALIDATION_FAIL: <b>Validasi gagal:</b>
-    INVALID_INPUT: Input tidak valid di
+    VALIDATION_FAIL: '<b>Validasi gagal:</b>'
+    INVALID_INPUT: 'Input tidak valid di'
     MISSING_REQUIRED_FIELD: 'Data yang diperlukan belum terisi:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'

system/languages/is.yaml

@@ -46,8 +46,8 @@ GRAV:
     YR_PLURAL: árum
     DEC_PLURAL: árat
   FORM:
-    VALIDATION_FAIL: <b>Sannvottun mistókst:</b>
-    INVALID_INPUT: Ógilt inntak í
+    VALIDATION_FAIL: '<b>Sannvottun mistókst:</b>'
+    INVALID_INPUT: 'Ógilt inntak í'
     MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:'
   MONTHS_OF_THE_YEAR:
     - 'janúar'

system/languages/it.yaml

@@ -1,6 +1,49 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
   INFLECTOR_UNCOUNTABLE:
     - 'dotazione'
     - 'informazione'
@@ -58,9 +101,10 @@ GRAV:
     YR_PLURAL: anni
     DEC_PLURAL: decenni
   FORM:
-    VALIDATION_FAIL: <b>Validazione fallita:</b>
-    INVALID_INPUT: Input non valido in
+    VALIDATION_FAIL: '<b>Validazione fallita:</b>'
+    INVALID_INPUT: 'Input non valido in'
     MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
+    XSS_ISSUES: "Rilevati potenziali problemi di XSS nel campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Gennaio'
     - 'Febbraio'
@@ -82,6 +126,8 @@ GRAV:
     - 'Venerdì'
     - 'Sabato'
     - 'Domenica'
+  YES: "Sì"
+  NO: "No"
   CRON:
     EVERY: ogni
     EVERY_HOUR: ogni ora

system/languages/ja.yaml

@@ -1,11 +1,22 @@
 ---
 GRAV:
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - '情報'
+    - 'rice'
+    - 'お金'
+    - 'species'
+    - 'series'
+    - '魚'
+    - 'ヒツジ'
   INFLECTOR_IRREGULAR:
     'person': 'みんな'
     'man': '人'
     'child': '子供'
     'sex': '性別'
     'move': '移動'
+  INFLECTOR_ORDINALS:
+    'first': '番目'
   NICETIME:
     NO_DATE_PROVIDED: 日付が設定されていません
     BAD_DATE: 不正な日付
@@ -40,8 +51,8 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 10年
   FORM:
-    VALIDATION_FAIL: <b>バリデーション失敗 :</b>
-    INVALID_INPUT: 不正な入力：
+    VALIDATION_FAIL: '<b>バリデーション失敗 :</b>'
+    INVALID_INPUT: '不正な入力：'
     MISSING_REQUIRED_FIELD: '必須項目が入力されていません:'
   MONTHS_OF_THE_YEAR:
     - '1月'
@@ -64,3 +75,7 @@ GRAV:
     - '金'
     - '土'
     - '日'
+  CRON:
+    EVERY: 毎
+    EVERY_MONTH: 毎月
+    ERROR1: 共有タイプ %s はサポートされていません

system/languages/ko.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: 년
     DEC_PLURAL: 년간
   FORM:
-    VALIDATION_FAIL: <b>유효성 검사 실패:</b>
-    INVALID_INPUT: 잘못된 입력
+    VALIDATION_FAIL: '<b>유효성 검사 실패:</b>'
+    INVALID_INPUT: '잘못된 입력'
     MISSING_REQUIRED_FIELD: '누락 된 필수 필드:'
   MONTHS_OF_THE_YEAR:
     - '일월'

system/languages/lt.yaml

@@ -52,8 +52,8 @@ GRAV:
     YR_PLURAL: m.
     DEC_PLURAL: dešimtmečiai
   FORM:
-    VALIDATION_FAIL: <b>Patvirtinimas nepavyko:</b>
-    INVALID_INPUT: Neteisingai įvesta į
+    VALIDATION_FAIL: '<b>Patvirtinimas nepavyko:</b>'
+    INVALID_INPUT: 'Neteisingai įvesta į'
     MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:'
   MONTHS_OF_THE_YEAR:
     - 'Sausis'

system/languages/nl.yaml

@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: jaren
     DEC_PLURAL: decennia
   FORM:
-    VALIDATION_FAIL: <b>Validatie mislukt:</b>
-    INVALID_INPUT: Ongeldige invoer in
+    VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+    INVALID_INPUT: 'Ongeldige invoer in'
     MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'

system/languages/no.yaml

@@ -21,6 +21,7 @@ GRAV:
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nå
+    JUST_NOW: akkurat nå
     SECOND: sekund
     MINUTE: minutt
     HOUR: time
@@ -51,8 +52,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Godkjenning mislyktes:</b>
-    INVALID_INPUT: Ugyldig innhold i
+    VALIDATION_FAIL: '<b>Godkjenning mislyktes:</b>'
+    INVALID_INPUT: 'Ugyldig innhold i'
     MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -75,3 +76,7 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minutt

system/languages/pl.yaml

@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Nieprawidłowy Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_SINGULAR:
+    '/(alias|status)es$/i': '\1'
+  INFLECTOR_UNCOUNTABLE:
+    - 'wyposażenie'
+    - 'informacja'
+    - 'rice'
+    - 'pieniądze'
+    - 'species'
+    - 'series'
+    - 'ryba'
+    - 'owca'
+  INFLECTOR_IRREGULAR:
+    'person': 'człowiek'
+    'man': 'mężczyźni'
+    'child': 'dzieci'
+    'sex': 'płci'
+  INFLECTOR_ORDINALS:
+    'first': 'pierwszy'
+    'second': 'drugi'
+    'third': 'trzeci'
   NICETIME:
     NO_DATE_PROVIDED: Nie podano daty
     BAD_DATE: Zła data
     AGO: temu
     FROM_NOW: od teraz
+    JUST_NOW: właśnie teraz
     SECOND: sekunda
     MINUTE: minuta
     HOUR: godzina
@@ -15,6 +36,7 @@ GRAV:
     YEAR: rok
     DECADE: dekada
     SEC: sek
+    MIN: minuta
     HR: godz
     WK: tydz
     MO: m-c
@@ -36,9 +58,10 @@ GRAV:
     YR_PLURAL: lat
     DEC_PLURAL: dekad
   FORM:
-    VALIDATION_FAIL: <b>Weryfikacja nie powiodła się:</b>
-    INVALID_INPUT: Nieprawidłowe dane wejściowe
+    VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
+    INVALID_INPUT: 'Nieprawidłowe dane wejściowe'
     MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
+    XSS_ISSUES: "Potencjalne problemy XSS wykryte w polu '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Styczeń'
     - 'Luty'
@@ -60,3 +83,18 @@ GRAV:
     - 'Piątek'
     - 'Sobota'
     - 'Niedziela'
+  YES: "Tak"
+  NO: "Nie"
+  CRON:
+    EVERY: każdy
+    EVERY_HOUR: każdą godzinę
+    EVERY_MINUTE: każdą minutę
+    EVERY_DAY_OF_WEEK: każdego dnia tygodnia
+    EVERY_DAY_OF_MONTH: każdego dnia miesiące
+    EVERY_MONTH: każdego miesiąca
+    TEXT_PERIOD: Każdego <b />
+    TEXT_MINS: 'o <b /> minut po godzinie'
+    TEXT_TIME: 'o <b />:<b />'
+    ERROR1: Znacznik %s nie jest wspierany!
+    ERROR2: Nieprawidłowa liczba elementów
+    ERROR4: Wyrażenie nierozpoznane

system/languages/pt.yaml

@@ -1,8 +1,75 @@
 ---
 GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Erro: Frontmatter Inválido\n\nLocalização: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipamento'
+    - 'informação'
+    - 'arroz'
+    - 'dinheiro'
+    - 'espécie'
+    - 'série'
+    - 'peixe'
+    - 'ovelha'
+  INFLECTOR_IRREGULAR:
+    'person': 'pessoas'
+    'man': 'homens'
+    'child': 'crianças'
+    'sex': 'sexos'
+    'move': 'movimentos'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
   NICETIME:
     NO_DATE_PROVIDED: Nenhuma data fornecida
+    BAD_DATE: Data inválida
     AGO: atrás
+    FROM_NOW: a partir de agora
+    JUST_NOW: mesmo agora
     SECOND: segundo
     MINUTE: minuto
     HOUR: hora
@@ -11,17 +78,32 @@ GRAV:
     MONTH: mês
     YEAR: ano
     DECADE: década
-    SEC: segundos
-    MIN: minutos
+    SEC: seg
+    MIN: min
+    HR: hora
+    WK: semana
+    MO: mês
+    YR: ano
+    DEC: década
+    SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
     DAY_PLURAL: dias
     WEEK_PLURAL: semanas
     MONTH_PLURAL: meses
     YEAR_PLURAL: anos
-    DECADE_PLURAL: decadas
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sems
+    MO_PLURAL: meses
+    YR_PLURAL: anos
+    DEC_PLURAL: décadas
   FORM:
-    VALIDATION_FAIL: <b>Falha na validação!</b>
-    MISSING_REQUIRED_FIELD: 'Campo obrigatório requerido:'
+    VALIDATION_FAIL: '<b>Falha na validação:</b>'
+    INVALID_INPUT: 'Dados inseridos são inválidos em'
+    MISSING_REQUIRED_FIELD: 'Campo obrigatório em falta:'
   MONTHS_OF_THE_YEAR:
     - 'Janeiro'
     - 'Fevereiro'
@@ -35,12 +117,28 @@ GRAV:
     - 'Outubro'
     - 'Novembro'
     - 'Dezembro'
-  INFLECTOR_UNCOUNTABLE:
-    - 'equipment'
-    - 'information'
-    - 'arroz'
-    - 'money'
-    - 'species'
-    - 'series'
-    - 'fish'
-    - 'sheep'
+  DAYS_OF_THE_WEEK:
+    - 'Segunda-feira'
+    - 'Terça-feira'
+    - 'Quarta-feira'
+    - 'Quinta-feira'
+    - 'Sexta-feira'
+    - 'Sábado'
+    - 'Domingo'
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: cada hora
+    EVERY_MINUTE: cada minuto
+    EVERY_DAY_OF_WEEK: todos os dias da semana
+    EVERY_DAY_OF_MONTH: todos os dias do mês
+    EVERY_MONTH: todos os meses
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' em <b /> minuto(s) após a hora'
+    TEXT_TIME: ' em <b />:<b />'
+    TEXT_DOW: ' em <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' em <b />'
+    ERROR1: A tag %s não é suportada!
+    ERROR2: Número de elementos inválido
+    ERROR3: O jquery_element deve ser definido nas configurações do jqCron
+    ERROR4: Expressão não reconhecida

system/languages/ro.yaml

@@ -53,8 +53,8 @@ GRAV:
     YR_PLURAL: ani
     DEC_PLURAL: decenii
   FORM:
-    VALIDATION_FAIL: <b>Validare nereușită</b>
-    INVALID_INPUT: Date incorecte în
+    VALIDATION_FAIL: '<b>Validare nereușită</b>'
+    INVALID_INPUT: 'Date incorecte în'
     MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
   MONTHS_OF_THE_YEAR:
     - 'Ianuarie'

system/languages/ru.yaml

@@ -13,7 +13,7 @@ GRAV:
   INFLECTOR_IRREGULAR:
     'person': 'люди'
     'man': 'человек'
-    'child': 'ребенок'
+    'child': 'дети'
     'sex': 'пол'
     'move': 'движется'
   INFLECTOR_ORDINALS:
@@ -58,9 +58,10 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Проверка не удалась:</b>
-    INVALID_INPUT: Неверный ввод в
+    VALIDATION_FAIL: '<b>Проверка не удалась:</b>'
+    INVALID_INPUT: 'Неверный ввод в'
     MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:'
+    XSS_ISSUES: "Обнаружены потенциальные XSS проблемы в поле '%s'"
   MONTHS_OF_THE_YEAR:
     - 'январь'
     - 'февраль'
@@ -68,12 +69,12 @@ GRAV:
     - 'апрель'
     - 'май'
     - 'июнь'
-    - 'Июль'
-    - 'Август'
-    - 'Сентябрь'
-    - 'Октябрь'
-    - 'Ноябрь'
-    - 'Декабрь'
+    - 'июль'
+    - 'август'
+    - 'сентябрь'
+    - 'октябрь'
+    - 'ноябрь'
+    - 'декабрь'
   DAYS_OF_THE_WEEK:
     - 'понедельник'
     - 'вторник'
@@ -82,6 +83,8 @@ GRAV:
     - 'пятница'
     - 'суббота'
     - 'воскресенье'
+  YES: "Да"
+  NO: "Нет"
   CRON:
     EVERY: раз в
     EVERY_HOUR: раз в час

system/languages/sk.yaml

@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: rokov
     DEC_PLURAL: dekád
   FORM:
-    VALIDATION_FAIL: <b>Overenie zlyhalo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
   MONTHS_OF_THE_YEAR:
     - 'Január'

system/languages/sl.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: l
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Preverjanje veljavnosti ni uspelo:</b>
-    INVALID_INPUT: Neveljaven vnos v
+    VALIDATION_FAIL: '<b>Preverjanje veljavnosti ni uspelo:</b>'
+    INVALID_INPUT: 'Neveljaven vnos v'
     MISSING_REQUIRED_FIELD: 'Manjka obvezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Januar'

system/languages/sr.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nнаслов: %1$s\n---\n\n# Грешка: неисправан Frontmatter\n\nПутања: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'опрема'
+    - 'информација'
+    - 'пиринач'
+    - 'новац'
+    - 'врсте'
+    - 'серије'
+    - 'риба'
+    - 'овца'
+  INFLECTOR_IRREGULAR:
+    'person': 'особе'
+    'man': 'људи'
+    'child': 'деца'
+    'sex': 'полови'
+    'move': 'помери'
+  INFLECTOR_ORDINALS:
+    'default': 'ти'
+    'first': 'први'
+    'second': 'други'
+    'third': 'трећи'
+  NICETIME:
+    NO_DATE_PROVIDED: Нема датума
+    BAD_DATE: Погрешан датум
+    AGO: од пре
+    FROM_NOW: од сада
+    JUST_NOW: управо сада
+    SECOND: секунда
+    MINUTE: минута
+    HOUR: сат
+    DAY: дан
+    WEEK: недеља
+    MONTH: месец
+    YEAR: година
+    DECADE: декада
+    SEC: сек
+    MIN: мин
+    HR: сат
+    WK: нед
+    MO: мес
+    YR: год
+    DEC: дек
+    SECOND_PLURAL: секунди
+    MINUTE_PLURAL: минута
+    HOUR_PLURAL: сати
+    DAY_PLURAL: дана
+    WEEK_PLURAL: недеља
+    MONTH_PLURAL: месеци
+    YEAR_PLURAL: године(а)
+    DECADE_PLURAL: декаде(а)
+    SEC_PLURAL: сек
+    MIN_PLURAL: мин
+    HR_PLURAL: сати
+    WK_PLURAL: недеља
+    MO_PLURAL: месеци
+    YR_PLURAL: година
+    DEC_PLURAL: декада
+  FORM:
+    VALIDATION_FAIL: '<b>Провера неуспела:</b>'
+    INVALID_INPUT: 'Неисправан унос у'
+    MISSING_REQUIRED_FIELD: 'Недостаје обавезн поље:'
+  MONTHS_OF_THE_YEAR:
+    - 'Јануар'
+    - 'Фебруар'
+    - 'Март'
+    - 'Април'
+    - 'Мај'
+    - 'Јуни'
+    - 'Јули'
+    - 'Август'
+    - 'Септембар'
+    - 'Октобар'
+    - 'Новембар'
+    - 'Децембар'
+  DAYS_OF_THE_WEEK:
+    - 'Понедељак'
+    - 'Уторак'
+    - 'Среда'
+    - 'Четвртак'
+    - 'Петак'
+    - 'Субота'
+    - 'Недеља'
+  CRON:
+    EVERY: сваки
+    EVERY_HOUR: сваки сат
+    EVERY_MINUTE: сваки минут
+    EVERY_DAY_OF_WEEK: сваки дан у недељи
+    EVERY_DAY_OF_MONTH: сваки дан у месецу
+    EVERY_MONTH: сваки месец
+    TEXT_PERIOD: Сваки <b />
+    TEXT_MINS: ' у <b /> минути(а) прошлог сата'
+    TEXT_TIME: ' у <b />:<b />'
+    TEXT_DOW: ' на <b />'
+    TEXT_MONTH: ' од <b />'
+    TEXT_DOM: ' на <b />'
+    ERROR1: Таг %s није подржан!
+    ERROR2: Погрешан број елемената
+    ERROR3: јquery_element би требао да буде постављен у jqCron подешавању
+    ERROR4: Непрепознат израз

system/languages/sv.yaml

@@ -12,11 +12,21 @@ GRAV:
     - 'får'
   INFLECTOR_IRREGULAR:
     'person': 'personer'
+    'man': 'män'
+    'child': 'barn'
+    'sex': 'kön'
+    'move': 'flytta'
+  INFLECTOR_ORDINALS:
+    'default': ':e'
+    'first': ':a'
+    'second': ':a'
+    'third': ':e'
   NICETIME:
     NO_DATE_PROVIDED: Inget datum har angivits
     BAD_DATE: Ogiltigt datum
     AGO: sedan
     FROM_NOW: fr.o.m nu
+    JUST_NOW: just nu
     SECOND: sekund
     MINUTE: minut
     HOUR: timme
@@ -26,10 +36,12 @@ GRAV:
     YEAR: år
     DECADE: årtionde
     SEC: sek
+    MIN: min
     HR: t
     WK: v
     MO: m
     YR: år
+    DEC: dec
     SECOND_PLURAL: sekunder
     MINUTE_PLURAL: minuter
     HOUR_PLURAL: timmar
@@ -46,8 +58,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: dec
   FORM:
-    VALIDATION_FAIL: <b>Kontrollen misslyckades:</b>
-    INVALID_INPUT: Ogiltig indata i
+    VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+    INVALID_INPUT: 'Ogiltig indata i'
     MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'
@@ -70,3 +82,19 @@ GRAV:
     - 'Fredag'
     - 'Lördag'
     - 'Söndag'
+  CRON:
+    EVERY: varje
+    EVERY_HOUR: varje timme
+    EVERY_MINUTE: varje minut
+    EVERY_DAY_OF_WEEK: varje veckodag
+    EVERY_DAY_OF_MONTH: alla månadens dagar
+    EVERY_MONTH: varje månad
+    TEXT_PERIOD: Varje <b />
+    TEXT_MINS: ' timmens <b />:e minut'
+    TEXT_TIME: ' kl <b />:<b />'
+    TEXT_DOW: ' <b />'
+    TEXT_MONTH: ' <b />'
+    TEXT_DOM: ' <b />'
+    ERROR1: Taggen %s stöds inte!
+    ERROR2: Ogiltigt antal element
+    ERROR4: Uttrycket känns inte igen

system/languages/th.yaml

@@ -31,7 +31,7 @@ GRAV:
     YR_PLURAL: ปี
   FORM:
     VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
-    INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+    INVALID_INPUT: 'ป้อนข้อมูลไม่ถูกต้องใน'
     MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
   MONTHS_OF_THE_YEAR:
     - 'มกราคม'

system/languages/tr.yaml

@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nBaşlık: %1$s\n---\n\n# Hata: Geçersiz Önbölüm\n\nYol: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'ekipman'
+    - 'bilgi'
+    - 'pirinç'
+    - 'para'
+    - 'türler'
+    - 'seriler'
+    - 'balık'
+    - 'koyun'
+  INFLECTOR_IRREGULAR:
+    'person': 'kişi'
+    'man': 'erkek'
+    'child': 'çocuklar'
+    'sex': 'cinsiyet'
+    'move': 'taşınmış'
+  INFLECTOR_ORDINALS:
+    'default': '#F'
+    'first': ' 1.'
+    'second': ' 2.'
+    'third': ' 3.'
   NICETIME:
     NO_DATE_PROVIDED: Sağlanan tarih yok
     BAD_DATE: Yanlış tarih
     AGO: önce
     FROM_NOW: şu andan itibaren
+    JUST_NOW: şimdi
     SECOND: saniye
     MINUTE: dakika
     HOUR: saat
@@ -37,8 +58,8 @@ GRAV:
     YR_PLURAL: yıl
     DEC_PLURAL: onyl
   FORM:
-    VALIDATION_FAIL: <b>Doğrulama başarısız:</b>
-    INVALID_INPUT: Geçersiz bilgi girişi
+    VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+    INVALID_INPUT: 'Geçersiz bilgi girişi'
     MISSING_REQUIRED_FIELD: 'Gerekli alan eksik:'
   MONTHS_OF_THE_YEAR:
     - 'Ocak'
@@ -61,3 +82,17 @@ GRAV:
     - 'Cuma'
     - 'Cumartesi'
     - 'Pazar'
+  CRON:
+    EVERY: her
+    EVERY_HOUR: saatte bir
+    EVERY_MINUTE: dakikada bir
+    EVERY_DAY_OF_WEEK: haftanın her günü
+    EVERY_DAY_OF_MONTH: ayın her günü
+    EVERY_MONTH: her ay
+    TEXT_PERIOD: Her <b />
+    TEXT_MINS: ' saatin <b /> dakikasında'
+    TEXT_TIME: ' da'
+    ERROR1: Etiket %s desteklenmiyor!
+    ERROR2: Kötü eleman sayısı
+    ERROR3: jquery_element jqCron ayarları içinde tanımlanmalı
+    ERROR4: Tanınmayan ifade

system/languages/uk.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: рр.
     DEC_PLURAL: рр.
   FORM:
-    VALIDATION_FAIL: <b>Перевірка не вдалася:</b>
-    INVALID_INPUT: Невірне введення в
+    VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+    INVALID_INPUT: 'Невірне введення в'
     MISSING_REQUIRED_FIELD: 'Відсутнє обов''язкове поле:'
   MONTHS_OF_THE_YEAR:
     - 'Січень'

system/languages/vi.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: năm
     DEC_PLURAL: thập kỷ
   FORM:
-    VALIDATION_FAIL: <b>Xác nhận thất bại:</b>
-    INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+    VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+    INVALID_INPUT: 'Dữ liệu nhập không hợp lệ cho'
     MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
   MONTHS_OF_THE_YEAR:
     - 'Tháng 1'

system/languages/zh-cn.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误：无效参数\n\n位置： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - '装备'
+    - '信息'
+    - '大米'
+    - '钱'
+    - '物种'
+    - '系列'
+    - '鱼'
+    - '羊'
+  INFLECTOR_IRREGULAR:
+    'person': '人员'
+    'man': '男人'
+    'child': '儿童'
+    'sex': '性别'
+    'move': '移动'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'md'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: 无日期信息
+    BAD_DATE: 无效日期
+    AGO: 前
+    FROM_NOW: 距今
+    JUST_NOW: 刚刚
+    SECOND: 秒
+    MINUTE: 分钟
+    HOUR: 小时
+    DAY: 天
+    WEEK: 周
+    MONTH: 月
+    YEAR: 年
+    DECADE: 十年
+    SEC: 秒
+    MIN: 分钟
+    HR: 小时
+    WK: 周
+    MO: 月
+    YR: 年
+    DEC: 年代
+    SECOND_PLURAL: 秒
+    MINUTE_PLURAL: 分
+    HOUR_PLURAL: 小时
+    DAY_PLURAL: 天
+    WEEK_PLURAL: 周
+    MONTH_PLURAL: 月
+    YEAR_PLURAL: 年
+    DECADE_PLURAL: 十年
+    SEC_PLURAL: 秒
+    MIN_PLURAL: 分
+    HR_PLURAL: 时
+    WK_PLURAL: 周
+    MO_PLURAL: 月
+    YR_PLURAL: 年
+    DEC_PLURAL: 年代
+  FORM:
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
+  MONTHS_OF_THE_YEAR:
+    - '1月'
+    - '2月'
+    - '3月'
+    - '4月'
+    - '5月'
+    - '6月'
+    - '7月'
+    - '8月'
+    - '9月'
+    - '10月'
+    - '11月'
+    - '12月'
+  DAYS_OF_THE_WEEK:
+    - '星期一'
+    - '星期二'
+    - '星期三'
+    - '星期四'
+    - '星期五'
+    - '星期六'
+    - '星期日'
+  CRON:
+    EVERY: 每隔
+    EVERY_HOUR: 每小时
+    EVERY_MINUTE: 每分钟
+    EVERY_DAY_OF_WEEK: 一周中的每一天
+    EVERY_DAY_OF_MONTH: 月份中的每一天
+    EVERY_MONTH: 每月
+    TEXT_PERIOD: 所有 <b />
+    TEXT_MINS: ' 在 <b /> 小时过后的分钟'
+    TEXT_TIME: ' 在 <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: 不支持分享类型 %s
+    ERROR2: 无效数字
+    ERROR3: 请在 jqCron 设置中设定 jquery_element
+    ERROR4: 无法识别表达式

system/languages/zh.yaml

@@ -101,9 +101,9 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 年代
   FORM:
-    VALIDATION_FAIL: <b>验证失败：</b>
-    INVALID_INPUT: 无效输入
-    MISSING_REQUIRED_FIELD: 必填字段缺失：
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
   MONTHS_OF_THE_YEAR:
     - '1月'
     - '2月'

system/pages/notfound.md

@@ -2,4 +2,5 @@
 title: Not Found
 routable: false
 notfound: true
+expires: 0
 ---

system/router.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -20,6 +20,7 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N
 $grav_index = 'index.php';
 
 /* Check the GRAV_BASEDIR environment variable and use if set */
+
 $grav_basedir = getenv('GRAV_BASEDIR') ?: '';
 if ($grav_basedir) {
     $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index;

system/src/Grav/Common/Assets.php

@@ -3,30 +3,41 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Closure;
 use Grav\Common\Assets\Pipeline;
 use Grav\Common\Assets\Traits\LegacyAssetsTrait;
 use Grav\Common\Assets\Traits\TestingAssetsTrait;
 use Grav\Common\Config\Config;
 use Grav\Framework\Object\PropertyObject;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function call_user_func_array;
+use function count;
+use function func_get_args;
+use function is_array;
 
+/**
+ * Class Assets
+ * @package Grav\Common
+ */
 class Assets extends PropertyObject
 {
     use TestingAssetsTrait;
     use LegacyAssetsTrait;
 
+    const CSS = 'css';
+    const JS = 'js';
     const CSS_COLLECTION = 'assets_css';
     const JS_COLLECTION = 'assets_js';
-    const CSS_TYPE = 'Css';
-    const JS_TYPE = 'Js';
-    const INLINE_CSS_TYPE = 'InlineCss';
-    const INLINE_JS_TYPE = 'InlineJs';
+    const CSS_TYPE = Assets\Css::class;
+    const JS_TYPE = Assets\Js::class;
+    const INLINE_CSS_TYPE = Assets\InlineCss::class;
+    const INLINE_JS_TYPE = Assets\InlineJs::class;
 
     /** @const Regex to match CSS and JavaScript files */
     const DEFAULT_REGEX = '/.\.(css|js)$/i';
@@ -37,31 +48,57 @@ class Assets extends PropertyObject
     /** @const Regex to match JavaScript files */
     const JS_REGEX = '/.\.js$/i';
 
+    /** @var string */
     protected $assets_dir;
+    /** @var string */
     protected $assets_url;
 
+    /** @var array */
     protected $assets_css = [];
+    /** @var array */
     protected $assets_js = [];
 
-    // Config Options
+    // Following variables come from the configuration:
+    /** @var bool */
     protected $css_pipeline;
+    /** @var bool */
     protected $css_pipeline_include_externals;
+    /** @var bool */
     protected $css_pipeline_before_excludes;
+    /** @var bool */
+    protected $inlinecss_pipeline_include_externals;
+    /** @var bool */
+    protected $inlinecss_pipeline_before_excludes;
+    /** @var bool */
     protected $js_pipeline;
+    /** @var bool */
     protected $js_pipeline_include_externals;
+    /** @var bool */
     protected $js_pipeline_before_excludes;
+    /** @var bool */
+    protected $inlinejs_pipeline_include_externals;
+    /** @var bool */
+    protected $inlinejs_pipeline_before_excludes;
+    /** @var array */
     protected $pipeline_options = [];
 
-
+    /** @var Closure|string */
     protected $fetch_command;
+    /** @var string */
     protected $autoload;
+    /** @var bool */
     protected $enable_asset_timestamp;
+    /** @var array|null */
     protected $collections;
+    /** @var string */
     protected $timestamp;
-
+    /** @var array Keeping track for order counts (for sorting) */
+    protected $order = [];
 
     /**
      * Initialization called in the Grav lifecycle to initialize the Assets with appropriate configuration
+     *
+     * @return void
      */
     public function init()
     {
@@ -92,7 +129,6 @@ class Assets extends PropertyObject
      * assets and/or collections that will be automatically added on startup.
      *
      * @param  array $config Configurable options.
-     *
      * @return $this
      */
     public function config(array $config)
@@ -119,35 +155,35 @@ class Assets extends PropertyObject
      * It automatically detects the asset type (JavaScript, CSS or collection).
      * You may add more than one asset passing an array as argument.
      *
-     * @param array|string $asset
+     * @param string|string[] $asset
      * @return $this
      */
     public function add($asset)
     {
-        $args = \func_get_args();
+        $args = func_get_args();
 
         // More than one asset
-        if (\is_array($asset)) {
+        if (is_array($asset)) {
             foreach ($asset as $a) {
                 array_shift($args);
                 $args = array_merge([$a], $args);
-                \call_user_func_array([$this, 'add'], $args);
+                call_user_func_array([$this, 'add'], $args);
             }
         } elseif (isset($this->collections[$asset])) {
             array_shift($args);
             $args = array_merge([$this->collections[$asset]], $args);
-            \call_user_func_array([$this, 'add'], $args);
+            call_user_func_array([$this, 'add'], $args);
         } else {
             // Get extension
             $extension = pathinfo(parse_url($asset, PHP_URL_PATH), PATHINFO_EXTENSION);
 
             // JavaScript or CSS
-            if (\strlen($extension) > 0) {
+            if ($extension !== '') {
                 $extension = strtolower($extension);
                 if ($extension === 'css') {
-                    \call_user_func_array([$this, 'addCss'], $args);
+                    call_user_func_array([$this, 'addCss'], $args);
                 } elseif ($extension === 'js') {
-                    \call_user_func_array([$this, 'addJs'], $args);
+                    call_user_func_array([$this, 'addJs'], $args);
                 }
             }
         }
@@ -155,12 +191,20 @@ class Assets extends PropertyObject
         return $this;
     }
 
+    /**
+     * @param string $collection
+     * @param string $type
+     * @param string|string[] $asset
+     * @param array $options
+     * @return $this
+     */
     protected function addType($collection, $type, $asset, $options)
     {
-        if (\is_array($asset)) {
+        if (is_array($asset)) {
             foreach ($asset as $a) {
                 $this->addType($collection, $type, $a, $options);
             }
+
             return $this;
         }
 
@@ -172,7 +216,7 @@ class Assets extends PropertyObject
         // If pipeline disabled, set to position if provided, else after
         if (isset($options['pipeline'])) {
             if ($options['pipeline'] === false) {
-                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS_TYPE : $this::CSS_TYPE;
+                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS : $this::CSS;
                 $excludes = strtolower($exclude_type . '_pipeline_before_excludes');
                 if ($this->{$excludes}) {
                     $default = 'after';
@@ -190,11 +234,18 @@ class Assets extends PropertyObject
         $options['timestamp'] = $this->timestamp;
 
         // Set order
-        $options['order'] = \count($this->$collection);
+        $group = $options['group'] ?? 'head';
+        $position = $options['position'] ?? 'pipeline';
+
+        $orderKey = "{$type}|{$group}|{$position}";
+        if (!isset($this->order[$orderKey])) {
+           $this->order[$orderKey] = 0;
+        }
+
+        $options['order'] = $this->order[$orderKey]++;
 
         // Create asset of correct type
-        $asset_class = "\\Grav\\Common\\Assets\\{$type}";
-        $asset_object = new $asset_class();
+        $asset_object = new $type();
 
         // If exists
         if ($asset_object->init($asset, $options)) {
@@ -202,7 +253,6 @@ class Assets extends PropertyObject
         }
 
         return $this;
-
     }
 
     /**
@@ -212,7 +262,7 @@ class Assets extends PropertyObject
      */
     public function addCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION,Assets::CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::CSS_TYPE));
     }
 
     /**
@@ -222,7 +272,7 @@ class Assets extends PropertyObject
      */
     public function addInlineCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION, Assets::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_CSS_TYPE));
     }
 
     /**
@@ -232,7 +282,7 @@ class Assets extends PropertyObject
      */
     public function addJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::JS_TYPE));
     }
 
     /**
@@ -242,20 +292,19 @@ class Assets extends PropertyObject
      */
     public function addInlineJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_JS_TYPE));
     }
 
 
     /**
      * Add/replace collection.
      *
-     * @param  string $collectionName
-     * @param  array  $assets
+     * @param string $collectionName
+     * @param array  $assets
      * @param bool    $overwrite
-     *
      * @return $this
      */
-    public function registerCollection($collectionName, Array $assets, $overwrite = false)
+    public function registerCollection($collectionName, array $assets, $overwrite = false)
     {
         if ($overwrite || !isset($this->collections[$collectionName])) {
             $this->collections[$collectionName] = $assets;
@@ -264,26 +313,33 @@ class Assets extends PropertyObject
         return $this;
     }
 
+    /**
+     * @param array $assets
+     * @param string $key
+     * @param string $value
+     * @param bool $sort
+     * @return array|false
+     */
     protected function filterAssets($assets, $key, $value, $sort = false)
     {
-        $results = array_filter($assets, function($asset) use ($key, $value) {
+        $results = array_filter($assets, function ($asset) use ($key, $value) {
 
             if ($key === 'position' && $value === 'pipeline') {
-
                 $type = $asset->getType();
 
-                if ($asset->getRemote() && $this->{$type . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline' ) {
-                    if ($this->{$type . '_pipeline_before_excludes'}) {
+                if ($asset->getRemote() && $this->{strtolower($type) . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline') {
+                    if ($this->{strtolower($type) . '_pipeline_before_excludes'}) {
                         $asset->setPosition('after');
                     } else {
                         $asset->setPosition('before');
                     }
                     return false;
                 }
-
             }
 
-            if ($asset[$key] === $value) return true;
+            if ($asset[$key] === $value) {
+                return true;
+            }
             return false;
         });
 
@@ -295,17 +351,25 @@ class Assets extends PropertyObject
         return $results;
     }
 
+    /**
+     * @param array $assets
+     * @return array
+     */
     protected function sortAssets($assets)
     {
-        uasort ($assets, function($a, $b) {
-            if ($a['priority'] == $b['priority']) {
-                return $a['order'] - $b['order'];
-            }
-            return $b['priority'] - $a['priority'];
+        uasort($assets, static function ($a, $b) {
+            return $b['priority'] <=> $a['priority'] ?: $a['order'] <=> $b['order'];
         });
+
         return $assets;
     }
 
+    /**
+     * @param string $type
+     * @param string $group
+     * @param array $attributes
+     * @return string
+     */
     public function render($type, $group = 'head', $attributes = [])
     {
         $before_output = '';
@@ -352,7 +416,6 @@ class Assets extends PropertyObject
      *
      * @param  string $group name of the group
      * @param  array  $attributes
-     *
      * @return string
      */
     public function css($group = 'head', $attributes = [])
@@ -365,7 +428,6 @@ class Assets extends PropertyObject
      *
      * @param  string $group name of the group
      * @param  array  $attributes
-     *
      * @return string
      */
     public function js($group = 'head', $attributes = [])

system/src/Grav/Common/Assets/BaseAsset.php

@@ -3,18 +3,24 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets;
 
 use Grav\Common\Assets\Traits\AssetUtilsTrait;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Framework\Object\PropertyObject;
+use SplFileInfo;
 
+/**
+ * Class BaseAsset
+ * @package Grav\Common\Assets
+ */
 abstract class BaseAsset extends PropertyObject
 {
     use AssetUtilsTrait;
@@ -22,32 +28,46 @@ abstract class BaseAsset extends PropertyObject
     protected const CSS_ASSET = true;
     protected const JS_ASSET = false;
 
-    /** @const Regex to match CSS import content */
-    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
-
+    /** @var string|false */
     protected $asset;
-
+    /** @var string */
     protected $asset_type;
+    /** @var int */
     protected $order;
+    /** @var string */
     protected $group;
+    /** @var string */
     protected $position;
+    /** @var int */
     protected $priority;
+    /** @var array */
     protected $attributes = [];
 
-
+    /** @var string */
     protected $timestamp;
+    /** @var int|false */
     protected $modified;
+    /** @var bool */
     protected $remote;
+    /** @var string */
     protected $query = '';
 
     // Private Bits
-    private $base_url;
-    private $fetch_command;
+    /** @var bool */
     private $css_rewrite = false;
+    /** @var bool */
     private $css_minify = false;
 
+    /**
+     * @return string
+     */
     abstract function render();
 
+    /**
+     * BaseAsset constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
     public function __construct(array $elements = [], $key = null)
     {
         $base_config = [
@@ -64,6 +84,11 @@ abstract class BaseAsset extends PropertyObject
         parent::__construct($elements, $key);
     }
 
+    /**
+     * @param string|false $asset
+     * @param array $options
+     * @return $this|false
+     */
     public function init($asset, $options)
     {
         $config = Grav::instance()['config'];
@@ -88,7 +113,6 @@ abstract class BaseAsset extends PropertyObject
 
             // Move this to render?
             if (!$this->remote) {
-
                 $asset_parts = parse_url($asset);
                 if (isset($asset_parts['query'])) {
                     $this->query = $asset_parts['query'];
@@ -101,7 +125,7 @@ abstract class BaseAsset extends PropertyObject
                 if ($locator->isStream($asset)) {
                     $path = $locator->findResource($asset, true);
                 } else {
-                    $path = GRAV_ROOT . $asset;
+                    $path = GRAV_WEBROOT . $asset;
                 }
 
                 // If local file is missing return
@@ -109,7 +133,7 @@ abstract class BaseAsset extends PropertyObject
                     return false;
                 }
 
-                $file = new \SplFileInfo($path);
+                $file = new SplFileInfo($path);
 
                 $asset = $this->buildLocalLink($file->getPathname());
 
@@ -122,22 +146,57 @@ abstract class BaseAsset extends PropertyObject
         return $this;
     }
 
+    /**
+     * @return string|false
+     */
     public function getAsset()
     {
         return $this->asset;
     }
 
+    /**
+     * @return bool
+     */
     public function getRemote()
     {
         return $this->remote;
     }
 
+    /**
+     * @param string $position
+     * @return $this
+     */
     public function setPosition($position)
     {
         $this->position = $position;
+
         return $this;
     }
 
+    /**
+     * Receive asset location and return the SRI integrity hash
+     *
+     * @param string $input
+     * @return string
+     */
+    public static function integrityHash($input)
+    {
+        $grav = Grav::instance();
+
+        $assetsConfig = $grav['config']->get('system.assets');
+
+        if ( !empty($assetsConfig['enable_asset_sri']) && $assetsConfig['enable_asset_sri'] )
+        {
+            $dataToHash = file_get_contents( GRAV_WEBROOT . $input);
+
+            $hash = hash('sha256', $dataToHash, true);
+            $hash_base64 = base64_encode($hash);
+            return ' integrity="sha256-' . $hash_base64 . '"';
+        }
+
+        return '';
+    }
+
 
     /**
      *
@@ -149,7 +208,7 @@ abstract class BaseAsset extends PropertyObject
      */
 //    protected function getLastModificationTime($asset)
 //    {
-//        $file = GRAV_ROOT . $asset;
+//        $file = GRAV_WEBROOT . $asset;
 //        if (Grav::instance()['locator']->isStream($asset)) {
 //            $file = $this->buildLocalLink($asset, true);
 //        }
@@ -163,12 +222,12 @@ abstract class BaseAsset extends PropertyObject
      *
      * @param  string $asset    the asset string reference
      *
-     * @return string           the final link url to the asset
+     * @return string|false     the final link url to the asset
      */
     protected function buildLocalLink($asset)
     {
         if ($asset) {
-            return $this->base_url . ltrim(Utils::replaceFirstOccurrence(GRAV_ROOT, '', $asset), '/');
+            return $this->base_url . ltrim(Utils::replaceFirstOccurrence(GRAV_WEBROOT, '', $asset), '/');
         }
         return false;
     }
@@ -190,6 +249,7 @@ abstract class BaseAsset extends PropertyObject
      * @param string $file
      * @param string $dir
      * @param bool $local
+     * @return string
      */
     protected function cssRewrite($file, $dir, $local)
     {

system/src/Grav/Common/Assets/Css.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@ namespace Grav\Common\Assets;
 
 use Grav\Common\Utils;
 
+/**
+ * Class Css
+ * @package Grav\Common\Assets
+ */
 class Css extends BaseAsset
 {
+    /**
+     * Css constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
     public function __construct(array $elements = [], $key = null)
     {
         $base_options = [
@@ -28,13 +37,16 @@ class Css extends BaseAsset
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
-            $buffer = $this->gatherLinks( [$this], self::CSS_ASSET);
+            $buffer = $this->gatherLinks([$this], self::CSS_ASSET);
             return "<style>\n" . trim($buffer) . "\n</style>\n";
         }
 
-        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . ">\n";
     }
 }

system/src/Grav/Common/Assets/InlineCss.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@ namespace Grav\Common\Assets;
 
 use Grav\Common\Utils;
 
+/**
+ * Class InlineCss
+ * @package Grav\Common\Assets
+ */
 class InlineCss extends BaseAsset
 {
+    /**
+     * InlineCss constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
     public function __construct(array $elements = [], $key = null)
     {
         $base_options = [
@@ -25,6 +34,9 @@ class InlineCss extends BaseAsset
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         return '<style' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</style>\n";

system/src/Grav/Common/Assets/InlineJs.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@ namespace Grav\Common\Assets;
 
 use Grav\Common\Utils;
 
+/**
+ * Class InlineJs
+ * @package Grav\Common\Assets
+ */
 class InlineJs extends BaseAsset
 {
+    /**
+     * InlineJs constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
     public function __construct(array $elements = [], $key = null)
     {
         $base_options = [
@@ -25,6 +34,9 @@ class InlineJs extends BaseAsset
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         return '<script' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</script>\n";

system/src/Grav/Common/Assets/Js.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@ namespace Grav\Common\Assets;
 
 use Grav\Common\Utils;
 
+/**
+ * Class Js
+ * @package Grav\Common\Assets
+ */
 class Js extends BaseAsset
 {
+    /**
+     * Js constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
     public function __construct(array $elements = [], $key = null)
     {
         $base_options = [
@@ -24,13 +33,16 @@ class Js extends BaseAsset
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
-            $buffer = $this->gatherLinks( [$this], self::JS_ASSET);
+            $buffer = $this->gatherLinks([$this], self::JS_ASSET);
             return '<script' . $this->renderAttributes() . ">\n" . trim($buffer) . "\n</script>\n";
         }
 
-        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . "></script>\n";
     }
 }

system/src/Grav/Common/Assets/Pipeline.php

@@ -3,20 +3,28 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets;
 
+use Grav\Common\Assets\BaseAsset;
 use Grav\Common\Assets\Traits\AssetUtilsTrait;
 use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Framework\Object\PropertyObject;
+use MatthiasMullie\Minify\CSS;
+use MatthiasMullie\Minify\JS;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function array_key_exists;
 
+/**
+ * Class Pipeline
+ * @package Grav\Common\Assets
+ */
 class Pipeline extends PropertyObject
 {
     use AssetUtilsTrait;
@@ -30,40 +38,42 @@ class Pipeline extends PropertyObject
     /** @const Regex to match CSS sourcemap comments */
     protected const CSS_SOURCEMAP_REGEX = '{\/\*# (.*?) \*\/}';
 
-    /** @const Regex to match CSS import content */
-    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
-
     protected const FIRST_FORWARDSLASH_REGEX = '{^\/{1}\w}';
 
-    protected $css_minify;
-    protected $css_minify_windows;
-    protected $css_rewrite;
-
-    protected $js_minify;
-    protected $js_minify_windows;
-
-    protected $base_url;
+    // Following variables come from the configuration:
+    /** @var bool */
+    protected $css_minify = false;
+    /** @var bool */
+    protected $css_minify_windows = false;
+    /** @var bool */
+    protected $css_rewrite = false;
+    /** @var bool */
+    protected $css_pipeline_include_externals = true;
+    /** @var bool */
+    protected $js_minify = false;
+    /** @var bool */
+    protected $js_minify_windows = false;
+    /** @var bool */
+    protected $js_pipeline_include_externals = true;
+
+    /** @var string */
     protected $assets_dir;
+    /** @var string */
     protected $assets_url;
+    /** @var string */
     protected $timestamp;
+    /** @var array */
     protected $attributes;
-    protected $query;
+    /** @var string */
+    protected $query = '';
+    /** @var string */
     protected $asset;
 
     /**
-     * Closure used by the pipeline to fetch assets.
-     *
-     * Useful when file_get_contents() function is not available in your PHP
-     * installation or when you want to apply any kind of preprocessing to
-     * your assets before they get pipelined.
-     *
-     * The closure will receive as the only parameter a string with the path/URL of the asset and
-     * it should return the content of the asset file as a string.
-     *
-     * @var \Closure
+     * Pipeline constructor.
+     * @param array $elements
+     * @param string|null $key
      */
-    protected $fetch_command;
-
     public function __construct(array $elements = [], ?string $key = null)
     {
         parent::__construct($elements, $key);
@@ -88,7 +98,6 @@ class Pipeline extends PropertyObject
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     *
      * @return bool|string     URL or generated content if available, else false
      */
     public function renderCss($assets, $group, $attributes = [])
@@ -125,7 +134,7 @@ class Pipeline extends PropertyObject
 
             // Minify if required
             if ($this->shouldMinify('css')) {
-                $minifier = new \MatthiasMullie\Minify\CSS();
+                $minifier = new CSS();
                 $minifier->add($buffer);
                 $buffer = $minifier->minify();
             }
@@ -140,7 +149,7 @@ class Pipeline extends PropertyObject
             $output = "<style>\n" . $buffer . "\n</style>\n";
         } else {
             $this->asset = $relative_path;
-            $output = '<link href="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+            $output = '<link href="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . BaseAsset::integrityHash($this->asset) . ">\n";
         }
 
         return $output;
@@ -152,7 +161,6 @@ class Pipeline extends PropertyObject
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     *
      * @return bool|string     URL or generated content if available, else false
      */
     public function renderJs($assets, $group, $attributes = [])
@@ -189,7 +197,7 @@ class Pipeline extends PropertyObject
 
             // Minify if required
             if ($this->shouldMinify('js')) {
-                $minifier = new \MatthiasMullie\Minify\JS();
+                $minifier = new JS();
                 $minifier->add($buffer);
                 $buffer = $minifier->minify();
             }
@@ -204,7 +212,7 @@ class Pipeline extends PropertyObject
             $output = '<script' . $this->renderAttributes(). ">\n" . $buffer . "\n</script>\n";
         } else {
             $this->asset = $relative_path;
-            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . BaseAsset::integrityHash($this->asset) . "></script>\n";
         }
 
         return $output;
@@ -217,8 +225,7 @@ class Pipeline extends PropertyObject
      * @param string $file the css source file
      * @param string $dir , $local relative path to the css file
      * @param bool $local is this a local or remote asset
-     *
-     * @return mixed
+     * @return string
      */
     protected function cssRewrite($file, $dir, $local)
     {
@@ -244,16 +251,16 @@ class Pipeline extends PropertyObject
 
             $new_url = ($local ? $this->base_url: '') . $old_url;
 
-            $fixed = str_replace($matches[2], $new_url, $matches[0]);
-
-            return $fixed;
+            return str_replace($matches[2], $new_url, $matches[0]);
         }, $file);
 
         return $file;
     }
 
-
-
+    /**
+     * @param string $type
+     * @return bool
+     */
     private function shouldMinify($type = 'css')
     {
         $check = $type . '_minify';