$st */
+ $st = fstat($fp);
+ if (($st['mode'] & 0170000) !== 020000) {
+ fclose($fp);
+ $fp = false;
+ }
}
}
@@ -128,29 +147,28 @@ function random_bytes($bytes)
*/
$read = fread($fp, $remaining);
if (!is_string($read)) {
- if ($read === false) {
- /**
- * We cannot safely read from the file. Exit the
- * do-while loop and trigger the exception condition
- *
- * @var string|bool
- */
- $buf = false;
- break;
- }
+ /**
+ * We cannot safely read from the file. Exit the
+ * do-while loop and trigger the exception condition
+ *
+ * @var string|bool
+ */
+ $buf = false;
+ break;
}
/**
* Decrease the number of bytes returned from remaining
*/
$remaining -= RandomCompat_strlen($read);
/**
- * @var string|bool
+ * @var string $buf
*/
- $buf = $buf . $read;
+ $buf .= $read;
} while ($remaining > 0);
/**
* Is our result valid?
+ * @var string|bool $buf
*/
if (is_string($buf)) {
if (RandomCompat_strlen($buf) === $bytes) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
index 7a95e2b4..2e562901 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
@@ -1,22 +1,22 @@
value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) {
+ if (!($token->value === 'SET' && $list->tokens[$list->idx - 1]->value === 'CHARACTER')) {
$parser->error(
'A new statement was found, but no delimiter between it and the previous one.',
$token
);
break;
}
+ } elseif (array_key_exists($token->value, self::$DB_OPTIONS)
+ || (array_key_exists($token->value, self::$TABLE_OPTIONS)
+ && !self::checkIfColumnDefinitionKeyword($token->value))
+ ) {
+ // This alter operation has finished, which means a comma was missing before start of new alter operation
+ $parser->error(
+ 'Missing comma before start of a new alter operation.',
+ $token
+ );
+ break;
}
$ret->unknown[] = $token;
}
@@ -276,4 +286,17 @@ public static function build($component, array $options = array())
return $ret;
}
+
+ /**
+ * Check if token's value is one of the common keywords
+ * between column and table alteration
+ *
+ * @param string $tokenValue Value of current token
+ */
+ private static function checkIfColumnDefinitionKeyword($tokenValue) {
+ $common_options = array('AUTO_INCREMENT', 'COMMENT', 'DEFAULT');
+ // Since AUTO_INCREMENT and COMMENT can be used for
+ // both table as well as a specific column in the table
+ return in_array($tokenValue, $common_options);
+ }
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php
index 92d8b169..984179c3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Array2d.php
@@ -82,7 +82,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$arrCount = count($arr->values);
if ($count === -1) {
$count = $arrCount;
- } elseif ($arrCount != $count) {
+ } elseif ($arrCount !== $count) {
$parser->error(
sprintf(
Translator::gettext('%1$d values were expected, but found %2$d.'),
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ArrayObj.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ArrayObj.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ArrayObj.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ArrayObj.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php
similarity index 53%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php
index 820947bf..ab907687 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CaseExpression.php
@@ -7,6 +7,7 @@
namespace PhpMyAdmin\SqlParser\Components;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
@@ -55,6 +56,13 @@ class CaseExpression extends Component
*/
public $else_result;
+ /**
+ * The alias of this CASE statement.
+ *
+ * @var string
+ */
+ public $alias;
+
/**
* The sub-expression.
*
@@ -70,8 +78,8 @@ public function __construct()
}
/**
- * @param Parser $parser the parser that serves as context
- * @param TokensList $list the list of tokens that are being parsed
+ * @param Parser $parser the parser that serves as context
+ * @param TokensList $list the list of tokens that are being parsed
* @param array $options parameters for parsing
*
* @return CaseExpression
@@ -112,29 +120,28 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
if ($state === 0) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHEN'
- ) {
- ++$list->idx; // Skip 'WHEN'
- $new_condition = Condition::parse($parser, $list);
- $type = 1;
- $state = 1;
- $ret->conditions[] = $new_condition;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ELSE'
- ) {
- ++$list->idx; // Skip 'ELSE'
- $ret->else_result = Expression::parse($parser, $list);
- $state = 0; // last clause of CASE expression
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'END'
- ) {
- $state = 3; // end of CASE expression
- ++$list->idx;
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ switch($token->keyword) {
+ case 'WHEN':
+ ++$list->idx; // Skip 'WHEN'
+ $new_condition = Condition::parse($parser, $list);
+ $type = 1;
+ $state = 1;
+ $ret->conditions[] = $new_condition;
+ break;
+ case 'ELSE':
+ ++$list->idx; // Skip 'ELSE'
+ $ret->else_result = Expression::parse($parser, $list);
+ $state = 0; // last clause of CASE expression
+ break;
+ case 'END':
+ $state = 3; // end of CASE expression
+ ++$list->idx;
+ break 2;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
} else {
$ret->value = Expression::parse($parser, $list);
$type = 0;
@@ -142,28 +149,27 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
} elseif ($state === 1) {
if ($type === 0) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHEN'
- ) {
- ++$list->idx; // Skip 'WHEN'
- $new_value = Expression::parse($parser, $list);
- $state = 2;
- $ret->compare_values[] = $new_value;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ELSE'
- ) {
- ++$list->idx; // Skip 'ELSE'
- $ret->else_result = Expression::parse($parser, $list);
- $state = 0; // last clause of CASE expression
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'END'
- ) {
- $state = 3; // end of CASE expression
- ++$list->idx;
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ switch($token->keyword) {
+ case 'WHEN':
+ ++$list->idx; // Skip 'WHEN'
+ $new_value = Expression::parse($parser, $list);
+ $state = 2;
+ $ret->compare_values[] = $new_value;
+ break;
+ case 'ELSE':
+ ++$list->idx; // Skip 'ELSE'
+ $ret->else_result = Expression::parse($parser, $list);
+ $state = 0; // last clause of CASE expression
+ break;
+ case 'END':
+ $state = 3; // end of CASE expression
+ ++$list->idx;
+ break 2;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
}
} else {
if ($token->type === Token::TYPE_KEYWORD
@@ -201,6 +207,64 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$list->tokens[$list->idx - 1]
);
} else {
+ // Parse for alias of CASE expression
+ $asFound = false;
+ for (; $list->idx < $list->count; ++$list->idx) {
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER) {
+ break;
+ }
+
+ // Skipping whitespaces and comments.
+ if (($token->type === Token::TYPE_WHITESPACE)
+ || ($token->type === Token::TYPE_COMMENT)
+ ) {
+ continue;
+ }
+
+ // Handle optional AS keyword before alias
+ if ($token->type === Token::TYPE_KEYWORD
+ && $token->keyword === 'AS') {
+ if ($asFound || !empty($ret->alias)) {
+ $parser->error('Potential duplicate alias of CASE expression.', $token);
+ break;
+ }
+ $asFound = true;
+ continue;
+ }
+
+ if ($asFound
+ && $token->type === Token::TYPE_KEYWORD
+ && ($token->flags & Token::FLAG_KEYWORD_RESERVED || $token->flags & Token::FLAG_KEYWORD_FUNCTION)) {
+ $parser->error('An alias expected after AS but got ' . $token->value, $token);
+ $asFound = false;
+ break;
+ }
+
+ if ($asFound
+ || $token->type === Token::TYPE_STRING
+ || ($token->type === Token::TYPE_SYMBOL && !$token->flags & Token::FLAG_SYMBOL_VARIABLE)
+ || $token->type === Token::TYPE_NONE
+ ) {
+ // An alias is expected (the keyword `AS` was previously found).
+ if (!empty($ret->alias)) {
+ $parser->error('An alias was previously found.', $token);
+ break;
+ }
+ $ret->alias = $token->value;
+ $asFound = false;
+
+ continue;
+ }
+
+ break;
+ }
+ if ($asFound) {
+ $parser->error('An alias was expected after AS.', $list->tokens[$list->idx - 1]);
+ }
+
$ret->expr = self::build($ret);
}
@@ -241,6 +305,10 @@ public static function build($component, array $options = array())
}
$ret .= 'END';
+ if ($component->alias) {
+ $ret .= ' AS ' . Context::escape($component->alias);
+ }
+
return $ret;
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
index 99ab34c7..2be0abd4 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
@@ -142,7 +142,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
// Conditions are delimited by logical operators.
if (in_array($token->value, static::$DELIMITERS, true)) {
- if (($betweenBefore) && ($token->value === 'AND')) {
+ if ($betweenBefore && ($token->value === 'AND')) {
// The syntax of keyword `BETWEEN` is hard-coded.
$betweenBefore = false;
} else {
@@ -170,7 +170,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
if ($token->value === 'BETWEEN') {
$betweenBefore = true;
}
- if (($brackets === 0) && (empty(static::$ALLOWED_KEYWORDS[$token->value]))) {
+ if (($brackets === 0) && empty(static::$ALLOWED_KEYWORDS[$token->value])) {
break;
}
}
@@ -179,7 +179,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
if ($token->value === '(') {
++$brackets;
} elseif ($token->value === ')') {
- if ($brackets == 0) {
+ if ($brackets === 0) {
break;
}
--$brackets;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php
index f85ad0f3..21ddae92 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php
@@ -259,7 +259,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
$state = 5;
} elseif ($state === 5) {
- if ((!empty($expr->type)) || (!empty($expr->key))) {
+ if (!empty($expr->type) || !empty($expr->key)) {
$ret[] = $expr;
}
$expr = new self();
@@ -281,7 +281,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
// Last iteration was not saved.
- if ((!empty($expr->type)) || (!empty($expr->key))) {
+ if (!empty($expr->type) || !empty($expr->key)) {
$ret[] = $expr;
}
@@ -315,7 +315,7 @@ public static function build($component, array $options = array())
$tmp .= 'CONSTRAINT ';
}
- if ((isset($component->name)) && ($component->name !== '')) {
+ if (isset($component->name) && ($component->name !== '')) {
$tmp .= Context::escape($component->name) . ' ';
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php
index 52d8775d..51f04fa6 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/DataType.php
@@ -153,7 +153,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
*/
public static function build($component, array $options = array())
{
- $name = (empty($options['lowercase'])) ?
+ $name = empty($options['lowercase']) ?
$component->name : strtolower($component->name);
$parameters = '';
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php
index cce797f7..5350e360 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Expression.php
@@ -215,8 +215,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
if ($token->type === Token::TYPE_KEYWORD) {
- if (($brackets > 0) && (empty($ret->subquery))
- && (!empty(Parser::$STATEMENT_PARSERS[$token->keyword]))
+ if (($brackets > 0) && empty($ret->subquery)
+ && !empty(Parser::$STATEMENT_PARSERS[$token->keyword])
) {
// A `(` was previously found and this keyword is the
// beginning of a statement, so this is a subquery.
@@ -282,7 +282,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
if ($token->type === Token::TYPE_OPERATOR) {
- if ((!empty($options['breakOnParentheses']))
+ if (!empty($options['breakOnParentheses'])
&& (($token->value === '(') || ($token->value === ')'))
) {
// No brackets were expected.
@@ -290,7 +290,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
if ($token->value === '(') {
++$brackets;
- if ((empty($ret->function)) && ($prev[1] !== null)
+ if (empty($ret->function) && ($prev[1] !== null)
&& (($prev[1]->type === Token::TYPE_NONE)
|| ($prev[1]->type === Token::TYPE_SYMBOL)
|| (($prev[1]->type === Token::TYPE_KEYWORD)
@@ -298,23 +298,25 @@ public static function parse(Parser $parser, TokensList $list, array $options =
) {
$ret->function = $prev[1]->value;
}
- } elseif ($token->value === ')' && $brackets == 0) {
- // Not our bracket
- break;
} elseif ($token->value === ')') {
- --$brackets;
if ($brackets === 0) {
- if (!empty($options['parenthesesDelimited'])) {
- // The current token is the last bracket, the next
- // one will be outside the expression.
- $ret->expr .= $token->token;
- ++$list->idx;
+ // Not our bracket
+ break;
+ } else {
+ --$brackets;
+ if ($brackets === 0) {
+ if (!empty($options['parenthesesDelimited'])) {
+ // The current token is the last bracket, the next
+ // one will be outside the expression.
+ $ret->expr .= $token->token;
+ ++$list->idx;
+ break;
+ }
+ } elseif ($brackets < 0) {
+ // $parser->error('Unexpected closing bracket.', $token);
+ // $brackets = 0;
break;
}
- } elseif ($brackets < 0) {
- // $parser->error('Unexpected closing bracket.', $token);
- // $brackets = 0;
- break;
}
} elseif ($token->value === ',') {
// Expressions are comma-delimited.
@@ -362,7 +364,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
// Found a `.` which means we expect a column name and
// the column name we parsed is actually the table name
// and the table name is actually a database name.
- if ((!empty($ret->database)) || ($dot)) {
+ if (!empty($ret->database) || $dot) {
$parser->error('Unexpected dot.', $token);
}
$ret->database = $ret->table;
@@ -426,13 +428,13 @@ public static function build($component, array $options = array())
$ret = $component->expr;
} else {
$fields = array();
- if ((isset($component->database)) && ($component->database !== '')) {
+ if (isset($component->database) && ($component->database !== '')) {
$fields[] = $component->database;
}
- if ((isset($component->table)) && ($component->table !== '')) {
+ if (isset($component->table) && ($component->table !== '')) {
$fields[] = $component->table;
}
- if ((isset($component->column)) && ($component->column !== '')) {
+ if (isset($component->column) && ($component->column !== '')) {
$fields[] = $component->column;
}
$ret = implode('.', Context::escape($fields));
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ExpressionArray.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ExpressionArray.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ExpressionArray.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ExpressionArray.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/FunctionCall.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/FunctionCall.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/FunctionCall.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/FunctionCall.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/GroupKeyword.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/GroupKeyword.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/GroupKeyword.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/GroupKeyword.php
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IndexHint.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IndexHint.php
new file mode 100644
index 00000000..9534d2d2
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IndexHint.php
@@ -0,0 +1,193 @@
+type = $type;
+ $this->indexOrKey = $indexOrKey;
+ $this->for = $for;
+ $this->indexes = $indexes;
+ }
+
+ /**
+ * @param Parser $parser the parser that serves as context
+ * @param TokensList $list the list of tokens that are being parsed
+ * @param array $options parameters for parsing
+ *
+ * @return IndexHint|Component[]
+ */
+ public static function parse(Parser $parser, TokensList $list, array $options = array())
+ {
+ $ret = array();
+ $expr = new self();
+ $expr->type = isset($options['type']) ? $options['type'] : null;
+ /**
+ * The state of the parser.
+ *
+ * Below are the states of the parser.
+ * 0 ----------------- [ USE/IGNORE/FORCE ]-----------------> 1
+ * 1 -------------------- [ INDEX/KEY ] --------------------> 2
+ * 2 ----------------------- [ FOR ] -----------------------> 3
+ * 2 -------------------- [ expr_list ] --------------------> 0
+ * 3 -------------- [ JOIN/GROUP BY/ORDER BY ] -------------> 4
+ * 4 -------------------- [ expr_list ] --------------------> 0
+ * @var int
+ */
+ $state = 0;
+
+ // By design, the parser will parse first token after the keyword. So, the keyword
+ // must be analyzed too, in order to determine the type of this index hint.
+ if ($list->idx > 0) {
+ --$list->idx;
+ }
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
+ */
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER) {
+ break;
+ }
+ // Skipping whitespaces and comments.
+ if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
+ continue;
+ }
+
+ switch ($state) {
+ case 0:
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'USE' || $token->keyword === 'IGNORE' || $token->keyword === 'FORCE') {
+ $expr->type = $token->keyword;
+ $state = 1;
+ } else {
+ break 2;
+ }
+ }
+ break;
+ case 1:
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'INDEX' || $token->keyword === 'KEY') {
+ $expr->indexOrKey = $token->keyword;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ }
+ $state = 2;
+ } else {
+ // we expect the token to be a keyword
+ $parser->error('Unexpected token.', $token);
+ }
+ break;
+ case 2:
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'FOR') {
+ $state = 3;
+ } else {
+ $expr->indexes = ExpressionArray::parse($parser, $list);
+ $state = 0;
+ $ret[] = $expr;
+ $expr = new self();
+ }
+ break;
+ case 3:
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'JOIN' || $token->keyword === 'GROUP BY' || $token->keyword === 'ORDER BY') {
+ $expr->for = $token->keyword;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ }
+ $state = 4;
+ } else {
+ // we expect the token to be a keyword
+ $parser->error('Unexpected token.', $token);
+ }
+ break;
+ case 4:
+ $expr->indexes = ExpressionArray::parse($parser, $list);
+ $state = 0;
+ $ret[] = $expr;
+ $expr = new self();
+ break;
+ }
+ }
+ --$list->idx;
+
+ return $ret;
+ }
+
+ /**
+ * @param ArrayObj|ArrayObj[] $component the component to be built
+ * @param array $options parameters for building
+ *
+ * @return string
+ */
+ public static function build($component, array $options = array())
+ {
+ if (is_array($component)) {
+ return implode(' ', $component);
+ }
+
+ $ret = $component->type . ' ' . $component->indexOrKey . ' ';
+ if ($component->for !== null) {
+ $ret .= 'FOR ' . $component->for . ' ';
+ }
+ return $ret . ExpressionArray::build($component->indexes);
+ }
+}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php
index 17615f6c..c0fa390c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/IntoKeyword.php
@@ -207,10 +207,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$ret->dest = $token->value;
$state = 3;
- } elseif ($state == 3) {
+ } elseif ($state === 3) {
$ret->parseFileOptions($parser, $list, $token->value);
$state = 4;
- } elseif ($state == 4) {
+ } elseif ($state === 4) {
if ($token->type === Token::TYPE_KEYWORD && $token->keyword !== 'LINES') {
break;
}
@@ -237,11 +237,7 @@ public function parseFileOptions(Parser $parser, TokensList $list, $keyword = 'F
static::$FIELDS_OPTIONS
);
- if ($keyword === 'FIELDS') {
- $this->fields_keyword = true;
- } else {
- $this->fields_keyword = false;
- }
+ $this->fields_keyword = ($keyword === 'FIELDS');
} else {
// parse line options
$this->lines_options = OptionsArray::parse(
@@ -272,7 +268,7 @@ public static function build($component, array $options = array())
$fields_options_str = OptionsArray::build($component->fields_options);
if (trim($fields_options_str) !== '') {
- $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS';
+ $ret .= $component->fields_keyword ? ' FIELDS' : ' COLUMNS';
$ret .= ' ' . $fields_options_str;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php
similarity index 86%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php
index 55b69ae0..786092dd 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/JoinKeyword.php
@@ -151,7 +151,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
if ($state === 0) {
if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->keyword]))
+ && !empty(static::$JOINS[$token->keyword])
) {
$expr->type = static::$JOINS[$token->keyword];
$state = 1;
@@ -163,22 +163,25 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$state = 2;
} elseif ($state === 2) {
if ($token->type === Token::TYPE_KEYWORD) {
- if ($token->keyword === 'ON') {
- $state = 3;
- } elseif ($token->keyword === 'USING') {
- $state = 4;
- } else {
- if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->keyword]))
- ) {
- $ret[] = $expr;
- $expr = new self();
- $expr->type = static::$JOINS[$token->keyword];
- $state = 1;
- } else {
- /* Next clause is starting */
- break;
- }
+ switch($token->keyword) {
+ case 'ON':
+ $state = 3;
+ break;
+ case 'USING':
+ $state = 4;
+ break;
+ default:
+ if (!empty(static::$JOINS[$token->keyword])
+ ) {
+ $ret[] = $expr;
+ $expr = new self();
+ $expr->type = static::$JOINS[$token->keyword];
+ $state = 1;
+ } else {
+ /* Next clause is starting */
+ break 2;
+ }
+ break;
}
}
} elseif ($state === 3) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Key.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Key.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Key.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Key.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Limit.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Limit.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Limit.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Limit.php
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/LockExpression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/LockExpression.php
new file mode 100644
index 00000000..644e3ca9
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/LockExpression.php
@@ -0,0 +1,203 @@
+ 1
+ * 1 ---------------- [ lock_type ] ----------------> 2
+ * 2 -------------------- [ , ] --------------------> break
+ *
+ * @var int
+ */
+ $state = 0;
+
+ $prevToken = null;
+
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
+ */
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER
+ || ($token->type === Token::TYPE_OPERATOR
+ && $token->value === ',')
+ ) {
+ break;
+ }
+
+ if ($state === 0) {
+ $ret->table = Expression::parse($parser, $list, array('parseField' => 'table'));
+ $state = 1;
+ } elseif ($state === 1) {
+ // parse lock type
+ $ret->type = self::parseLockType($parser, $list);
+ $state = 2;
+ }
+ $prevToken = $token;
+ }
+
+ // 2 is the only valid end state
+ if ($state !== 2) {
+ $parser->error('Unexpected end of LOCK expression.', $prevToken);
+ }
+
+ --$list->idx;
+
+ return $ret;
+ }
+
+ /**
+ * @param LockExpression|LockExpression[] $component the component to be built
+ * @param array $options parameters for building
+ *
+ * @return string
+ */
+ public static function build($component, array $options = array())
+ {
+ if (is_array($component)) {
+ return implode(', ', $component);
+ }
+
+ return $component->table . ' ' . $component->type;
+ }
+
+ private static function parseLockType(Parser $parser, TokensList $list) {
+ $lockType = '';
+
+ /**
+ * The state of the parser while parsing for lock type.
+ *
+ * Below are the states of the parser.
+ *
+ * 0 ---------------- [ READ ] -----------------> 1
+ * 0 ------------- [ LOW_PRIORITY ] ------------> 2
+ * 0 ---------------- [ WRITE ] ----------------> 3
+ * 1 ---------------- [ LOCAL ] ----------------> 3
+ * 2 ---------------- [ WRITE ] ----------------> 3
+ *
+ * @var int
+ */
+ $state = 0;
+
+ $prevToken = null;
+
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
+ */
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER
+ || ($token->type === Token::TYPE_OPERATOR
+ && $token->value === ',')
+ ) {
+ --$list->idx;
+ break;
+ }
+
+ // Skipping whitespaces and comments.
+ if ($token->type === Token::TYPE_WHITESPACE || $token->type === Token::TYPE_COMMENT) {
+ continue;
+ }
+
+ // We only expect keywords
+ if ($token->type !== Token::TYPE_KEYWORD) {
+ $parser->error('Unexpected token.', $token);
+ break;
+ }
+
+ if ($state === 0) {
+ if ($token->keyword === 'READ') {
+ $state = 1;
+ } elseif ($token->keyword === 'LOW_PRIORITY') {
+ $state = 2;
+ } elseif ($token->keyword === 'WRITE') {
+ $state = 3;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
+ $lockType .= $token->keyword;
+ } elseif ($state === 1) {
+ if ($token->keyword === 'LOCAL') {
+ $lockType .= ' ' . $token->keyword;
+ $state = 3;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
+ } elseif ($state === 2) {
+ if ($token->keyword === 'WRITE') {
+ $lockType .= ' ' . $token->keyword;
+ $state = 3; // parsing over
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
+ }
+
+ $prevToken = $token;
+ }
+
+ // Only two possible end states
+ if ($state !== 1 && $state !== 3) {
+ $parser->error('Unexpected end of Lock expression.', $prevToken);
+ }
+
+ return $lockType;
+ }
+}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php
index 871772b5..fd02d222 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php
@@ -247,10 +247,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
*/
if ($state === 1
&& $lastOption
- && ($lastOption[1] == 'expr'
- || $lastOption[1] == 'var'
- || $lastOption[1] == 'var='
- || $lastOption[1] == 'expr=')
+ && ($lastOption[1] === 'expr'
+ || $lastOption[1] === 'var'
+ || $lastOption[1] === 'var='
+ || $lastOption[1] === 'expr=')
) {
$parser->error(
sprintf(
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OrderKeyword.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OrderKeyword.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OrderKeyword.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/OrderKeyword.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php
index 82a3567c..1f810f5a 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/ParameterDefinition.php
@@ -138,7 +138,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
}
// Last iteration was not saved.
- if ((isset($expr->name)) && ($expr->name !== '')) {
+ if (isset($expr->name) && ($expr->name !== '')) {
$ret[] = $expr;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/PartitionDefinition.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/PartitionDefinition.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/PartitionDefinition.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/PartitionDefinition.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Reference.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Reference.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Reference.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/Reference.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php
index 2e3d6ef9..e9bd9ce9 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php
@@ -68,7 +68,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
*
* 1 ------------------------[ TO ]-----------------------> 2
*
- * 2 ---------------------[ old name ]--------------------> 3
+ * 2 ---------------------[ new name ]--------------------> 3
*
* 3 ------------------------[ , ]------------------------> 0
* 3 -----------------------[ else ]----------------------> (END)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php
similarity index 82%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php
index 83f2e552..2945a8e4 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/SetOperation.php
@@ -64,15 +64,22 @@ public static function parse(Parser $parser, TokensList $list, array $options =
*
* Below are the states of the parser.
*
- * 0 -------------------[ column name ]-------------------> 1
- *
+ * 0 ---------------------[ col_name ]--------------------> 0
+ * 0 ------------------------[ = ]------------------------> 1
+ * 1 -----------------------[ value ]---------------------> 1
* 1 ------------------------[ , ]------------------------> 0
- * 1 ----------------------[ value ]----------------------> 1
*
* @var int
*/
$state = 0;
+ /**
+ * Token when the parser has seen the latest comma
+ *
+ * @var Token
+ */
+ $commaLastSeenAt = null;
+
for (; $list->idx < $list->count; ++$list->idx) {
/**
* Token parsed at this moment.
@@ -94,7 +101,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
// No keyword is expected.
if (($token->type === Token::TYPE_KEYWORD)
&& ($token->flags & Token::FLAG_KEYWORD_RESERVED)
- && ($state == 0)
+ && ($state === 0)
) {
break;
}
@@ -104,6 +111,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$state = 1;
} elseif ($token->value !== ',') {
$expr->column .= $token->token;
+ } elseif ($token->value === ',') {
+ $commaLastSeenAt = $token;
}
} elseif ($state === 1) {
$tmp = Expression::parse(
@@ -113,7 +122,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
'breakOnAlias' => true,
)
);
- if ($tmp == null) {
+ if (is_null($tmp)) {
$parser->error('Missing expression.', $token);
break;
}
@@ -122,11 +131,16 @@ public static function parse(Parser $parser, TokensList $list, array $options =
$ret[] = $expr;
$expr = new self();
$state = 0;
+ $commaLastSeenAt = null;
}
}
-
--$list->idx;
+ // We saw a comma, but didn't see a column-value pair after it
+ if ($commaLastSeenAt !== null) {
+ $parser->error('Unexpected token.', $commaLastSeenAt);
+ }
+
return $ret;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php
similarity index 84%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php
index 4aa0f94e..2de5126f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Components/UnionKeyword.php
@@ -26,8 +26,8 @@ class UnionKeyword extends Component
public static function build($component, array $options = array())
{
$tmp = array();
- foreach ($component as $component) {
- $tmp[] = $component[0] . ' ' . $component[1];
+ foreach ($component as $componentPart) {
+ $tmp[] = $componentPart[0] . ' ' . $componentPart[1];
}
return implode(' ', $tmp);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php
index 4aaa956b..869a9bb7 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Context.php
@@ -255,10 +255,8 @@ public static function isKeyword($str, $isReserved = false)
$str = strtoupper($str);
if (isset(static::$KEYWORDS[$str])) {
- if ($isReserved) {
- if (!(static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) {
- return null;
- }
+ if ($isReserved && !(static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) {
+ return null;
}
return static::$KEYWORDS[$str];
@@ -315,21 +313,21 @@ public static function isWhitespace($str)
public static function isComment($str, $end = false)
{
$len = strlen($str);
- if ($len == 0) {
+ if ($len === 0) {
return null;
}
if ($str[0] === '#') {
return Token::FLAG_COMMENT_BASH;
} elseif (($len > 1) && ($str[0] === '/') && ($str[1] === '*')) {
- return (($len > 2) && ($str[2] == '!')) ?
+ return (($len > 2) && ($str[2] === '!')) ?
Token::FLAG_COMMENT_MYSQL_CMD : Token::FLAG_COMMENT_C;
} elseif (($len > 1) && ($str[0] === '*') && ($str[1] === '/')) {
return Token::FLAG_COMMENT_C;
} elseif (($len > 2) && ($str[0] === '-')
- && ($str[1] === '-') && (static::isWhitespace($str[2]))
+ && ($str[1] === '-') && static::isWhitespace($str[2])
) {
return Token::FLAG_COMMENT_SQL;
- } elseif (($len == 2) && $end && ($str[0] === '-') && ($str[1] === '-')) {
+ } elseif (($len === 2) && $end && ($str[0] === '-') && ($str[1] === '-')) {
return Token::FLAG_COMMENT_SQL;
}
@@ -384,7 +382,7 @@ public static function isNumber($str)
*/
public static function isSymbol($str)
{
- if (strlen($str) == 0) {
+ if (strlen($str) === 0) {
return null;
}
if ($str[0] === '@') {
@@ -410,7 +408,7 @@ public static function isSymbol($str)
*/
public static function isString($str)
{
- if (strlen($str) == 0) {
+ if (strlen($str) === 0) {
return null;
}
if ($str[0] === '\'') {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100000.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100000.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100000.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100000.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100100.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100100.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100100.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100100.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100200.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100200.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100200.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100200.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100300.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100300.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100300.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMariaDb100300.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50000.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50000.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50000.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50000.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50100.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50100.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50100.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50100.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50500.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50500.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50500.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50500.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50600.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50600.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50600.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50600.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50700.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50700.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50700.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql50700.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql80000.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql80000.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql80000.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Contexts/ContextMySql80000.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Core.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Core.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Core.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Core.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LexerException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LexerException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LexerException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LexerException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LoaderException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LoaderException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LoaderException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/LoaderException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/ParserException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/ParserException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/ParserException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Exceptions/ParserException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php
similarity index 99%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php
index f5972d8e..ef1ca68d 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Lexer.php
@@ -883,7 +883,7 @@ public function parseSymbol()
if ($this->last < $this->len) {
if (($str = $this->parseString('`')) === null) {
- if (($str = static::parseUnknown()) === null) {
+ if (($str = $this->parseUnknown()) === null) {
$this->error(
'Variable name was expected.',
$this->str[$this->last],
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php
index 11196ef7..ec8637ad 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Parser.php
@@ -86,6 +86,13 @@ class Parser extends Core
'COMMIT' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement',
'ROLLBACK' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement',
'START TRANSACTION' => 'PhpMyAdmin\\SqlParser\\Statements\\TransactionStatement',
+
+ 'PURGE' => 'PhpMyAdmin\\SqlParser\\Statements\\PurgeStatement',
+
+ // Lock statements
+ // https://dev.mysql.com/doc/refman/5.7/en/lock-tables.html
+ 'LOCK' => 'PhpMyAdmin\\SqlParser\\Statements\\LockStatement',
+ 'UNLOCK' => 'PhpMyAdmin\\SqlParser\\Statements\\LockStatement',
);
/**
@@ -170,6 +177,10 @@ class Parser extends Core
'field' => 'fields',
'options' => array('parseField' => 'table'),
),
+ 'FORCE' => array(
+ 'class' => 'PhpMyAdmin\\SqlParser\\Components\\IndexHint',
+ 'field' => 'index_hints',
+ ),
'FROM' => array(
'class' => 'PhpMyAdmin\\SqlParser\\Components\\ExpressionArray',
'field' => 'from',
@@ -183,6 +194,10 @@ class Parser extends Core
'class' => 'PhpMyAdmin\\SqlParser\\Components\\Condition',
'field' => 'having',
),
+ 'IGNORE' => array(
+ 'class' => 'PhpMyAdmin\\SqlParser\\Components\\IndexHint',
+ 'field' => 'index_hints',
+ ),
'INTO' => array(
'class' => 'PhpMyAdmin\\SqlParser\\Components\\IntoKeyword',
'field' => 'into',
@@ -244,6 +259,10 @@ class Parser extends Core
'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword',
'field' => 'join',
),
+ 'STRAIGHT_JOIN' => array(
+ 'class' => 'PhpMyAdmin\\SqlParser\\Components\\JoinKeyword',
+ 'field' => 'join',
+ ),
'LIMIT' => array(
'class' => 'PhpMyAdmin\\SqlParser\\Components\\Limit',
'field' => 'limit',
@@ -297,6 +316,10 @@ class Parser extends Core
'field' => 'tables',
'options' => array('parseField' => 'table'),
),
+ 'USE' => array(
+ 'class' => 'PhpMyAdmin\\SqlParser\\Components\\IndexHint',
+ 'field' => 'index_hints',
+ ),
'VALUE' => array(
'class' => 'PhpMyAdmin\\SqlParser\\Components\\Array2d',
'field' => 'values',
@@ -340,7 +363,7 @@ class Parser extends Core
*/
public function __construct($list = null, $strict = false)
{
- if ((is_string($list)) || ($list instanceof UtfString)) {
+ if (is_string($list) || ($list instanceof UtfString)) {
$lexer = new Lexer($list, $strict);
$this->list = $lexer->list;
} elseif ($list instanceof TokensList) {
@@ -488,7 +511,7 @@ public function parse()
$prevLastIdx = $list->idx;
// Handles unions.
- if ((!empty($unionType))
+ if (!empty($unionType)
&& ($lastStatement instanceof SelectStatement)
&& ($statement instanceof SelectStatement)
) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php
index f7ed9ab8..6eb42c74 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statement.php
@@ -260,7 +260,7 @@ public function parse(Parser $parser, TokensList $list)
// ON DUPLICATE KEY UPDATE ...
// has to be parsed in parent statement (INSERT or REPLACE)
// so look for it and break
- if ($this instanceof \PhpMyAdmin\SqlParser\Statements\SelectStatement
+ if ($this instanceof Statements\SelectStatement
&& $token->value === 'ON'
) {
++$list->idx; // Skip ON
@@ -303,8 +303,8 @@ public function parse(Parser $parser, TokensList $list)
$options = array();
// Looking for duplicated clauses.
- if ((!empty(Parser::$KEYWORD_PARSERS[$token->value]))
- || (!empty(Parser::$STATEMENT_PARSERS[$token->value]))
+ if (!empty(Parser::$KEYWORD_PARSERS[$token->value])
+ || !empty(Parser::$STATEMENT_PARSERS[$token->value])
) {
if (!empty($parsedClauses[$token->value])) {
$parser->error(
@@ -327,8 +327,8 @@ public function parse(Parser $parser, TokensList $list)
// Checking if this is the beginning of the statement.
if (!empty(Parser::$STATEMENT_PARSERS[$token->keyword])) {
- if ((!empty(static::$CLAUSES)) // Undefined for some statements.
- && (empty(static::$CLAUSES[$token->value]))
+ if (!empty(static::$CLAUSES) // Undefined for some statements.
+ && empty(static::$CLAUSES[$token->value])
) {
// Some keywords (e.g. `SET`) may be the beginning of a
// statement and a clause.
@@ -354,12 +354,23 @@ public function parse(Parser $parser, TokensList $list)
$parsedOptions = true;
}
} elseif ($class === null) {
- // Handle special end options in Select statement
- // See Statements\SelectStatement::$END_OPTIONS
- if ($this instanceof \PhpMyAdmin\SqlParser\Statements\SelectStatement
+ if ($this instanceof Statements\SelectStatement
&& ($token->value === 'FOR UPDATE'
|| $token->value === 'LOCK IN SHARE MODE')
) {
+ // Handle special end options in Select statement
+ // See Statements\SelectStatement::$END_OPTIONS
+ $this->end_options = OptionsArray::parse(
+ $parser,
+ $list,
+ static::$END_OPTIONS
+ );
+ } elseif ($this instanceof Statements\SetStatement
+ && ($token->value === 'COLLATE'
+ || $token->value === 'DEFAULT')
+ ) {
+ // Handle special end options in SET statement
+ // See Statements\SetStatement::$END_OPTIONS
$this->end_options = OptionsArray::parse(
$parser,
$list,
@@ -451,9 +462,7 @@ public function validateClauseOrder($parser, $list)
{
$clauses = array_flip(array_keys($this->getClauses()));
- if (empty($clauses)
- || count($clauses) == 0
- ) {
+ if (empty($clauses) || count($clauses) === 0) {
return true;
}
@@ -488,8 +497,19 @@ public function validateClauseOrder($parser, $list)
$clauseType
);
+ if ($clauseStartIdx !== -1
+ && $this instanceof Statements\SelectStatement
+ && ($clauseType === 'FORCE'
+ || $clauseType === 'IGNORE'
+ || $clauseType === 'USE')
+ ) {
+ // TODO: ordering of clauses in a SELECT statement with
+ // Index hints is not supported
+ return true;
+ }
+
// Handle ordering of Multiple Joins in a query
- if ($clauseStartIdx != -1) {
+ if ($clauseStartIdx !== -1) {
if ($minJoin === 0 && stripos($clauseType, 'JOIN')) {
// First JOIN clause is detected
$minJoin = $maxJoin = $clauseStartIdx;
@@ -501,7 +521,7 @@ public function validateClauseOrder($parser, $list)
}
}
- if ($clauseStartIdx != -1 && $clauseStartIdx < $minIdx) {
+ if ($clauseStartIdx !== -1 && $clauseStartIdx < $minIdx) {
if ($minJoin === 0 || $error === 1) {
$token = $list->tokens[$clauseStartIdx];
$parser->error(
@@ -512,7 +532,7 @@ public function validateClauseOrder($parser, $list)
return false;
}
$minIdx = $clauseStartIdx;
- } elseif ($clauseStartIdx != -1) {
+ } elseif ($clauseStartIdx !== -1) {
$minIdx = $clauseStartIdx;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AlterStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AlterStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AlterStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AlterStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AnalyzeStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AnalyzeStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AnalyzeStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/AnalyzeStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/BackupStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/BackupStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/BackupStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/BackupStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CallStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CallStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CallStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CallStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CheckStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CheckStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CheckStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CheckStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ChecksumStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ChecksumStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ChecksumStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ChecksumStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php
similarity index 62%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php
index 6510e526..65cdbbb2 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php
@@ -279,41 +279,43 @@ public function build()
. OptionsArray::build($this->options) . ' '
. Expression::build($this->name) . ' '
. OptionsArray::build($this->entityOptions);
- } elseif ($this->options->has('TABLE') && !is_null($this->select)) {
- return 'CREATE '
- . OptionsArray::build($this->options) . ' '
- . Expression::build($this->name) . ' '
- . $this->select->build();
- } elseif ($this->options->has('TABLE') && !is_null($this->like)) {
- return 'CREATE '
- . OptionsArray::build($this->options) . ' '
- . Expression::build($this->name) . ' LIKE '
- . Expression::build($this->like);
} elseif ($this->options->has('TABLE')) {
- $partition = '';
+ if (!is_null($this->select)) {
+ return 'CREATE '
+ . OptionsArray::build($this->options) . ' '
+ . Expression::build($this->name) . ' '
+ . $this->select->build();
+ } elseif (!is_null($this->like)) {
+ return 'CREATE '
+ . OptionsArray::build($this->options) . ' '
+ . Expression::build($this->name) . ' LIKE '
+ . Expression::build($this->like);
+ } else {
+ $partition = '';
+
+ if (!empty($this->partitionBy)) {
+ $partition .= "\nPARTITION BY " . $this->partitionBy;
+ }
+ if (!empty($this->partitionsNum)) {
+ $partition .= "\nPARTITIONS " . $this->partitionsNum;
+ }
+ if (!empty($this->subpartitionBy)) {
+ $partition .= "\nSUBPARTITION BY " . $this->subpartitionBy;
+ }
+ if (!empty($this->subpartitionsNum)) {
+ $partition .= "\nSUBPARTITIONS " . $this->subpartitionsNum;
+ }
+ if (!empty($this->partitions)) {
+ $partition .= "\n" . PartitionDefinition::build($this->partitions);
+ }
- if (!empty($this->partitionBy)) {
- $partition .= "\nPARTITION BY " . $this->partitionBy;
- }
- if (!empty($this->partitionsNum)) {
- $partition .= "\nPARTITIONS " . $this->partitionsNum;
- }
- if (!empty($this->subpartitionBy)) {
- $partition .= "\nSUBPARTITION BY " . $this->subpartitionBy;
+ return 'CREATE '
+ . OptionsArray::build($this->options) . ' '
+ . Expression::build($this->name) . ' '
+ . $fields
+ . OptionsArray::build($this->entityOptions)
+ . $partition;
}
- if (!empty($this->subpartitionsNum)) {
- $partition .= "\nSUBPARTITIONS " . $this->subpartitionsNum;
- }
- if (!empty($this->partitions)) {
- $partition .= "\n" . PartitionDefinition::build($this->partitions);
- }
-
- return 'CREATE '
- . OptionsArray::build($this->options) . ' '
- . Expression::build($this->name) . ' '
- . $fields
- . OptionsArray::build($this->entityOptions)
- . $partition;
} elseif ($this->options->has('VIEW')) {
return 'CREATE '
. OptionsArray::build($this->options) . ' '
@@ -327,8 +329,8 @@ public function build()
. OptionsArray::build($this->entityOptions) . ' '
. 'ON ' . Expression::build($this->table) . ' '
. 'FOR EACH ROW ' . TokensList::build($this->body);
- } elseif (($this->options->has('PROCEDURE'))
- || ($this->options->has('FUNCTION'))
+ } elseif ($this->options->has('PROCEDURE')
+ || $this->options->has('FUNCTION')
) {
$tmp = '';
if ($this->options->has('FUNCTION')) {
@@ -370,7 +372,7 @@ public function parse(Parser $parser, TokensList $list)
)
);
- if ((!isset($this->name)) || ($this->name === '')) {
+ if (!isset($this->name) || ($this->name === '')) {
$parser->error(
'The name of the entity was expected.',
$list->tokens[$list->idx]
@@ -386,7 +388,7 @@ public function parse(Parser $parser, TokensList $list)
*/
$token = $list->tokens[$list->idx];
$nextidx = $list->idx + 1;
- while ($nextidx < $list->count && $list->tokens[$nextidx]->type == Token::TYPE_WHITESPACE) {
+ while ($nextidx < $list->count && $list->tokens[$nextidx]->type === Token::TYPE_WHITESPACE) {
++$nextidx;
}
@@ -396,150 +398,148 @@ public function parse(Parser $parser, TokensList $list)
$list,
static::$DB_OPTIONS
);
- } elseif ($this->options->has('TABLE')
- && ($token->type == Token::TYPE_KEYWORD)
- && ($token->keyword == 'SELECT')
- ) {
- /* CREATE TABLE ... SELECT */
- $this->select = new SelectStatement($parser, $list);
- } elseif ($this->options->has('TABLE')
- && ($token->type == Token::TYPE_KEYWORD) && ($token->keyword == 'AS')
- && ($list->tokens[$nextidx]->type == Token::TYPE_KEYWORD)
- && ($list->tokens[$nextidx]->value == 'SELECT')
- ) {
- /* CREATE TABLE ... AS SELECT */
- $list->idx = $nextidx;
- $this->select = new SelectStatement($parser, $list);
- } elseif ($this->options->has('TABLE')
- && $token->type == Token::TYPE_KEYWORD
- && $token->keyword == 'LIKE'
- ) {
- /* CREATE TABLE `new_tbl` LIKE 'orig_tbl' */
- $list->idx = $nextidx;
- $this->like = Expression::parse(
- $parser,
- $list,
- array(
- 'parseField' => 'table',
- 'breakOnAlias' => true,
- )
- );
- // The 'LIKE' keyword was found, but no table_name was found next to it
- if ($this->like == null) {
- $parser->error(
- 'A table name was expected.',
- $list->tokens[$list->idx]
- );
- }
} elseif ($this->options->has('TABLE')) {
- $this->fields = CreateDefinition::parse($parser, $list);
- if (empty($this->fields)) {
- $parser->error(
- 'At least one column definition was expected.',
- $list->tokens[$list->idx]
+ if (($token->type === Token::TYPE_KEYWORD)
+ && ($token->keyword === 'SELECT')) {
+ /* CREATE TABLE ... SELECT */
+ $this->select = new SelectStatement($parser, $list);
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'AS')
+ && ($list->tokens[$nextidx]->type === Token::TYPE_KEYWORD)
+ && ($list->tokens[$nextidx]->value === 'SELECT')) {
+ /* CREATE TABLE ... AS SELECT */
+ $list->idx = $nextidx;
+ $this->select = new SelectStatement($parser, $list);
+ } elseif ($token->type === Token::TYPE_KEYWORD
+ && $token->keyword === 'LIKE') {
+ /* CREATE TABLE `new_tbl` LIKE 'orig_tbl' */
+ $list->idx = $nextidx;
+ $this->like = Expression::parse(
+ $parser,
+ $list,
+ array(
+ 'parseField' => 'table',
+ 'breakOnAlias' => true,
+ )
);
- }
- ++$list->idx;
+ // The 'LIKE' keyword was found, but no table_name was found next to it
+ if (is_null($this->like)) {
+ $parser->error(
+ 'A table name was expected.',
+ $list->tokens[$list->idx]
+ );
+ }
+ } else {
+ $this->fields = CreateDefinition::parse($parser, $list);
+ if (empty($this->fields)) {
+ $parser->error(
+ 'At least one column definition was expected.',
+ $list->tokens[$list->idx]
+ );
+ }
+ ++$list->idx;
- $this->entityOptions = OptionsArray::parse(
- $parser,
- $list,
- static::$TABLE_OPTIONS
- );
+ $this->entityOptions = OptionsArray::parse(
+ $parser,
+ $list,
+ static::$TABLE_OPTIONS
+ );
- /**
- * The field that is being filled (`partitionBy` or
- * `subpartitionBy`).
- *
- * @var string
- */
- $field = null;
-
- /**
- * The number of brackets. `false` means no bracket was found
- * previously. At least one bracket is required to validate the
- * expression.
- *
- * @var int|bool
- */
- $brackets = false;
-
- /*
- * Handles partitions.
- */
- for (; $list->idx < $list->count; ++$list->idx) {
/**
- * Token parsed at this moment.
+ * The field that is being filled (`partitionBy` or
+ * `subpartitionBy`).
*
- * @var Token
+ * @var string
*/
- $token = $list->tokens[$list->idx];
+ $field = null;
- // End of statement.
- if ($token->type === Token::TYPE_DELIMITER) {
- break;
- }
-
- // Skipping comments.
- if ($token->type === Token::TYPE_COMMENT) {
- continue;
- }
+ /**
+ * The number of brackets. `false` means no bracket was found
+ * previously. At least one bracket is required to validate the
+ * expression.
+ *
+ * @var int|bool
+ */
+ $brackets = false;
- if (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITION BY')) {
- $field = 'partitionBy';
- $brackets = false;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITION BY')) {
- $field = 'subpartitionBy';
- $brackets = false;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITIONS')) {
- $token = $list->getNextOfType(Token::TYPE_NUMBER);
- --$list->idx; // `getNextOfType` also advances one position.
- $this->partitionsNum = $token->value;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITIONS')) {
- $token = $list->getNextOfType(Token::TYPE_NUMBER);
- --$list->idx; // `getNextOfType` also advances one position.
- $this->subpartitionsNum = $token->value;
- } elseif (!empty($field)) {
- /*
- * Handling the content of `PARTITION BY` and `SUBPARTITION BY`.
+ /*
+ * Handles partitions.
+ */
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
*/
+ $token = $list->tokens[$list->idx];
- // Counting brackets.
- if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
- // This is used instead of `++$brackets` because,
- // initially, `$brackets` is `false` cannot be
- // incremented.
- $brackets = $brackets + 1;
- } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === ')')) {
- --$brackets;
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER) {
+ break;
}
- // Building the expression used for partitioning.
- $this->$field .= ($token->type === Token::TYPE_WHITESPACE) ? ' ' : $token->token;
-
- // Last bracket was read, the expression ended.
- // Comparing with `0` and not `false`, because `false` means
- // that no bracket was found and at least one must is
- // required.
- if ($brackets === 0) {
- $this->$field = trim($this->$field);
- $field = null;
+ // Skipping comments.
+ if ($token->type === Token::TYPE_COMMENT) {
+ continue;
}
- } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
- if (!empty($this->partitionBy)) {
- $this->partitions = ArrayObj::parse(
- $parser,
- $list,
- array(
- 'type' => 'PhpMyAdmin\\SqlParser\\Components\\PartitionDefinition',
- )
- );
+
+ if (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITION BY')) {
+ $field = 'partitionBy';
+ $brackets = false;
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITION BY')) {
+ $field = 'subpartitionBy';
+ $brackets = false;
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITIONS')) {
+ $token = $list->getNextOfType(Token::TYPE_NUMBER);
+ --$list->idx; // `getNextOfType` also advances one position.
+ $this->partitionsNum = $token->value;
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITIONS')) {
+ $token = $list->getNextOfType(Token::TYPE_NUMBER);
+ --$list->idx; // `getNextOfType` also advances one position.
+ $this->subpartitionsNum = $token->value;
+ } elseif (!empty($field)) {
+ /*
+ * Handling the content of `PARTITION BY` and `SUBPARTITION BY`.
+ */
+
+ // Counting brackets.
+ if ($token->type === Token::TYPE_OPERATOR) {
+ if ($token->value === '(') {
+ // This is used instead of `++$brackets` because,
+ // initially, `$brackets` is `false` cannot be
+ // incremented.
+ $brackets = $brackets + 1;
+ } elseif ($token->value === ')') {
+ --$brackets;
+ }
+ }
+
+ // Building the expression used for partitioning.
+ $this->$field .= ($token->type === Token::TYPE_WHITESPACE) ? ' ' : $token->token;
+
+ // Last bracket was read, the expression ended.
+ // Comparing with `0` and not `false`, because `false` means
+ // that no bracket was found and at least one must is
+ // required.
+ if ($brackets === 0) {
+ $this->$field = trim($this->$field);
+ $field = null;
+ }
+ } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
+ if (!empty($this->partitionBy)) {
+ $this->partitions = ArrayObj::parse(
+ $parser,
+ $list,
+ array(
+ 'type' => 'PhpMyAdmin\\SqlParser\\Components\\PartitionDefinition',
+ )
+ );
+ }
+ break;
}
- break;
}
}
- } elseif (($this->options->has('PROCEDURE'))
- || ($this->options->has('FUNCTION'))
+ } elseif ($this->options->has('PROCEDURE')
+ || $this->options->has('FUNCTION')
) {
$this->parameters = ParameterDefinition::parse($parser, $list);
if ($this->options->has('FUNCTION')) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php
similarity index 59%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php
index bf47cd87..7ff00254 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php
@@ -142,25 +142,25 @@ public function build()
{
$ret = 'DELETE ' . OptionsArray::build($this->options);
- if ($this->columns != null && count($this->columns) > 0) {
+ if (!is_null($this->columns) && count($this->columns) > 0) {
$ret .= ' ' . ExpressionArray::build($this->columns);
}
- if ($this->from != null && count($this->from) > 0) {
+ if (!is_null($this->from) && count($this->from) > 0) {
$ret .= ' FROM ' . ExpressionArray::build($this->from);
}
- if ($this->join != null && count($this->join) > 0) {
+ if (!is_null($this->join) && count($this->join) > 0) {
$ret .= ' ' . JoinKeyword::build($this->join);
}
- if ($this->using != null && count($this->using) > 0) {
+ if (!is_null($this->using) && count($this->using) > 0) {
$ret .= ' USING ' . ExpressionArray::build($this->using);
}
- if ($this->where != null && count($this->where) > 0) {
+ if (!is_null($this->where) && count($this->where) > 0) {
$ret .= ' WHERE ' . Condition::build($this->where);
}
- if ($this->order != null && count($this->order) > 0) {
+ if (!is_null($this->order) && count($this->order) > 0) {
$ret .= ' ORDER BY ' . ExpressionArray::build($this->order);
}
- if ($this->limit != null && strlen($this->limit) > 0) {
+ if (!is_null($this->limit) && strlen($this->limit) > 0) {
$ret .= ' LIMIT ' . Limit::build($this->limit);
}
@@ -221,87 +221,83 @@ public function parse(Parser $parser, TokensList $list)
}
if ($state === 0) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword !== 'FROM'
- ) {
- $parser->error('Unexpected keyword.', $token);
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'FROM'
- ) {
- ++$list->idx; // Skip 'FROM'
- $this->from = ExpressionArray::parse($parser, $list);
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword !== 'FROM') {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ } else {
+ ++$list->idx; // Skip 'FROM'
+ $this->from = ExpressionArray::parse($parser, $list);
- $state = 2;
+ $state = 2;
+ }
} else {
$this->columns = ExpressionArray::parse($parser, $list);
$state = 1;
}
} elseif ($state === 1) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword !== 'FROM'
- ) {
- $parser->error('Unexpected keyword.', $token);
- break;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'FROM'
- ) {
- ++$list->idx; // Skip 'FROM'
- $this->from = ExpressionArray::parse($parser, $list);
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword !== 'FROM') {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ } else {
+ ++$list->idx; // Skip 'FROM'
+ $this->from = ExpressionArray::parse($parser, $list);
- $state = 2;
+ $state = 2;
+ }
} else {
$parser->error('Unexpected token.', $token);
break;
}
} elseif ($state === 2) {
- if ($token->type === Token::TYPE_KEYWORD
- && stripos($token->keyword, 'JOIN') !== false
- ) {
- ++$list->idx;
- $this->join = JoinKeyword::parse($parser, $list);
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if (stripos($token->keyword, 'JOIN') !== false) {
+ ++$list->idx;
+ $this->join = JoinKeyword::parse($parser, $list);
- // remain in state = 2
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'USING'
- ) {
- ++$list->idx; // Skip 'USING'
- $this->using = ExpressionArray::parse($parser, $list);
- $state = 3;
+ // remain in state = 2
+ }
+ else {
+ switch($token->keyword) {
+ case 'USING':
+ ++$list->idx; // Skip 'USING'
+ $this->using = ExpressionArray::parse($parser, $list);
+ $state = 3;
- $multiTable = true;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHERE'
- ) {
- ++$list->idx; // Skip 'WHERE'
- $this->where = Condition::parse($parser, $list);
- $state = 4;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ORDER BY'
- ) {
- ++$list->idx; // Skip 'ORDER BY'
- $this->order = OrderKeyword::parse($parser, $list);
- $state = 5;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'LIMIT'
- ) {
- ++$list->idx; // Skip 'LIMIT'
- $this->limit = Limit::parse($parser, $list);
- $state = 6;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ $multiTable = true;
+ break;
+ case 'WHERE':
+ ++$list->idx; // Skip 'WHERE'
+ $this->where = Condition::parse($parser, $list);
+ $state = 4;
+ break;
+ case 'ORDER BY':
+ ++$list->idx; // Skip 'ORDER BY'
+ $this->order = OrderKeyword::parse($parser, $list);
+ $state = 5;
+ break;
+ case 'LIMIT':
+ ++$list->idx; // Skip 'LIMIT'
+ $this->limit = Limit::parse($parser, $list);
+ $state = 6;
+ break;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
+ }
}
} elseif ($state === 3) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'WHERE'
- ) {
- ++$list->idx; // Skip 'WHERE'
- $this->where = Condition::parse($parser, $list);
- $state = 4;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'WHERE') {
+ ++$list->idx; // Skip 'WHERE'
+ $this->where = Condition::parse($parser, $list);
+ $state = 4;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
} else {
$parser->error('Unexpected token.', $token);
break;
@@ -317,32 +313,33 @@ public function parse(Parser $parser, TokensList $list)
break;
}
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'ORDER BY'
- ) {
- ++$list->idx; // Skip 'ORDER BY'
- $this->order = OrderKeyword::parse($parser, $list);
- $state = 5;
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'LIMIT'
- ) {
- ++$list->idx; // Skip 'LIMIT'
- $this->limit = Limit::parse($parser, $list);
- $state = 6;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ switch($token->keyword) {
+ case 'ORDER BY':
+ ++$list->idx; // Skip 'ORDER BY'
+ $this->order = OrderKeyword::parse($parser, $list);
+ $state = 5;
+ break;
+ case 'LIMIT':
+ ++$list->idx; // Skip 'LIMIT'
+ $this->limit = Limit::parse($parser, $list);
+ $state = 6;
+ break;
+ default:
+ $parser->error('Unexpected keyword.', $token);
+ break 2;
+ }
}
} elseif ($state === 5) {
- if ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'LIMIT'
- ) {
- ++$list->idx; // Skip 'LIMIT'
- $this->limit = Limit::parse($parser, $list);
- $state = 6;
- } elseif ($token->type === Token::TYPE_KEYWORD) {
- $parser->error('Unexpected keyword.', $token);
- break;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'LIMIT') {
+ ++$list->idx; // Skip 'LIMIT'
+ $this->limit = Limit::parse($parser, $list);
+ $state = 6;
+ } else {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
}
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DropStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DropStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DropStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/DropStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ExplainStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ExplainStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ExplainStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ExplainStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php
index 1bdf73b4..312b4e04 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/InsertStatement.php
@@ -113,15 +113,15 @@ public function build()
$ret = 'INSERT ' . $this->options
. ' INTO ' . $this->into;
- if ($this->values != null && count($this->values) > 0) {
+ if (!is_null($this->values) && count($this->values) > 0) {
$ret .= ' VALUES ' . Array2d::build($this->values);
- } elseif ($this->set != null && count($this->set) > 0) {
+ } elseif (!is_null($this->set) && count($this->set) > 0) {
$ret .= ' SET ' . SetOperation::build($this->set);
- } elseif ($this->select != null && strlen($this->select) > 0) {
+ } elseif (!is_null($this->select) && strlen($this->select) > 0) {
$ret .= ' ' . $this->select->build();
}
- if ($this->onDuplicateSet != null && count($this->onDuplicateSet) > 0) {
+ if (!is_null($this->onDuplicateSet) && count($this->onDuplicateSet) > 0) {
$ret .= ' ON DUPLICATE KEY UPDATE ' . SetOperation::build($this->onDuplicateSet);
}
@@ -229,7 +229,7 @@ public function parse(Parser $parser, TokensList $list)
);
break;
}
- } elseif ($state == 2) {
+ } elseif ($state === 2) {
$lastCount = $miniState;
if ($miniState === 1 && $token->keyword === 'ON') {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php
index 13b68e7c..45ad05fb 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LoadStatement.php
@@ -270,15 +270,13 @@ public function parse(Parser $parser, TokensList $list)
);
$state = 1;
} elseif ($state === 1) {
- if (($token->type === Token::TYPE_KEYWORD)
- && ($token->keyword === 'REPLACE'
- || $token->keyword === 'IGNORE')
- ) {
- $this->replace_ignore = trim($token->keyword);
- } elseif ($token->type === Token::TYPE_KEYWORD
- && $token->keyword === 'INTO'
- ) {
- $state = 2;
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword === 'REPLACE'
+ || $token->keyword === 'IGNORE') {
+ $this->replace_ignore = trim($token->keyword);
+ } elseif ($token->keyword === 'INTO') {
+ $state = 2;
+ }
}
} elseif ($state === 2) {
if ($token->type === Token::TYPE_KEYWORD
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LockStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LockStatement.php
new file mode 100644
index 00000000..2ba70c4e
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/LockStatement.php
@@ -0,0 +1,128 @@
+tokens[$list->idx]->value === 'UNLOCK') {
+ // this is in fact an UNLOCK statement
+ $this->isLock = false;
+ }
+ ++$list->idx; // Skipping `LOCK`.
+
+ /**
+ * The state of the parser.
+ *
+ * Below are the states of the parser.
+ *
+ * 0 ---------------- [ TABLES ] -----------------> 1
+ * 1 -------------- [ lock_expr ] ----------------> 2
+ * 2 ------------------ [ , ] --------------------> 1
+ *
+ * @var int
+ */
+ $state = 0;
+
+ /**
+ * Previous parsed token
+ */
+ $prevToken = null;
+
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
+ */
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER) {
+ break;
+ }
+
+ // Skipping whitespaces and comments.
+ if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
+ continue;
+ }
+
+ if ($state === 0) {
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if ($token->keyword !== 'TABLES') {
+ $parser->error('Unexpected keyword.', $token);
+ break;
+ }
+ $state = 1;
+ continue;
+ } else {
+ $parser->error('Unexpected token.', $token);
+ break;
+ }
+ } elseif ($state === 1) {
+ if (!$this->isLock) {
+ // UNLOCK statement should not have any more tokens
+ $parser->error('Unexpected token.', $token);
+ break;
+ }
+ $this->locked[] = LockExpression::parse($parser, $list);
+ $state = 2;
+ } elseif ($state === 2) {
+ if ($token->value === ',') {
+ // move over to parsing next lock expression
+ $state = 1;
+ }
+ }
+
+ $prevToken = $token;
+ }
+
+ if ($state !== 2 && $prevToken != null) {
+ $parser->error('Unexpected end of LOCK statement.', $prevToken);
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function build()
+ {
+ return trim(($this->isLock ? 'LOCK' : 'UNLOCK')
+ . ' TABLES ' . LockExpression::build($this->locked));
+ }
+}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/MaintenanceStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/MaintenanceStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/MaintenanceStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/MaintenanceStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/NotImplementedStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/NotImplementedStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/NotImplementedStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/NotImplementedStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/OptimizeStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/OptimizeStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/OptimizeStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/OptimizeStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/PurgeStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/PurgeStatement.php
new file mode 100644
index 00000000..03748135
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/PurgeStatement.php
@@ -0,0 +1,143 @@
+log_type . ' ' . 'LOGS '
+ . ($this->end_option !== null ? ($this->end_option . ' ' . $this->end_expr) : '');
+ return trim($ret);
+ }
+
+ /**
+ * @param Parser $parser the instance that requests parsing
+ * @param TokensList $list the list of tokens to be parsed
+ */
+ public function parse(Parser $parser, TokensList $list)
+ {
+ ++$list->idx; // Skipping `PURGE`.
+
+ /**
+ * The state of the parser.
+ *
+ * @var int
+ */
+ $state = 0;
+
+ for (; $list->idx < $list->count; ++$list->idx) {
+ /**
+ * Token parsed at this moment.
+ *
+ * @var Token
+ */
+ $token = $list->tokens[$list->idx];
+
+ // End of statement.
+ if ($token->type === Token::TYPE_DELIMITER) {
+ break;
+ }
+
+ // Skipping whitespaces and comments.
+ if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
+ continue;
+ }
+
+ switch ($state) {
+ case 0:
+ // parse `{ BINARY | MASTER }`
+ $this->log_type = self::parseExpectedKeyword($parser, $token, array('BINARY', 'MASTER'));
+ break;
+ case 1:
+ // parse `LOGS`
+ self::parseExpectedKeyword($parser, $token, array('LOGS'));
+ break;
+ case 2:
+ // parse `{ TO | BEFORE }`
+ $this->end_option = self::parseExpectedKeyword($parser, $token, array('TO', 'BEFORE'));
+ break;
+ case 3:
+ // parse `expr`
+ $this->end_expr = Expression::parse($parser, $list, array());
+ break;
+ default:
+ $parser->error('Unexpected token.', $token);
+ break;
+ }
+ $state++;
+ $prevToken = $token;
+ }
+
+ // Only one possible end state
+ if ($state != 4) {
+ $parser->error('Unexpected token.', $prevToken);
+ }
+ }
+
+ /**
+ * Parse expected keyword (or throw relevant error)
+ *
+ * @param Parser $parser the instance that requests parsing
+ * @param Token $token token to be parsed
+ * @param Array $expected_keywords array of possibly expected keywords at this point
+ */
+ private static function parseExpectedKeyword($parser, $token, $expected_keywords)
+ {
+ if ($token->type === Token::TYPE_KEYWORD) {
+ if (in_array($token->keyword, $expected_keywords)) {
+ return $token->keyword;
+ } else {
+ $parser->error('Unexpected keyword', $token);
+ }
+ } else {
+ $parser->error('Unexpected token.', $token);
+ }
+ return null;
+ }
+}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php
index 90533c20..e1bcf0d2 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RenameStatement.php
@@ -47,4 +47,12 @@ public function before(Parser $parser, TokensList $list, Token $token)
$list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');
}
}
+
+ /**
+ * @return string
+ */
+ public function build()
+ {
+ return 'RENAME TABLE ' . RenameOperation::build($this->renames);
+ }
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RepairStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RepairStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RepairStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RepairStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php
index 59d66aed..40b11948 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ReplaceStatement.php
@@ -89,11 +89,11 @@ public function build()
{
$ret = 'REPLACE ' . $this->options . ' INTO ' . $this->into;
- if ($this->values != null && count($this->values) > 0) {
+ if (!is_null($this->values) && count($this->values) > 0) {
$ret .= ' VALUES ' . Array2d::build($this->values);
- } elseif ($this->set != null && count($this->set) > 0) {
+ } elseif (!is_null($this->set) && count($this->set) > 0) {
$ret .= ' SET ' . SetOperation::build($this->set);
- } elseif ($this->select != null && strlen($this->select) > 0) {
+ } elseif (!is_null($this->select) && strlen($this->select) > 0) {
$ret .= ' ' . $this->select->build();
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RestoreStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RestoreStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RestoreStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/RestoreStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php
index cd1d628b..fbcae48e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SelectStatement.php
@@ -91,6 +91,9 @@ class SelectStatement extends Statement
'_SELECT' => array('SELECT', 1),
'INTO' => array('INTO', 3),
'FROM' => array('FROM', 3),
+ 'FORCE' => array('FORCE', 1),
+ 'USE' => array('USE', 1),
+ 'IGNORE' => array('IGNORE', 3),
'PARTITION' => array('PARTITION', 3),
'JOIN' => array('JOIN', 1),
@@ -135,6 +138,13 @@ class SelectStatement extends Statement
*/
public $from = array();
+ /**
+ * Index hints
+ *
+ * @var IndexHint[]
+ */
+ public $index_hints;
+
/**
* Partitions used as source for this statement.
*
@@ -226,8 +236,7 @@ public function getClauses()
// statement.
if (!empty($this->union)) {
$clauses = static::$CLAUSES;
- unset($clauses['ORDER BY']);
- unset($clauses['LIMIT']);
+ unset($clauses['ORDER BY'], $clauses['LIMIT']);
$clauses['ORDER BY'] = array('ORDER BY', 3);
$clauses['LIMIT'] = array('LIMIT', 3);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php
similarity index 69%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php
index 007134f3..ef3a0c13 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/SetStatement.php
@@ -28,6 +28,7 @@ class SetStatement extends Statement
*/
public static $CLAUSES = array(
'SET' => array('SET', 3),
+ '_END_OPTIONS' => array('_END_OPTIONS', 1),
);
/**
@@ -42,6 +43,11 @@ class SetStatement extends Statement
'PASSWORD' => array(3, 'expr'),
);
+ public static $END_OPTIONS = array(
+ 'COLLATE' => array(1, 'var'),
+ 'DEFAULT' => 1
+ );
+
/**
* Options used in current statement.
*
@@ -49,6 +55,15 @@ class SetStatement extends Statement
*/
public $options;
+ /**
+ * The end options of this query.
+ *
+ * @var OptionsArray
+ *
+ * @see static::$END_OPTIONS
+ */
+ public $end_options;
+
/**
* The updated values.
*
@@ -61,7 +76,10 @@ class SetStatement extends Statement
*/
public function build()
{
- return 'SET ' . OptionsArray::build($this->options)
- . ' ' . SetOperation::build($this->set);
+ $ret = 'SET ' . OptionsArray::build($this->options)
+ . ' ' . SetOperation::build($this->set)
+ . ' ' . OptionsArray::build($this->end_options);
+
+ return trim($ret);
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ShowStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ShowStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ShowStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/ShowStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php
index c2bb3038..cfdc25cb 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TransactionStatement.php
@@ -82,12 +82,12 @@ public function parse(Parser $parser, TokensList $list)
parent::parse($parser, $list);
// Checks the type of this query.
- if (($this->options->has('START TRANSACTION'))
- || ($this->options->has('BEGIN'))
+ if ($this->options->has('START TRANSACTION')
+ || $this->options->has('BEGIN')
) {
$this->type = self::TYPE_BEGIN;
- } elseif (($this->options->has('COMMIT'))
- || ($this->options->has('ROLLBACK'))
+ } elseif ($this->options->has('COMMIT')
+ || $this->options->has('ROLLBACK')
) {
$this->type = self::TYPE_END;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TruncateStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TruncateStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TruncateStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/TruncateStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/UpdateStatement.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/UpdateStatement.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/UpdateStatement.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Statements/UpdateStatement.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php
index 4d028bfa..077c2c22 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Token.php
@@ -295,20 +295,20 @@ public function extract()
return $str;
case self::TYPE_SYMBOL:
$str = $this->token;
- if ((isset($str[0])) && ($str[0] === '@')) {
+ if (isset($str[0]) && ($str[0] === '@')) {
// `mb_strlen($str)` must be used instead of `null` because
// in PHP 5.3- the `null` parameter isn't handled correctly.
$str = mb_substr(
$str,
- ((!empty($str[1])) && ($str[1] === '@')) ? 2 : 1,
+ (!empty($str[1]) && ($str[1] === '@')) ? 2 : 1,
mb_strlen($str),
'UTF-8'
);
}
- if ((isset($str[0])) && ($str[0] === ':')) {
+ if (isset($str[0]) && ($str[0] === ':')) {
$str = mb_substr($str, 1, mb_strlen($str), 'UTF-8');
}
- if ((isset($str[0])) && (($str[0] === '`')
+ if (isset($str[0]) && (($str[0] === '`')
|| ($str[0] === '"') || ($str[0] === '\''))
) {
$quote = $str[0];
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/TokensList.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/TokensList.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/TokensList.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/TokensList.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Translator.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Translator.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Translator.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Translator.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/UtfString.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/UtfString.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/UtfString.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/UtfString.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php
index b333fa34..ee0dca48 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/BufferedQuery.php
@@ -191,7 +191,7 @@ public function extract($end = false)
* treated differently, because of the preceding backslash, it will
* be ignored.
*/
- if ((($this->status & static::STATUS_COMMENT) == 0) && ($this->query[$i] === '\\')) {
+ if ((($this->status & static::STATUS_COMMENT) === 0) && ($this->query[$i] === '\\')) {
$this->current .= $this->query[$i] . $this->query[++$i];
continue;
}
@@ -261,22 +261,21 @@ public function extract($end = false)
$this->status = static::STATUS_COMMENT_BASH;
$this->current .= $this->query[$i];
continue;
- } elseif (($i + 2 < $len)
- && ($this->query[$i] === '-')
- && ($this->query[$i + 1] === '-')
- && (Context::isWhitespace($this->query[$i + 2]))
- ) {
- $this->status = static::STATUS_COMMENT_SQL;
- $this->current .= $this->query[$i];
- continue;
- } elseif (($i + 2 < $len)
- && ($this->query[$i] === '/')
- && ($this->query[$i + 1] === '*')
- && ($this->query[$i + 2] !== '!')
- ) {
- $this->status = static::STATUS_COMMENT_C;
- $this->current .= $this->query[$i];
- continue;
+ } elseif ($i + 2 < $len) {
+ if (($this->query[$i] === '-')
+ && ($this->query[$i + 1] === '-')
+ && Context::isWhitespace($this->query[$i + 2])) {
+ $this->status = static::STATUS_COMMENT_SQL;
+ $this->current .= $this->query[$i];
+ continue;
+ }
+ elseif (($this->query[$i] === '/')
+ && ($this->query[$i + 1] === '*')
+ && ($this->query[$i + 2] !== '!')) {
+ $this->status = static::STATUS_COMMENT_C;
+ $this->current .= $this->query[$i];
+ continue;
+ }
}
/*
@@ -301,7 +300,7 @@ public function extract($end = false)
&& (($this->query[$i + 6] === 'T') || ($this->query[$i + 6] === 't'))
&& (($this->query[$i + 7] === 'E') || ($this->query[$i + 7] === 'e'))
&& (($this->query[$i + 8] === 'R') || ($this->query[$i + 8] === 'r'))
- && (Context::isWhitespace($this->query[$i + 9]))
+ && Context::isWhitespace($this->query[$i + 9])
) {
// Saving the current index to be able to revert any parsing
// done in this block.
@@ -309,7 +308,7 @@ public function extract($end = false)
$i += 9; // Skipping `DELIMITER`.
// Skipping whitespaces.
- while (($i < $len) && (Context::isWhitespace($this->query[$i]))) {
+ while (($i < $len) && Context::isWhitespace($this->query[$i])) {
++$i;
}
@@ -320,9 +319,9 @@ public function extract($end = false)
}
// Checking if the delimiter definition ended.
- if (($delimiter != '')
- && ((($i < $len) && (Context::isWhitespace($this->query[$i])))
- || (($i === $len) && ($end)))
+ if (($delimiter !== '')
+ && ((($i < $len) && Context::isWhitespace($this->query[$i]))
+ || (($i === $len) && $end))
) {
// Saving the delimiter.
$this->setDelimiter($delimiter);
@@ -393,7 +392,7 @@ public function extract($end = false)
$this->current .= $this->query[$i];
}
- if (($end) && ($i === $len)) {
+ if ($end && ($i === $len)) {
// If the end of the buffer was reached, the buffer is emptied and
// the current statement that was extracted is returned.
$ret = $this->current;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php
similarity index 99%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php
index d412789c..3dc48a6c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/CLI.php
@@ -120,7 +120,7 @@ public function runLint()
$lexer = new Lexer($params['q'], false);
$parser = new Parser($lexer->list);
$errors = Error::get(array($lexer, $parser));
- if (count($errors) == 0) {
+ if (count($errors) === 0) {
return 0;
}
$output = Error::format($errors);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Error.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Error.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Error.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Error.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php
index df260e7d..c41c69cc 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Formatter.php
@@ -412,8 +412,8 @@ public function formatList($list)
}
// Checking if this clause ended.
- if ($tmp = static::isClause($curr)) {
- if (($tmp == 2 || $this->options['clause_newline']) && empty(self::$SHORT_CLAUSES[$lastClause])) {
+ if ($isClause = static::isClause($curr)) {
+ if (($isClause === 2 || $this->options['clause_newline']) && empty(self::$SHORT_CLAUSES[$lastClause])) {
$lineEnded = true;
if ($this->options['parts_newline'] && $indent > 0) {
--$indent;
@@ -424,8 +424,8 @@ public function formatList($list)
// Inline JOINs
if (($prev->type === Token::TYPE_KEYWORD && isset(JoinKeyword::$JOINS[$prev->value]))
|| (in_array($curr->value, array('ON', 'USING'), true) && isset(JoinKeyword::$JOINS[$list->tokens[$list->idx - 2]->value]))
- || (isset($list->tokens[$list->idx - 4]) && isset(JoinKeyword::$JOINS[$list->tokens[$list->idx - 4]->value]))
- || (isset($list->tokens[$list->idx - 6]) && isset(JoinKeyword::$JOINS[$list->tokens[$list->idx - 6]->value]))
+ || isset($list->tokens[$list->idx - 4], JoinKeyword::$JOINS[$list->tokens[$list->idx - 4]->value])
+ || isset($list->tokens[$list->idx - 6], JoinKeyword::$JOINS[$list->tokens[$list->idx - 6]->value])
) {
$lineEnded = false;
}
@@ -433,7 +433,7 @@ public function formatList($list)
// Indenting BEGIN ... END blocks.
if ($prev->type === Token::TYPE_KEYWORD && $prev->keyword === 'BEGIN') {
$lineEnded = true;
- array_push($blocksIndentation, $indent);
+ $blocksIndentation[] = $indent;
++$indent;
} elseif ($curr->type === Token::TYPE_KEYWORD && $curr->keyword === 'END') {
$lineEnded = true;
@@ -460,14 +460,14 @@ public function formatList($list)
// Brackets are indented only if the length of the fragment between
// them is longer than 30 characters.
if ($prev->type === Token::TYPE_OPERATOR && $prev->value === '(') {
- array_push($blocksIndentation, $indent);
+ $blocksIndentation[] = $indent;
$shortGroup = true;
if (static::getGroupLength($list) > 30) {
++$indent;
$lineEnded = true;
$shortGroup = false;
}
- array_push($blocksLineEndings, $lineEnded);
+ $blocksLineEndings[] = $lineEnded;
} elseif ($curr->type === Token::TYPE_OPERATOR && $curr->value === ')') {
$indent = array_pop($blocksIndentation);
$lineEnded |= array_pop($blocksLineEndings);
@@ -554,7 +554,7 @@ public function toString($token)
if ($this->options['type'] === 'html') {
return '' . htmlspecialchars($text, ENT_NOQUOTES) . '';
} elseif ($this->options['type'] === 'cli') {
- if ($prev != $format['cli']) {
+ if ($prev !== $format['cli']) {
$prev = $format['cli'];
return $format['cli'] . $this->escapeConsole($text);
@@ -568,7 +568,7 @@ public function toString($token)
}
if ($this->options['type'] === 'cli') {
- if ($prev != "\x1b[39m") {
+ if ($prev !== "\x1b[39m") {
$prev = "\x1b[39m";
return "\x1b[39m" . $this->escapeConsole($text);
@@ -633,7 +633,7 @@ public static function getGroupLength($list)
++$count;
} elseif ($list->tokens[$idx]->value === ')') {
--$count;
- if ($count == 0) {
+ if ($count === 0) {
break;
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php
similarity index 81%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php
index 9374db33..387600fa 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Misc.php
@@ -29,8 +29,8 @@ class Misc
public static function getAliases($statement, $database)
{
if (!($statement instanceof SelectStatement)
- || (empty($statement->expr))
- || (empty($statement->from))
+ || empty($statement->expr)
+ || empty($statement->from)
) {
return array();
}
@@ -55,11 +55,11 @@ public static function getAliases($statement, $database)
}
foreach ($expressions as $expr) {
- if ((!isset($expr->table)) || ($expr->table === '')) {
+ if (!isset($expr->table) || ($expr->table === '')) {
continue;
}
- $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ?
+ $thisDb = (isset($expr->database) && ($expr->database !== '')) ?
$expr->database : $database;
if (!isset($retval[$thisDb])) {
@@ -71,7 +71,7 @@ public static function getAliases($statement, $database)
if (!isset($retval[$thisDb]['tables'][$expr->table])) {
$retval[$thisDb]['tables'][$expr->table] = array(
- 'alias' => ((isset($expr->alias)) && ($expr->alias !== '')) ?
+ 'alias' => (isset($expr->alias) && ($expr->alias !== '')) ?
$expr->alias : null,
'columns' => array(),
);
@@ -84,16 +84,15 @@ public static function getAliases($statement, $database)
}
foreach ($statement->expr as $expr) {
- if ((!isset($expr->column)) || ($expr->column === '')
- || (!isset($expr->alias)) || ($expr->alias === '')
+ if (!isset($expr->column, $expr->alias) || ($expr->column === '') || ($expr->alias === '')
) {
continue;
}
- $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ?
+ $thisDb = (isset($expr->database) && ($expr->database !== '')) ?
$expr->database : $database;
- if ((isset($expr->table)) && ($expr->table !== '')) {
+ if (isset($expr->table) && ($expr->table !== '')) {
$thisTable = isset($tables[$thisDb][$expr->table]) ?
$tables[$thisDb][$expr->table] : $expr->table;
$retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php
index 0115bbf8..b43a35e1 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Query.php
@@ -228,11 +228,11 @@ private static function _getFlagsSelect($statement, $flags)
$flags['distinct'] = true;
}
- if ((!empty($statement->group)) || (!empty($statement->having))) {
+ if (!empty($statement->group) || !empty($statement->having)) {
$flags['is_group'] = true;
}
- if ((!empty($statement->into))
+ if (!empty($statement->into)
&& ($statement->into->type === 'OUTFILE')
) {
$flags['is_export'] = true;
@@ -258,7 +258,7 @@ private static function _getFlagsSelect($statement, $flags)
}
}
- if ((!empty($statement->procedure))
+ if (!empty($statement->procedure)
&& ($statement->procedure->name === 'ANALYSE')
) {
$flags['is_analyse'] = true;
@@ -330,8 +330,8 @@ public static function getFlags($statement, $all = false)
$flags['querytype'] = 'DROP';
$flags['reload'] = true;
- if (($statement->options->has('DATABASE')
- || ($statement->options->has('SCHEMA')))
+ if ($statement->options->has('DATABASE')
+ || $statement->options->has('SCHEMA')
) {
$flags['drop_database'] = true;
}
@@ -415,8 +415,7 @@ public static function getAll($query)
// Finding tables' aliases and their associated real names.
$tableAliases = array();
foreach ($statement->from as $expr) {
- if ((isset($expr->table)) && ($expr->table !== '')
- && (isset($expr->alias)) && ($expr->alias !== '')
+ if (isset($expr->table, $expr->alias) && ($expr->table !== '') && ($expr->alias !== '')
) {
$tableAliases[$expr->alias] = array(
$expr->table,
@@ -429,13 +428,13 @@ public static function getAll($query)
// Sometimes, this is not possible because the tables aren't defined
// explicitly (e.g. SELECT * FROM film, SELECT film_id FROM film).
foreach ($statement->expr as $expr) {
- if ((isset($expr->table)) && ($expr->table !== '')) {
+ if (isset($expr->table) && ($expr->table !== '')) {
if (isset($tableAliases[$expr->table])) {
$arr = $tableAliases[$expr->table];
} else {
$arr = array(
$expr->table,
- ((isset($expr->database)) && ($expr->database !== '')) ?
+ (isset($expr->database) && ($expr->database !== '')) ?
$expr->database : null,
);
}
@@ -452,10 +451,10 @@ public static function getAll($query)
// extracted from the FROM clause.
if (empty($ret['select_tables'])) {
foreach ($statement->from as $expr) {
- if ((isset($expr->table)) && ($expr->table !== '')) {
+ if (isset($expr->table) && ($expr->table !== '')) {
$arr = array(
$expr->table,
- ((isset($expr->database)) && ($expr->database !== '')) ?
+ (isset($expr->database) && ($expr->database !== '')) ?
$expr->database : null,
);
if (!in_array($arr, $ret['select_tables'])) {
@@ -627,14 +626,14 @@ public static function getClause($statement, $list, $clause, $type = 0, $skipFir
}
}
- if ($brackets == 0) {
+ if ($brackets === 0) {
// Checking if the section was changed.
if (($token->type === Token::TYPE_KEYWORD)
- && (isset($clauses[$token->keyword]))
+ && isset($clauses[$token->keyword])
&& ($clauses[$token->keyword] >= $currIdx)
) {
$currIdx = $clauses[$token->keyword];
- if (($skipFirst) && ($currIdx == $clauseIdx)) {
+ if ($skipFirst && ($currIdx === $clauseIdx)) {
// This token is skipped (not added to the old
// clause) because it will be replaced.
continue;
@@ -727,12 +726,12 @@ public static function replaceClauses($statement, $list, array $ops)
$ret .= static::getClause($statement, $list, $ops[0][0], -1) . ' ';
// Doing replacements.
- for ($i = 0; $i < $count; ++$i) {
- $ret .= $ops[$i][1] . ' ';
+ foreach ($ops as $i => $clause) {
+ $ret .= $clause[1] . ' ';
// Adding everything between this and next replacement.
if ($i + 1 !== $count) {
- $ret .= static::getClause($statement, $list, $ops[$i][0], $ops[$i + 1][0]) . ' ';
+ $ret .= static::getClause($statement, $list, $clause[0], $ops[$i + 1][0]) . ' ';
}
}
@@ -780,7 +779,7 @@ public static function getFirstStatement($query, $delimiter = null)
$statement .= $token->token;
- if (($token->type === Token::TYPE_DELIMITER) && (!empty($token->token))) {
+ if (($token->type === Token::TYPE_DELIMITER) && !empty($token->token)) {
$delimiter = $token->token;
$fullStatement = true;
break;
@@ -844,9 +843,9 @@ public static function getClauseStartOffset($statement, $list, $clause)
}
}
- if ($brackets == 0) {
+ if ($brackets === 0) {
if (($token->type === Token::TYPE_KEYWORD)
- && (isset($clauses[$token->keyword]))
+ && isset($clauses[$token->keyword])
&& ($clause === $token->keyword)
) {
return $i;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Routine.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Routine.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Routine.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Routine.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php
similarity index 86%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php
index 76249740..b90c17a9 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Table.php
@@ -26,7 +26,7 @@ class Table
*/
public static function getForeignKeys($statement)
{
- if ((empty($statement->fields))
+ if (empty($statement->fields)
|| (!is_array($statement->fields))
|| (!$statement->options->has('TABLE'))
) {
@@ -36,7 +36,7 @@ public static function getForeignKeys($statement)
$ret = array();
foreach ($statement->fields as $field) {
- if ((empty($field->key)) || ($field->key->type !== 'FOREIGN KEY')) {
+ if (empty($field->key) || ($field->key->type !== 'FOREIGN KEY')) {
continue;
}
@@ -55,11 +55,11 @@ public static function getForeignKeys($statement)
$tmp['ref_table_name'] = $field->references->table->table;
$tmp['ref_index_list'] = $field->references->columns;
- if (($opt = $field->references->options->has('ON UPDATE'))) {
+ if ($opt = $field->references->options->has('ON UPDATE')) {
$tmp['on_update'] = str_replace(' ', '_', $opt);
}
- if (($opt = $field->references->options->has('ON DELETE'))) {
+ if ($opt = $field->references->options->has('ON DELETE')) {
$tmp['on_delete'] = str_replace(' ', '_', $opt);
}
@@ -83,7 +83,7 @@ public static function getForeignKeys($statement)
*/
public static function getFields($statement)
{
- if ((empty($statement->fields))
+ if (empty($statement->fields)
|| (!is_array($statement->fields))
|| (!$statement->options->has('TABLE'))
) {
@@ -110,20 +110,20 @@ public static function getFields($statement)
}
}
- if (($option = $field->options->has('DEFAULT'))) {
+ if ($option = $field->options->has('DEFAULT')) {
$ret[$field->name]['default_value'] = $option;
if ($option === 'CURRENT_TIMESTAMP') {
$ret[$field->name]['default_current_timestamp'] = true;
}
}
- if (($option = $field->options->has('ON UPDATE'))) {
+ if ($option = $field->options->has('ON UPDATE')) {
if ($option === 'CURRENT_TIMESTAMP') {
$ret[$field->name]['on_update_current_timestamp'] = true;
}
}
- if (($option = $field->options->has('AS'))) {
+ if ($option = $field->options->has('AS')) {
$ret[$field->name]['generated'] = true;
$ret[$field->name]['expr'] = $option;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php
index 6520a793..76ab14c8 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpmyadmin/sql-parser/src/Utils/Tokens.php
@@ -30,34 +30,34 @@ class Tokens
public static function match(Token $token, array $pattern)
{
// Token.
- if ((isset($pattern['token']))
+ if (isset($pattern['token'])
&& ($pattern['token'] !== $token->token)
) {
return false;
}
// Value.
- if ((isset($pattern['value']))
+ if (isset($pattern['value'])
&& ($pattern['value'] !== $token->value)
) {
return false;
}
- if ((isset($pattern['value_str']))
- && (strcasecmp($pattern['value_str'], $token->value))
+ if (isset($pattern['value_str'])
+ && strcasecmp($pattern['value_str'], $token->value)
) {
return false;
}
// Type.
- if ((isset($pattern['type']))
+ if (isset($pattern['type'])
&& ($pattern['type'] !== $token->type)
) {
return false;
}
// Flags.
- if ((isset($pattern['flags']))
+ if (isset($pattern['flags'])
&& (($pattern['flags'] & $token->flags) === 0)
) {
return false;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/AUTHORS b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/AUTHORS
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/AUTHORS
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/AUTHORS
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/README.md
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/README.md
index e447bd00..8f96abf3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/README.md
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/README.md
@@ -24,6 +24,7 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
### 2.0
+* Long term support (LTS) release
* Modernized version of 1.0
* Minimum PHP version: 5.3.3
* PSR-4 autoloading with namespace rooted at `\phpseclib`
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/appveyor.yml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/appveyor.yml
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/appveyor.yml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/appveyor.yml
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/.scrutinizer.yml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/.scrutinizer.yml
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/.scrutinizer.yml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/.scrutinizer.yml
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/.travis.yml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/.travis.yml
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/.travis.yml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/.travis.yml
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/LICENSE.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/LICENSE.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/LICENSE.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/LICENSE.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/RELICENSED.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/RELICENSED.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/RELICENSED.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/RELICENSED.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/changelog.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/changelog.md
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/changelog.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/changelog.md
index 6c64c148..087d27a0 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/changelog.md
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/changelog.md
@@ -1,9 +1,5 @@
## Change Log
-## [4.0.0] - 2018-10-06
-### Changed
-- Bacon QRCode package removed
-
## [3.0.1] - 2018-03-15
### Changed
- Relicensed to MIT
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.json
similarity index 82%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.json
index 6bcd0e85..780fa551 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.json
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.json
@@ -1,7 +1,7 @@
{
"name": "pragmarx/google2fa",
"description": "A One Time Password Authentication package, compatible with Google Authenticator.",
- "keywords": ["authentication", "two factor authentication", "google2fa", "2fa"],
+ "keywords": ["authentication", "two factor authentication", "google2fa", "laravel", "2fa"],
"license": "MIT",
"authors": [
{
@@ -17,7 +17,8 @@
"symfony/polyfill-php56": "~1.2"
},
"require-dev": {
- "phpunit/phpunit": "~4|~5|~6"
+ "phpunit/phpunit": "~4|~5|~6",
+ "bacon/bacon-qr-code": "~1.0"
},
"autoload": {
"psr-4": {
@@ -31,6 +32,9 @@
"dev-master": "2.0-dev"
}
},
+ "suggest": {
+ "bacon/bacon-qr-code": "Required to generate inline QR Codes."
+ },
"minimum-stability": "dev",
"prefer-stable": true
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.lock b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.lock
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.lock
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.lock
index 31dc6a07..f0bac1ce 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/composer.lock
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/composer.lock
@@ -1,31 +1,31 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "f84c0fcd7344335cca6ca269dedd2b20",
+ "content-hash": "f0f90c5128c6c9067f83afae918475f4",
"packages": [
{
"name": "paragonie/constant_time_encoding",
- "version": "v2.2.2",
+ "version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
- "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33"
+ "reference": "7c74c5d08761ead7b5e89d07c854bc28eb0b2186"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/eccf915f45f911bfb189d1d1638d940ec6ee6e33",
- "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33",
+ "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/7c74c5d08761ead7b5e89d07c854bc28eb0b2186",
+ "reference": "7c74c5d08761ead7b5e89d07c854bc28eb0b2186",
"shasum": ""
},
"require": {
"php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "^6|^7",
- "vimeo/psalm": "^1"
+ "phpunit/phpunit": "^6",
+ "vimeo/psalm": "^0.3|^1"
},
"type": "library",
"autoload": {
@@ -66,33 +66,37 @@
"hex2bin",
"rfc4648"
],
- "time": "2018-03-10T19:47:49+00:00"
+ "time": "2018-01-23T00:54:57+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v9.99.99",
+ "version": "v2.0.11",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+ "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
+ "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
"shasum": ""
},
"require": {
- "php": "^7"
+ "php": ">=5.2.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*",
- "vimeo/psalm": "^1"
+ "phpunit/phpunit": "4.*|5.*"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
+ "autoload": {
+ "files": [
+ "lib/random.php"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -107,24 +111,23 @@
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
- "polyfill",
"pseudorandom",
"random"
],
- "time": "2018-07-02T15:55:56+00:00"
+ "time": "2017-09-27T21:40:39+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.9.0",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "7b4fc009172cc0196535b0328bd1226284a28000"
+ "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/7b4fc009172cc0196535b0328bd1226284a28000",
- "reference": "7b4fc009172cc0196535b0328bd1226284a28000",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8",
+ "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8",
"shasum": ""
},
"require": {
@@ -134,7 +137,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -167,20 +170,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-01-30T19:27:44+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.9.0",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581"
+ "reference": "e17c808ec4228026d4f5a8832afa19be85979563"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8e15d04ba3440984d23e7964b2ee1d25c8de1581",
- "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563",
+ "reference": "e17c808ec4228026d4f5a8832afa19be85979563",
"shasum": ""
},
"require": {
@@ -189,7 +192,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -219,10 +222,56 @@
"polyfill",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-01-31T18:08:44+00:00"
}
],
"packages-dev": [
+ {
+ "name": "bacon/bacon-qr-code",
+ "version": "1.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Bacon/BaconQrCode.git",
+ "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee",
+ "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee",
+ "shasum": ""
+ },
+ "require": {
+ "ext-iconv": "*",
+ "php": "^5.4|^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8"
+ },
+ "suggest": {
+ "ext-gd": "to generate QR code images"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "BaconQrCode": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-2-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Ben Scholzen 'DASPRiD'",
+ "email": "mail@dasprids.de",
+ "homepage": "http://www.dasprids.de",
+ "role": "Developer"
+ }
+ ],
+ "description": "BaconQrCode is a QR code generator for PHP.",
+ "homepage": "https://github.com/Bacon/BaconQrCode",
+ "time": "2017-10-17T09:59:25+00:00"
+ },
{
"name": "doctrine/instantiator",
"version": "1.1.0",
@@ -279,28 +328,25 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.8.1",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+ "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
- "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+ "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
"shasum": ""
},
"require": {
- "php": "^7.1"
- },
- "replace": {
- "myclabs/deep-copy": "self.version"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
- "phpunit/phpunit": "^7.1"
+ "phpunit/phpunit": "^4.1"
},
"type": "library",
"autoload": {
@@ -323,7 +369,7 @@
"object",
"object graph"
],
- "time": "2018-06-11T23:09:50+00:00"
+ "time": "2017-10-19T19:58:43+00:00"
},
{
"name": "phar-io/manifest",
@@ -581,33 +627,33 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.8.0",
+ "version": "1.7.5",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+ "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
- "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+ "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
- "sebastian/comparator": "^1.1|^2.0|^3.0",
+ "sebastian/comparator": "^1.1|^2.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8.x-dev"
+ "dev-master": "1.7.x-dev"
}
},
"autoload": {
@@ -640,20 +686,20 @@
"spy",
"stub"
],
- "time": "2018-08-05T17:53:17+00:00"
+ "time": "2018-02-19T10:16:54+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "5.3.2",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+ "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
- "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+ "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
"shasum": ""
},
"require": {
@@ -703,7 +749,7 @@
"testing",
"xunit"
],
- "time": "2018-04-06T15:36:58+00:00"
+ "time": "2017-12-06T09:29:45+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -893,16 +939,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "6.5.13",
+ "version": "6.5.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
+ "reference": "6bd77b57707c236833d2b57b968e403df060c9d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
- "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9",
+ "reference": "6bd77b57707c236833d2b57b968e403df060c9d9",
"shasum": ""
},
"require": {
@@ -920,7 +966,7 @@
"phpunit/php-file-iterator": "^1.4.3",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^1.0.9",
- "phpunit/phpunit-mock-objects": "^5.0.9",
+ "phpunit/phpunit-mock-objects": "^5.0.5",
"sebastian/comparator": "^2.1",
"sebastian/diff": "^2.0",
"sebastian/environment": "^3.1",
@@ -973,20 +1019,20 @@
"testing",
"xunit"
],
- "time": "2018-09-08T15:10:43+00:00"
+ "time": "2018-02-26T07:01:09+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "5.0.10",
+ "version": "5.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
+ "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
- "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf",
+ "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf",
"shasum": ""
},
"require": {
@@ -999,7 +1045,7 @@
"phpunit/phpunit": "<6.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.5.11"
+ "phpunit/phpunit": "^6.5"
},
"suggest": {
"ext-soap": "*"
@@ -1032,7 +1078,7 @@
"mock",
"xunit"
],
- "time": "2018-08-09T05:50:03+00:00"
+ "time": "2018-01-06T05:45:45+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/docs/playground.jpg b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/docs/playground.jpg
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/docs/playground.jpg
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/docs/playground.jpg
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/phpunit.xml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/phpunit.xml
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/phpunit.xml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/phpunit.xml
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InsecureCallException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InsecureCallException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InsecureCallException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InsecureCallException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php
similarity index 79%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php
index d00289a3..f3374a85 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Google2FA.php
@@ -2,10 +2,10 @@
namespace PragmaRX\Google2FA;
-use PragmaRX\Google2FA\Support\QRCode;
+use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
use PragmaRX\Google2FA\Support\Base32;
use PragmaRX\Google2FA\Support\Constants;
-use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException;
+use PragmaRX\Google2FA\Support\QRCode;
class Google2FA
{
@@ -42,9 +42,6 @@ class Google2FA
* @param string $oldTimestamp
*
* @return bool
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
*/
public function findValidOTP($secret, $key, $window, $startingTimestamp, $timestamp, $oldTimestamp = Constants::ARGUMENT_NOT_SET)
{
@@ -63,12 +60,10 @@ public function findValidOTP($secret, $key, $window, $startingTimestamp, $timest
/**
* Generate a digit secret key in base32 format.
*
- * @param int $length
+ * @param int $length
* @param string $prefix
*
* @return string
- * @throws Exceptions\InvalidCharactersException
- * @throws Exceptions\IncompatibleWithGoogleAuthenticatorException
*/
public function generateSecretKey($length = 16, $prefix = '')
{
@@ -81,9 +76,6 @@ public function generateSecretKey($length = 16, $prefix = '')
* @param $secret
*
* @return string
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
*/
public function getCurrentOtp($secret)
{
@@ -187,12 +179,10 @@ protected function makeTimestamp($timestamp = null)
* Takes the secret key and the timestamp and returns the one time
* password.
*
- * @param string $secret - Secret key in binary form.
- * @param int $counter - Timestamp as returned by getTimestamp.
+ * @param string $secret - Secret key in binary form.
+ * @param int $counter - Timestamp as returned by getTimestamp.
*
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws Exceptions\IncompatibleWithGoogleAuthenticatorException
+ * @throws SecretKeyTooShortException
*
* @return string
*/
@@ -298,16 +288,13 @@ public function setWindow($window)
* Verifies a user inputted key against the current timestamp. Checks $window
* keys either side of the timestamp.
*
- * @param string $key - User specified key
- * @param null|string $secret
- * @param null|int $window
- * @param null|int $timestamp
+ * @param string $key - User specified key
+ * @param null|string $secret
+ * @param null|int $window
+ * @param null|int $timestamp
* @param null|string|int $oldTimestamp
*
* @return bool|int
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
*/
public function verify($key, $secret = null, $window = null, $timestamp = null, $oldTimestamp = Constants::ARGUMENT_NOT_SET)
{
@@ -324,16 +311,13 @@ public function verify($key, $secret = null, $window = null, $timestamp = null,
* Verifies a user inputted key against the current timestamp. Checks $window
* keys either side of the timestamp.
*
- * @param string $secret
- * @param string $key - User specified key
- * @param null|int $window
- * @param null|int $timestamp
+ * @param string $secret
+ * @param string $key - User specified key
+ * @param null|int $window
+ * @param null|int $timestamp
* @param null|string|int $oldTimestamp
*
* @return bool|int
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
*/
public function verifyKey($secret, $key, $window = null, $timestamp = null, $oldTimestamp = Constants::ARGUMENT_NOT_SET)
{
@@ -355,18 +339,14 @@ public function verifyKey($secret, $key, $window = null, $timestamp = null, $old
* the given oldTimestamp. Useful if you need to ensure that a single key cannot
* be used twice.
*
- * @param string $secret
- * @param string $key - User specified key
- * @param int $oldTimestamp - The timestamp from the last verified key
+ * @param string $secret
+ * @param string $key - User specified key
+ * @param int $oldTimestamp - The timestamp from the last verified key
* @param int|null $window
* @param int|null $timestamp
*
* @return bool|int - false (not verified) or the timestamp of the verified key
- *
- * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
- * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
- * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
- */
+ **/
public function verifyKeyNewer($secret, $key, $oldTimestamp, $window = null, $timestamp = null)
{
return $this->verifyKey($secret, $key, $window, $timestamp, $oldTimestamp);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php
index 42065915..769d4de3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Base32.php
@@ -3,8 +3,8 @@
namespace PragmaRX\Google2FA\Support;
use ParagonIE\ConstantTime\Base32 as ParagonieBase32;
-use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
+use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
trait Base32
{
@@ -18,10 +18,7 @@ trait Base32
*
* @param int $length
*
- * @param string $prefix
* @return string
- * @throws IncompatibleWithGoogleAuthenticatorException
- * @throws InvalidCharactersException
*/
public function generateBase32RandomKey($length = 16, $prefix = '')
{
@@ -40,7 +37,6 @@ public function generateBase32RandomKey($length = 16, $prefix = '')
* @param string $b32
*
* @throws InvalidCharactersException
- * @throws IncompatibleWithGoogleAuthenticatorException
*
* @return int
*/
@@ -60,7 +56,6 @@ public function base32Decode($b32)
* @param $length
*
* @return string
- * @throws \Exception
*/
private function strPadBase32($string, $length)
{
@@ -92,7 +87,6 @@ public function toBase32($string)
* @param $to
*
* @return int
- * @throws \Exception
*/
protected function getRandomNumber($from = 0, $to = 31)
{
@@ -103,8 +97,6 @@ protected function getRandomNumber($from = 0, $to = 31)
* Validate the secret.
*
* @param $b32
- * @throws IncompatibleWithGoogleAuthenticatorException
- * @throws InvalidCharactersException
*/
protected function validateSecret($b32)
{
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Constants.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Constants.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Constants.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Constants.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php
similarity index 51%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php
index 017206f7..020b51e1 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/QRCode.php
@@ -2,6 +2,8 @@
namespace PragmaRX\Google2FA\Support;
+use BaconQrCode\Renderer\Image\Png;
+use BaconQrCode\Writer as BaconQrCodeWriter;
use PragmaRX\Google2FA\Exceptions\InsecureCallException;
trait QRCode
@@ -17,24 +19,46 @@ trait QRCode
* @param string $company
* @param string $holder
* @param string $secret
- * @param int $size
+ * @param int $size
*
- * @throws \PragmaRX\Google2FA\Exceptions\InsecureCallException
+ * @throws InsecureCallException
*
* @return string
*/
public function getQRCodeGoogleUrl($company, $holder, $secret, $size = 200)
{
if (!$this->allowInsecureCallToGoogleApis) {
- throw new InsecureCallException("It's not secure to send secret keys to Google Apis, you have to explicitly allow it by calling \$google2fa->setAllowInsecureCallToGoogleApis(true).");
+ throw new InsecureCallException('It\'s not secure to send secret keys to Google Apis, you have to explicitly allow it by calling $google2fa->setAllowInsecureCallToGoogleApis(true).');
}
- return Url::generateGoogleQRCodeUrl(
- 'https://chart.googleapis.com/',
- 'chart',
- 'chs='.$size.'x'.$size.'&chld=M|0&cht=qr&chl=',
- $this->getQRCodeUrl($company, $holder, $secret)
- );
+ $url = $this->getQRCodeUrl($company, $holder, $secret);
+
+ return Url::generateGoogleQRCodeUrl('https://chart.googleapis.com/', 'chart', 'chs='.$size.'x'.$size.'&chld=M|0&cht=qr&chl=', $url);
+ }
+
+ /**
+ * Generates a QR code data url to display inline.
+ *
+ * @param string $company
+ * @param string $holder
+ * @param string $secret
+ * @param int $size
+ * @param string $encoding Default to UTF-8
+ *
+ * @return string
+ */
+ public function getQRCodeInline($company, $holder, $secret, $size = 200, $encoding = 'utf-8')
+ {
+ $url = $this->getQRCodeUrl($company, $holder, $secret);
+
+ $renderer = new Png();
+ $renderer->setWidth($size);
+ $renderer->setHeight($size);
+
+ $bacon = new BaconQrCodeWriter($renderer);
+ $data = $bacon->writeString($url, $encoding);
+
+ return 'data:image/png;base64,'.base64_encode($data);
}
/**
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Url.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Url.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/src/Support/Url.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/src/Support/Url.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/.gitkeep b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/.gitkeep
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/.gitkeep
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/.gitkeep
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/Constants.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/Constants.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/Constants.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/Constants.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php
index e7054e96..c94e03ab 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/Google2FATest.php
@@ -214,16 +214,11 @@ public function testValidateKey()
$this->google2fa->getCurrentOtp(Constants::INVALID_SECRET);
}
- /**
- * AllowInsecureCallToGoogleApis setter.
- *
- * @param mixed $allowInsecureCallToGoogleApis
- *
- * @return QRCode
- */
- public function setAllowInsecureCallToGoogleApis($allowInsecureCallToGoogleApis)
+ public function testQrcodeInline()
{
- $this->allowInsecureCallToGoogleApis = $allowInsecureCallToGoogleApis;
- return $this;
+ $this->assertEquals(
+ phpversion() >= '7.2' ? Constants::QRCODEPHPABOVE72 : Constants::QRCODEPHPBELOW72,
+ $this->google2fa->getQRCodeInline('PragmaRX', 'acr+pragmarx@antoniocarlosribeiro.com', Constants::SECRET)
+ );
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/bootstrap.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/bootstrap.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/tests/bootstrap.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/tests/bootstrap.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/upgrading.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/upgrading.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/pragmarx/google2fa/upgrading.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/pragmarx/google2fa/upgrading.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/ContainerExceptionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/ContainerExceptionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/ContainerExceptionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/ContainerExceptionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/ContainerInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/ContainerInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/ContainerInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/ContainerInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/NotFoundExceptionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/NotFoundExceptionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/psr/container/src/NotFoundExceptionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/psr/container/src/NotFoundExceptionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/LICENCE.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/LICENCE.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/LICENCE.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/LICENCE.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/Registration.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/Registration.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/Registration.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/Registration.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/RegistrationRequest.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/RegistrationRequest.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/RegistrationRequest.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/RegistrationRequest.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/SignRequest.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/SignRequest.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/SignRequest.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/SignRequest.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/U2FException.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/U2FException.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/U2FException.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/U2FException.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/U2FServer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/U2FServer.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/samyoul/u2f-php-server/src/U2FServer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/samyoul/u2f-php-server/src/U2FServer.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/CHANGELOG.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/CHANGELOG.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/CHANGELOG.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/CHANGELOG.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Compiler.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Compiler.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Compiler.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Compiler.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Expression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Expression.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Expression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Expression.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionFunction.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionFunction.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionFunction.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionFunction.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionFunctionProviderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionFunctionProviderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionFunctionProviderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionFunctionProviderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionLanguage.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionLanguage.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ExpressionLanguage.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ExpressionLanguage.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Lexer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Lexer.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Lexer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Lexer.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ArgumentsNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ArgumentsNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ArgumentsNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ArgumentsNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ArrayNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ArrayNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ArrayNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ArrayNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/BinaryNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/BinaryNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/BinaryNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/BinaryNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ConditionalNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ConditionalNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ConditionalNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ConditionalNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ConstantNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ConstantNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/ConstantNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/ConstantNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/FunctionNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/FunctionNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/FunctionNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/FunctionNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/GetAttrNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/GetAttrNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/GetAttrNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/GetAttrNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/NameNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/NameNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/NameNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/NameNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/Node.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/Node.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/Node.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/Node.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/UnaryNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/UnaryNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Node/UnaryNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Node/UnaryNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParsedExpression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParsedExpression.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParsedExpression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParsedExpression.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Parser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Parser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Parser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Parser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/SerializedParsedExpression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/SerializedParsedExpression.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/SerializedParsedExpression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/SerializedParsedExpression.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/SyntaxError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/SyntaxError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/SyntaxError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/SyntaxError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Token.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Token.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/Token.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/Token.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/TokenStream.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/TokenStream.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/TokenStream.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/TokenStream.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/phpunit.xml.dist b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/phpunit.xml.dist
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/expression-language/phpunit.xml.dist
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/expression-language/phpunit.xml.dist
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/Ctype.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/Ctype.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/Ctype.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/Ctype.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/bootstrap.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/bootstrap.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/bootstrap.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/bootstrap.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-ctype/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-ctype/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Mbstring.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Mbstring.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Mbstring.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Mbstring.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/bootstrap.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/bootstrap.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/bootstrap.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/bootstrap.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-mbstring/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-mbstring/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/Php56.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/Php56.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/Php56.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/Php56.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/bootstrap.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/bootstrap.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/bootstrap.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/bootstrap.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-php56/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-php56/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/Binary.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/Binary.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/Binary.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/Binary.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/LegacyTestListener.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/LegacyTestListener.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/LegacyTestListener.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/LegacyTestListener.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/TestListener.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/TestListener.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/TestListener.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/TestListener.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/TestListenerTrait.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/TestListenerTrait.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/TestListenerTrait.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/TestListenerTrait.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/symfony/polyfill-util/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/symfony/polyfill-util/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/CHANGELOG.TXT b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/LICENSE.TXT b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/LICENSE.TXT
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/LICENSE.TXT
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/LICENSE.TXT
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/README.md b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/README.md
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/README.md
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/README.md
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/config/tcpdf_config.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.ctg.z b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.z b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.z
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.z
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusans.z
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.z b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.z
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.z
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/dejavusansb.z
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/helvetica.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/helvetica.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/fonts/helvetica.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/fonts/helvetica.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_font_data.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_font_data.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_font_data.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_font_data.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_images.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_images.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_images.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_images.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_static.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_2d.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_import.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_import.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_import.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_import.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_parser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_parser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/tecnickcom/tcpdf/tcpdf_parser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/tecnickcom/tcpdf/tcpdf_parser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/.travis.yml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/.travis.yml
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/.travis.yml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/.travis.yml
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/LICENSE
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/LICENSE
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/README.rst b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/README.rst
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/README.rst
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/README.rst
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/composer.json
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/composer.json
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Array.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Array.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Array.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Array.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Date.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Date.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Date.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Date.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/I18n.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/I18n.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/I18n.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/I18n.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Intl.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Intl.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Intl.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Intl.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Text.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Text.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Text.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Extension/Text.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Arguments.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Arguments.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Arguments.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Arguments.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Array.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Array.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Array.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Array.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Body.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Body.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Body.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Body.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Boolean.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Boolean.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Boolean.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Boolean.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Constant.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Constant.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Constant.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Constant.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Expression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Expression.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Expression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Expression.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Hash.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Hash.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Hash.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Hash.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Number.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Number.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Number.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Number.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Optional.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Optional.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Optional.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Optional.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Switch.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Switch.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Switch.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Switch.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Tag.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Tag.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Tag.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Grammar/Tag.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/GrammarInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/GrammarInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/GrammarInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/GrammarInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Node/Trans.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Node/Trans.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Node/Trans.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/Node/Trans.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/SimpleTokenParser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/SimpleTokenParser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/SimpleTokenParser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/SimpleTokenParser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/TokenParser/Trans.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/TokenParser/Trans.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/lib/Twig/Extensions/TokenParser/Trans.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/lib/Twig/Extensions/TokenParser/Trans.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/phpunit.xml.dist b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/phpunit.xml.dist
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/phpunit.xml.dist
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/phpunit.xml.dist
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/ArrayExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/ArrayExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/ArrayExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/ArrayExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/DateExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/DateExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/DateExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/DateExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/I18nExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/I18nExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/I18nExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/I18nExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/IntlExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/IntlExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/IntlExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/IntlExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/Node/TransNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/Node/TransNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/Node/TransNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/Node/TransNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/TextExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/TextExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/TextExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/TextExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/TokenParser/TransTokenParser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/TokenParser/TransTokenParser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/extensions/src/TokenParser/TransTokenParser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/extensions/src/TokenParser/TransTokenParser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.editorconfig b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.editorconfig
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.editorconfig
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.editorconfig
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.php_cs.dist b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.php_cs.dist
similarity index 71%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.php_cs.dist
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.php_cs.dist
index d249ffbe..2a5df9ee 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.php_cs.dist
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.php_cs.dist
@@ -1,16 +1,16 @@
setRules(array(
+ ->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
- 'array_syntax' => array('syntax' => 'long'),
+ 'array_syntax' => ['syntax' => 'short'],
'php_unit_fqcn_annotation' => false,
'no_unreachable_default_argument_value' => false,
- 'braces' => array('allow_single_line_closure' => true),
+ 'braces' => ['allow_single_line_closure' => true],
'heredoc_to_nowdoc' => false,
'dir_constant' => false,
- ))
+ ])
->setRiskyAllowed(true)
->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.travis.yml b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.travis.yml
similarity index 70%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.travis.yml
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.travis.yml
index d70399ca..0293aa84 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/.travis.yml
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/.travis.yml
@@ -14,6 +14,7 @@ php:
- 7.0
- 7.1
- 7.2
+ - 7.3
- nightly
env:
@@ -30,22 +31,11 @@ before_script:
- if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
- if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
-script: |
- if [[ $TRAVIS_PHP_VERSION = 7.* || $TRAVIS_PHP_VERSION = nightly ]]; then
- SYMFONY_PHPUNIT_VERSION=6.1 ./vendor/bin/simple-phpunit
- else
- ./vendor/bin/simple-phpunit
- fi
+script: ./vendor/bin/simple-phpunit
matrix:
fast_finish: true
include:
- - php: 5.3
- dist: precise
- env: TWIG_EXT=yes
- - php: 5.3
- dist: precise
- env: TWIG_EXT=no
- php: 5.4
env: TWIG_EXT=yes
- php: 5.5
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/CHANGELOG b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/CHANGELOG
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/CHANGELOG
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/CHANGELOG
index f35edc3c..64bacc0f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/CHANGELOG
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,27 @@
+* 1.37.1 (2019-01-14)
+
+ * fixed regression (key exists check for non ArrayObject objects)
+ * fixed logic in TemplateWrapper
+
+* 1.37.0 (2019-01-14)
+
+ * fixed ArrayObject access with a null value
+ * fixed embedded templates starting with a BOM
+ * fixed using a Twig_TemplateWrapper instance as an argument to extends
+ * switched generated code to use the PHP short array notation
+ * dropped PHP 5.3 support
+ * fixed float representation in compiled templates
+ * added a second argument to the join filter (last separator configuration)
+
+* 1.36.0 (2018-12-16)
+
+ * made sure twig_include returns a string
+ * fixed multi-byte UFT-8 in escape('html_attr')
+ * added the "deprecated" tag
+ * added support for dynamically named tests
+ * fixed GlobalsInterface extended class
+ * fixed filesystem loader throwing an exception instead of returning false
+
* 1.35.4 (2018-07-13)
* ensured that syntax errors are triggered with the right line
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/LICENSE b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/LICENSE
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/LICENSE
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/LICENSE
index e401cb97..d06ced2a 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/LICENSE
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2018 by the Twig Team.
+Copyright (c) 2009-2019 by the Twig Team.
Some rights reserved.
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/README.rst b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/README.rst
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/README.rst
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/README.rst
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/composer.json b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/composer.json
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/composer.json
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/composer.json
index 0a1728f8..4db7e34f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/composer.json
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/composer.json
@@ -27,11 +27,11 @@
"forum": "https://groups.google.com/forum/#!forum/twig-users"
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.4.0",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^3.3",
+ "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
"symfony/debug": "^2.7",
"psr/container": "^1.0"
},
@@ -45,7 +45,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.35-dev"
+ "dev-master": "1.37-dev"
}
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/config.m4 b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/config.m4
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/config.m4
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/config.m4
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/config.w32 b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/config.w32
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/config.w32
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/config.w32
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/php_twig.h b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/php_twig.h
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/php_twig.h
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/php_twig.h
index e99703f2..26151f0c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/php_twig.h
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H
#define PHP_TWIG_H
-#define PHP_TWIG_VERSION "1.35.4-DEV"
+#define PHP_TWIG_VERSION "1.37.1"
#include "php.h"
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/twig.c b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/twig.c
similarity index 99%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/twig.c
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/twig.c
index b81d8ce3..ed86d902 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/ext/twig/twig.c
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/ext/twig/twig.c
@@ -959,7 +959,7 @@ PHP_FUNCTION(twig_template_get_attributes)
if (!isset(self::$cache[$class]['methods'])) {
if ($object instanceof self) {
$ref = new ReflectionClass($class);
- $methods = array();
+ $methods = [];
foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
$methodName = strtolower($refMethod->name);
@@ -1081,7 +1081,7 @@ PHP_FUNCTION(twig_template_get_attributes)
// Some objects throw exceptions when they have __call, and the method we try
// to call is not supported. If ignoreStrictCheck is true, we should return null.
try {
- $ret = call_user_func_array(array($object, $method), $arguments);
+ $ret = call_user_func_array([$object, $method], $arguments);
} catch (BadMethodCallException $e) {
if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
return null;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php
similarity index 82%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php
index 212af544..6a2bf4a6 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Autoloader.php
@@ -29,11 +29,7 @@ public static function register($prepend = false)
{
@trigger_error('Using Twig_Autoloader is deprecated since version 1.21. Use Composer instead.', E_USER_DEPRECATED);
- if (PHP_VERSION_ID < 50300) {
- spl_autoload_register(array(__CLASS__, 'autoload'));
- } else {
- spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
- }
+ spl_autoload_register([__CLASS__, 'autoload'], true, $prepend);
}
/**
@@ -47,7 +43,7 @@ public static function autoload($class)
return;
}
- if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
+ if (is_file($file = dirname(__FILE__).'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
require $file;
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
index 65976282..5b0acc07 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@@ -50,9 +50,7 @@ public function write($key, $content)
$dir = dirname($key);
if (!is_dir($dir)) {
if (false === @mkdir($dir, 0777, true)) {
- if (PHP_VERSION_ID >= 50300) {
- clearstatcache(true, $dir);
- }
+ clearstatcache(true, $dir);
if (!is_dir($dir)) {
throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Cache/Null.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Cache/Null.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Cache/Null.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Cache/Null.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/CacheInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/CacheInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/CacheInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/CacheInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Compiler.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Compiler.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Compiler.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Compiler.php
index 803eb896..a5a60301 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Compiler.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Compiler.php
@@ -21,7 +21,7 @@ class Twig_Compiler implements Twig_CompilerInterface
protected $source;
protected $indentation;
protected $env;
- protected $debugInfo = array();
+ protected $debugInfo = [];
protected $sourceOffset;
protected $sourceLine;
protected $filename;
@@ -74,7 +74,7 @@ public function compile(Twig_NodeInterface $node, $indentation = 0)
{
$this->lastLine = null;
$this->source = '';
- $this->debugInfo = array();
+ $this->debugInfo = [];
$this->sourceOffset = 0;
// source code starts at 1 (as we then increment it when we encounter new lines)
$this->sourceLine = 1;
@@ -175,7 +175,7 @@ public function repr($value)
setlocale(LC_NUMERIC, 'C');
}
- $this->raw($value);
+ $this->raw(var_export($value, true));
if (false !== $locale) {
setlocale(LC_NUMERIC, $locale);
@@ -185,7 +185,7 @@ public function repr($value)
} elseif (is_bool($value)) {
$this->raw($value ? 'true' : 'false');
} elseif (is_array($value)) {
- $this->raw('array(');
+ $this->raw('[');
$first = true;
foreach ($value as $key => $v) {
if (!$first) {
@@ -196,7 +196,7 @@ public function repr($value)
$this->raw(' => ');
$this->repr($v);
}
- $this->raw(')');
+ $this->raw(']');
} else {
$this->string($value);
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/CompilerInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/CompilerInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/CompilerInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/CompilerInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Environment.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Environment.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Environment.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Environment.php
index 9b610f75..2a051b90 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Environment.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Environment.php
@@ -16,11 +16,11 @@
*/
class Twig_Environment
{
- const VERSION = '1.35.4';
- const VERSION_ID = 13504;
+ const VERSION = '1.37.1';
+ const VERSION_ID = 13701;
const MAJOR_VERSION = 1;
- const MINOR_VERSION = 35;
- const RELEASE_VERSION = 4;
+ const MINOR_VERSION = 37;
+ const RELEASE_VERSION = 1;
const EXTRA_VERSION = '';
protected $charset;
@@ -46,19 +46,19 @@ class Twig_Environment
protected $unaryOperators;
protected $binaryOperators;
protected $templateClassPrefix = '__TwigTemplate_';
- protected $functionCallbacks = array();
- protected $filterCallbacks = array();
+ protected $functionCallbacks = [];
+ protected $filterCallbacks = [];
protected $staging;
private $originalCache;
private $bcWriteCacheFile = false;
private $bcGetCacheFilename = false;
private $lastModifiedExtension = 0;
- private $extensionsByClass = array();
- private $runtimeLoaders = array();
- private $runtimes = array();
+ private $extensionsByClass = [];
+ private $runtimeLoaders = [];
+ private $runtimes = [];
private $optionsHash;
- private $loading = array();
+ private $loading = [];
/**
* Constructor.
@@ -98,7 +98,7 @@ class Twig_Environment
* @param Twig_LoaderInterface $loader
* @param array $options An array of options
*/
- public function __construct(Twig_LoaderInterface $loader = null, $options = array())
+ public function __construct(Twig_LoaderInterface $loader = null, $options = [])
{
if (null !== $loader) {
$this->setLoader($loader);
@@ -106,7 +106,7 @@ public function __construct(Twig_LoaderInterface $loader = null, $options = arra
@trigger_error('Not passing a Twig_LoaderInterface as the first constructor argument of Twig_Environment is deprecated since version 1.21.', E_USER_DEPRECATED);
}
- $options = array_merge(array(
+ $options = array_merge([
'debug' => false,
'charset' => 'UTF-8',
'base_template_class' => 'Twig_Template',
@@ -115,7 +115,7 @@ public function __construct(Twig_LoaderInterface $loader = null, $options = arra
'cache' => false,
'auto_reload' => null,
'optimizations' => -1,
- ), $options);
+ ], $options);
$this->debug = (bool) $options['debug'];
$this->charset = strtoupper($options['charset']);
@@ -358,7 +358,7 @@ public function getTemplateClassPrefix()
* @throws Twig_Error_Syntax When an error occurred during compilation
* @throws Twig_Error_Runtime When an error occurred during rendering
*/
- public function render($name, array $context = array())
+ public function render($name, array $context = [])
{
return $this->loadTemplate($name)->render($context);
}
@@ -373,7 +373,7 @@ public function render($name, array $context = array())
* @throws Twig_Error_Syntax When an error occurred during compilation
* @throws Twig_Error_Runtime When an error occurred during rendering
*/
- public function display($name, array $context = array())
+ public function display($name, array $context = [])
{
$this->loadTemplate($name)->display($context);
}
@@ -478,7 +478,7 @@ public function loadTemplate($name, $index = null)
}
if (isset($this->loading[$cls])) {
- throw new Twig_Error_Runtime(sprintf('Circular reference detected for Twig template "%s", path: %s.', $name, implode(' -> ', array_merge($this->loading, array($name)))));
+ throw new Twig_Error_Runtime(sprintf('Circular reference detected for Twig template "%s", path: %s.', $name, implode(' -> ', array_merge($this->loading, [$name]))));
}
$this->loading[$cls] = $name;
@@ -511,10 +511,10 @@ public function createTemplate($template)
{
$name = sprintf('__string_template__%s', hash('sha256', $template, false));
- $loader = new Twig_Loader_Chain(array(
- new Twig_Loader_Array(array($name => $template)),
+ $loader = new Twig_Loader_Chain([
+ new Twig_Loader_Array([$name => $template]),
$current = $this->getLoader(),
- ));
+ ]);
$this->setLoader($loader);
try {
@@ -575,7 +575,7 @@ public function isTemplateFresh($name, $time)
public function resolveTemplate($names)
{
if (!is_array($names)) {
- $names = array($names);
+ $names = [$names];
}
foreach ($names as $name) {
@@ -609,7 +609,7 @@ public function clearTemplateCache()
{
@trigger_error(sprintf('The %s method is deprecated since version 1.18.3 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
- $this->loadedTemplates = array();
+ $this->loadedTemplates = [];
}
/**
@@ -1049,7 +1049,7 @@ public function getTokenParsers()
*/
public function getTags()
{
- $tags = array();
+ $tags = [];
foreach ($this->getTokenParsers()->getParsers() as $parser) {
if ($parser instanceof Twig_TokenParserInterface) {
$tags[$parser->getTag()] = $parser;
@@ -1240,6 +1240,19 @@ public function getTest($name)
return $this->tests[$name];
}
+ foreach ($this->tests as $pattern => $test) {
+ $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
+
+ if ($count) {
+ if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
+ array_shift($matches);
+ $test->setArguments($matches);
+
+ return $test;
+ }
+ }
+ }
+
return false;
}
@@ -1456,7 +1469,7 @@ public function computeAlternatives($name, $items)
*/
protected function initGlobals()
{
- $globals = array();
+ $globals = [];
foreach ($this->extensions as $name => $extension) {
if (!$extension instanceof Twig_Extension_GlobalsInterface) {
$m = new ReflectionMethod($extension, 'getGlobals');
@@ -1488,13 +1501,13 @@ protected function initExtensions()
return;
}
- $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
- $this->filters = array();
- $this->functions = array();
- $this->tests = array();
- $this->visitors = array();
- $this->unaryOperators = array();
- $this->binaryOperators = array();
+ $this->parsers = new Twig_TokenParserBroker([], [], false);
+ $this->filters = [];
+ $this->functions = [];
+ $this->tests = [];
+ $this->visitors = [];
+ $this->unaryOperators = [];
+ $this->binaryOperators = [];
foreach ($this->extensions as $extension) {
$this->initExtension($extension);
@@ -1587,7 +1600,7 @@ private function updateOptionsHash()
{
$hashParts = array_merge(
array_keys($this->extensions),
- array(
+ [
(int) function_exists('twig_template_get_attributes'),
PHP_MAJOR_VERSION,
PHP_MINOR_VERSION,
@@ -1595,7 +1608,7 @@ private function updateOptionsHash()
(int) $this->debug,
$this->baseTemplateClass,
(int) $this->strictVariables,
- )
+ ]
);
$this->optionsHash = implode(':', $hashParts);
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error.php
index 787e0d09..569c2fea 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error.php
@@ -37,7 +37,6 @@ class Twig_Error extends Exception
// to be renamed to name in 2.0
protected $filename;
protected $rawMessage;
- protected $previous;
private $sourcePath;
private $sourceCode;
@@ -71,12 +70,7 @@ public function __construct($message, $lineno = -1, $source = null, Exception $p
$this->sourceCode = $source->getCode();
$this->sourcePath = $source->getPath();
}
- if (PHP_VERSION_ID < 50300) {
- $this->previous = $previous;
- parent::__construct('');
- } else {
- parent::__construct('', 0, $previous);
- }
+ parent::__construct('', 0, $previous);
$this->lineno = $lineno;
$this->filename = $name;
@@ -215,25 +209,6 @@ public function guess()
$this->updateRepr();
}
- /**
- * For PHP < 5.3.0, provides access to the getPrevious() method.
- *
- * @param string $method The method name
- * @param array $arguments The parameters to be passed to the method
- *
- * @return Exception The previous exception or null
- *
- * @throws BadMethodCallException
- */
- public function __call($method, $arguments)
- {
- if ('getprevious' == strtolower($method)) {
- return $this->previous;
- }
-
- throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
- }
-
public function appendMessage($rawMessage)
{
$this->rawMessage .= $rawMessage;
@@ -296,12 +271,7 @@ protected function guessTemplateInfo()
$template = null;
$templateClass = null;
- if (PHP_VERSION_ID >= 50306) {
- $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
- } else {
- $backtrace = debug_backtrace();
- }
-
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
foreach ($backtrace as $trace) {
if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
$currentClass = get_class($trace['object']);
@@ -332,14 +302,14 @@ protected function guessTemplateInfo()
$r = new ReflectionObject($template);
$file = $r->getFileName();
- $exceptions = array($e = $this);
- while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
+ $exceptions = [$e = $this];
+ while ($e instanceof self && $e = $e->getPrevious()) {
$exceptions[] = $e;
}
while ($e = array_pop($exceptions)) {
$traces = $e->getTrace();
- array_unshift($traces, array('file' => $e->getFile(), 'line' => $e->getLine()));
+ array_unshift($traces, ['file' => $e->getFile(), 'line' => $e->getLine()]);
while ($trace = array_shift($traces)) {
if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php
similarity index 83%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php
index df566dd7..2ef0480e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Loader.php
@@ -26,12 +26,8 @@ class Twig_Error_Loader extends Twig_Error
{
public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
{
- if (PHP_VERSION_ID < 50300) {
- $this->previous = $previous;
- Exception::__construct('');
- } else {
- Exception::__construct('', 0, $previous);
- }
+ Exception::__construct('', 0, $previous);
+
$this->appendMessage($message);
$this->setTemplateLine(false);
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Runtime.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Runtime.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Runtime.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Runtime.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php
index 9d09f217..c889dc64 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Error/Syntax.php
@@ -39,7 +39,7 @@ public function addSuggestions($name, array $items)
*/
public static function computeAlternatives($name, $items)
{
- $alternatives = array();
+ $alternatives = [];
foreach ($items as $item) {
$lev = levenshtein($name, $item);
if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php
index fe4a9b4a..eaaafb16 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExpressionParser.php
@@ -188,7 +188,7 @@ public function parsePrimaryExpression()
$ref = new ReflectionClass($class);
$negClass = 'Twig_Node_Expression_Unary_Neg';
$posClass = 'Twig_Node_Expression_Unary_Pos';
- if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
+ if (!(in_array($ref->getName(), [$negClass, $posClass]) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
}
@@ -219,7 +219,7 @@ public function parseStringExpression()
{
$stream = $this->parser->getStream();
- $nodes = array();
+ $nodes = [];
// a string cannot be followed by another string in a single expression
$nextCanBeString = true;
while (true) {
@@ -248,7 +248,7 @@ public function parseArrayExpression()
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
- $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
+ $node = new Twig_Node_Expression_Array([], $stream->getCurrent()->getLine());
$first = true;
while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
if (!$first) {
@@ -273,7 +273,7 @@ public function parseHashExpression()
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
- $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
+ $node = new Twig_Node_Expression_Array([], $stream->getCurrent()->getLine());
$first = true;
while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
if (!$first) {
@@ -362,7 +362,7 @@ public function getFunctionNode($name, $line)
return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
default:
if (null !== $alias = $this->parser->getImportedSymbol('function', $name)) {
- $arguments = new Twig_Node_Expression_Array(array(), $line);
+ $arguments = new Twig_Node_Expression_Array([], $line);
foreach ($this->parseArguments() as $n) {
$arguments->addElement($n);
}
@@ -385,7 +385,7 @@ public function parseSubscriptExpression($node)
$stream = $this->parser->getStream();
$token = $stream->next();
$lineno = $token->getLine();
- $arguments = new Twig_Node_Expression_Array(array(), $lineno);
+ $arguments = new Twig_Node_Expression_Array([], $lineno);
$type = Twig_Template::ANY_CALL;
if ('.' == $token->getValue()) {
$token = $stream->next();
@@ -448,7 +448,7 @@ public function parseSubscriptExpression($node)
}
$class = $this->getFilterNodeClass('slice', $token->getLine());
- $arguments = new Twig_Node(array($arg, $length));
+ $arguments = new Twig_Node([$arg, $length]);
$filter = new $class($node, new Twig_Node_Expression_Constant('slice', $token->getLine()), $arguments, $token->getLine());
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
@@ -507,7 +507,7 @@ public function parseFilterExpressionRaw($node, $tag = null)
*/
public function parseArguments($namedArguments = false, $definition = false)
{
- $args = array();
+ $args = [];
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
@@ -563,11 +563,11 @@ public function parseArguments($namedArguments = false, $definition = false)
public function parseAssignmentExpression()
{
$stream = $this->parser->getStream();
- $targets = array();
+ $targets = [];
while (true) {
$token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
$value = $token->getValue();
- if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {
+ if (in_array(strtolower($value), ['true', 'false', 'none', 'null'])) {
throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
}
$targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());
@@ -582,7 +582,7 @@ public function parseAssignmentExpression()
public function parseMultitargetExpression()
{
- $targets = array();
+ $targets = [];
while (true) {
$targets[] = $this->parseExpression();
if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
@@ -618,7 +618,7 @@ private function getTest($line)
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
if ($test = $this->env->getTest($name)) {
- return array($name, $test);
+ return [$name, $test];
}
if ($stream->test(Twig_Token::NAME_TYPE)) {
@@ -628,7 +628,7 @@ private function getTest($line)
if ($test = $this->env->getTest($name)) {
$stream->next();
- return array($name, $test);
+ return [$name, $test];
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension.php
similarity index 87%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension.php
index 38084495..de93ca61 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension.php
@@ -20,32 +20,32 @@ public function initRuntime(Twig_Environment $environment)
public function getTokenParsers()
{
- return array();
+ return [];
}
public function getNodeVisitors()
{
- return array();
+ return [];
}
public function getFilters()
{
- return array();
+ return [];
}
public function getTests()
{
- return array();
+ return [];
}
public function getFunctions()
{
- return array();
+ return [];
}
public function getOperators()
{
- return array();
+ return [];
}
/**
@@ -53,7 +53,7 @@ public function getOperators()
*/
public function getGlobals()
{
- return array();
+ return [];
}
/**
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php
similarity index 78%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php
index 6fa78e13..9babcfc6 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -18,10 +18,10 @@
*/
class Twig_Extension_Core extends Twig_Extension
{
- protected $dateFormats = array('F j, Y H:i', '%d days');
- protected $numberFormat = array(0, '.', ',');
+ protected $dateFormats = ['F j, Y H:i', '%d days'];
+ protected $numberFormat = [0, '.', ','];
protected $timezone = null;
- protected $escapers = array();
+ protected $escapers = [];
/**
* Defines a new escaper to be used via the escape filter.
@@ -104,7 +104,7 @@ public function getTimezone()
*/
public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
{
- $this->numberFormat = array($decimal, $decimalPoint, $thousandSep);
+ $this->numberFormat = [$decimal, $decimalPoint, $thousandSep];
}
/**
@@ -119,7 +119,7 @@ public function getNumberFormat()
public function getTokenParsers()
{
- return array(
+ return [
new Twig_TokenParser_For(),
new Twig_TokenParser_If(),
new Twig_TokenParser_Extends(),
@@ -136,18 +136,19 @@ public function getTokenParsers()
new Twig_TokenParser_Do(),
new Twig_TokenParser_Embed(),
new Twig_TokenParser_With(),
- );
+ new Twig_TokenParser_Deprecated(),
+ ];
}
public function getFilters()
{
- $filters = array(
+ $filters = [
// formatting filters
- new Twig_SimpleFilter('date', 'twig_date_format_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('date', 'twig_date_format_filter', ['needs_environment' => true]),
+ new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', ['needs_environment' => true]),
new Twig_SimpleFilter('format', 'sprintf'),
new Twig_SimpleFilter('replace', 'twig_replace_filter'),
- new Twig_SimpleFilter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('number_format', 'twig_number_format_filter', ['needs_environment' => true]),
new Twig_SimpleFilter('abs', 'abs'),
new Twig_SimpleFilter('round', 'twig_round'),
@@ -157,40 +158,40 @@ public function getFilters()
new Twig_SimpleFilter('convert_encoding', 'twig_convert_encoding'),
// string filters
- new Twig_SimpleFilter('title', 'twig_title_string_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('title', 'twig_title_string_filter', ['needs_environment' => true]),
+ new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', ['needs_environment' => true]),
new Twig_SimpleFilter('upper', 'strtoupper'),
new Twig_SimpleFilter('lower', 'strtolower'),
new Twig_SimpleFilter('striptags', 'strip_tags'),
new Twig_SimpleFilter('trim', 'twig_trim_filter'),
- new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
+ new Twig_SimpleFilter('nl2br', 'nl2br', ['pre_escape' => 'html', 'is_safe' => ['html']]),
// array helpers
new Twig_SimpleFilter('join', 'twig_join_filter'),
- new Twig_SimpleFilter('split', 'twig_split_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('split', 'twig_split_filter', ['needs_environment' => true]),
new Twig_SimpleFilter('sort', 'twig_sort_filter'),
new Twig_SimpleFilter('merge', 'twig_array_merge'),
new Twig_SimpleFilter('batch', 'twig_array_batch'),
// string/array filters
- new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('length', 'twig_length_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('slice', 'twig_slice', array('needs_environment' => true)),
- new Twig_SimpleFilter('first', 'twig_first', array('needs_environment' => true)),
- new Twig_SimpleFilter('last', 'twig_last', array('needs_environment' => true)),
+ new Twig_SimpleFilter('reverse', 'twig_reverse_filter', ['needs_environment' => true]),
+ new Twig_SimpleFilter('length', 'twig_length_filter', ['needs_environment' => true]),
+ new Twig_SimpleFilter('slice', 'twig_slice', ['needs_environment' => true]),
+ new Twig_SimpleFilter('first', 'twig_first', ['needs_environment' => true]),
+ new Twig_SimpleFilter('last', 'twig_last', ['needs_environment' => true]),
// iteration and runtime
- new Twig_SimpleFilter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
+ new Twig_SimpleFilter('default', '_twig_default_filter', ['node_class' => 'Twig_Node_Expression_Filter_Default']),
new Twig_SimpleFilter('keys', 'twig_get_array_keys_filter'),
// escaping
- new Twig_SimpleFilter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
- new Twig_SimpleFilter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
- );
+ new Twig_SimpleFilter('escape', 'twig_escape_filter', ['needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe']),
+ new Twig_SimpleFilter('e', 'twig_escape_filter', ['needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe']),
+ ];
if (function_exists('mb_get_info')) {
- $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
- $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
+ $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', ['needs_environment' => true]);
+ $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', ['needs_environment' => true]);
}
return $filters;
@@ -198,76 +199,76 @@ public function getFilters()
public function getFunctions()
{
- return array(
+ return [
new Twig_SimpleFunction('max', 'max'),
new Twig_SimpleFunction('min', 'min'),
new Twig_SimpleFunction('range', 'range'),
new Twig_SimpleFunction('constant', 'twig_constant'),
new Twig_SimpleFunction('cycle', 'twig_cycle'),
- new Twig_SimpleFunction('random', 'twig_random', array('needs_environment' => true)),
- new Twig_SimpleFunction('date', 'twig_date_converter', array('needs_environment' => true)),
- new Twig_SimpleFunction('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
- new Twig_SimpleFunction('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
- );
+ new Twig_SimpleFunction('random', 'twig_random', ['needs_environment' => true]),
+ new Twig_SimpleFunction('date', 'twig_date_converter', ['needs_environment' => true]),
+ new Twig_SimpleFunction('include', 'twig_include', ['needs_environment' => true, 'needs_context' => true, 'is_safe' => ['all']]),
+ new Twig_SimpleFunction('source', 'twig_source', ['needs_environment' => true, 'is_safe' => ['all']]),
+ ];
}
public function getTests()
{
- return array(
- new Twig_SimpleTest('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
- new Twig_SimpleTest('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
- new Twig_SimpleTest('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
- new Twig_SimpleTest('sameas', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => '1.21', 'alternative' => 'same as')),
- new Twig_SimpleTest('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
- new Twig_SimpleTest('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
- new Twig_SimpleTest('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
- new Twig_SimpleTest('divisibleby', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => '1.21', 'alternative' => 'divisible by')),
- new Twig_SimpleTest('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
- new Twig_SimpleTest('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
+ return [
+ new Twig_SimpleTest('even', null, ['node_class' => 'Twig_Node_Expression_Test_Even']),
+ new Twig_SimpleTest('odd', null, ['node_class' => 'Twig_Node_Expression_Test_Odd']),
+ new Twig_SimpleTest('defined', null, ['node_class' => 'Twig_Node_Expression_Test_Defined']),
+ new Twig_SimpleTest('sameas', null, ['node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => '1.21', 'alternative' => 'same as']),
+ new Twig_SimpleTest('same as', null, ['node_class' => 'Twig_Node_Expression_Test_Sameas']),
+ new Twig_SimpleTest('none', null, ['node_class' => 'Twig_Node_Expression_Test_Null']),
+ new Twig_SimpleTest('null', null, ['node_class' => 'Twig_Node_Expression_Test_Null']),
+ new Twig_SimpleTest('divisibleby', null, ['node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => '1.21', 'alternative' => 'divisible by']),
+ new Twig_SimpleTest('divisible by', null, ['node_class' => 'Twig_Node_Expression_Test_Divisibleby']),
+ new Twig_SimpleTest('constant', null, ['node_class' => 'Twig_Node_Expression_Test_Constant']),
new Twig_SimpleTest('empty', 'twig_test_empty'),
new Twig_SimpleTest('iterable', 'twig_test_iterable'),
- );
+ ];
}
public function getOperators()
{
- return array(
- array(
- 'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
- '-' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'),
- '+' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'),
- ),
- array(
- 'or' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'and' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'b-or' => array('precedence' => 16, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'b-xor' => array('precedence' => 17, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'b-and' => array('precedence' => 18, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '!=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '<' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '>=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '<=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'matches' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Matches', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'starts with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_StartsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'ends with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_EndsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '..' => array('precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '+' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '-' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '~' => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '*' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '/' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '//' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '%' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'is' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- 'is not' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
- '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
- '??' => array('precedence' => 300, 'class' => 'Twig_Node_Expression_NullCoalesce', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
- ),
- );
+ return [
+ [
+ 'not' => ['precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'],
+ '-' => ['precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'],
+ '+' => ['precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'],
+ ],
+ [
+ 'or' => ['precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'and' => ['precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'b-or' => ['precedence' => 16, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'b-xor' => ['precedence' => 17, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'b-and' => ['precedence' => 18, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '==' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '!=' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '<' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '>' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '>=' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '<=' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'not in' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'in' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'matches' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Matches', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'starts with' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_StartsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'ends with' => ['precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_EndsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '..' => ['precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '+' => ['precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '-' => ['precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '~' => ['precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '*' => ['precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '/' => ['precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '//' => ['precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '%' => ['precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'is' => ['precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ 'is not' => ['precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT],
+ '**' => ['precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT],
+ '??' => ['precedence' => 300, 'class' => 'Twig_Node_Expression_NullCoalesce', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT],
+ ],
+ ];
}
public function getName()
@@ -362,7 +363,7 @@ function twig_random(Twig_Environment $env, $values = null)
* @param Twig_Environment $env
* @param DateTime|DateTimeInterface|DateInterval|string $date A date
* @param string|null $format The target format, null to use the default
- * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ * @param DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged
*
* @return string The formatted date
*/
@@ -415,7 +416,7 @@ function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
*
* @param Twig_Environment $env
* @param DateTime|DateTimeInterface|string|null $date A date
- * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ * @param DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged
*
* @return DateTime A DateTime instance
*/
@@ -561,44 +562,23 @@ function twig_urlencode_filter($url)
return rawurlencode($url);
}
-if (PHP_VERSION_ID < 50300) {
- /**
- * JSON encodes a variable.
- *
- * @param mixed $value the value to encode
- * @param int $options Not used on PHP 5.2.x
- *
- * @return mixed The JSON encoded value
- */
- function twig_jsonencode_filter($value, $options = 0)
- {
- if ($value instanceof Twig_Markup) {
- $value = (string) $value;
- } elseif (is_array($value)) {
- array_walk_recursive($value, '_twig_markup2string');
- }
-
- return json_encode($value);
+/**
+ * JSON encodes a variable.
+ *
+ * @param mixed $value the value to encode
+ * @param int $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
+ *
+ * @return mixed The JSON encoded value
+ */
+function twig_jsonencode_filter($value, $options = 0)
+{
+ if ($value instanceof Twig_Markup) {
+ $value = (string) $value;
+ } elseif (is_array($value)) {
+ array_walk_recursive($value, '_twig_markup2string');
}
-} else {
- /**
- * JSON encodes a variable.
- *
- * @param mixed $value the value to encode
- * @param int $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
- *
- * @return mixed The JSON encoded value
- */
- function twig_jsonencode_filter($value, $options = 0)
- {
- if ($value instanceof Twig_Markup) {
- $value = (string) $value;
- } elseif (is_array($value)) {
- array_walk_recursive($value, '_twig_markup2string');
- }
- return json_encode($value, $options);
- }
+ return json_encode($value, $options);
}
function _twig_markup2string(&$value)
@@ -663,7 +643,7 @@ function twig_slice(Twig_Environment $env, $item, $start, $length = null, $prese
try {
return iterator_to_array(new LimitIterator($item, $start, null === $length ? -1 : $length), $preserveKeys);
} catch (OutOfBoundsException $exception) {
- return array();
+ return [];
}
}
@@ -716,9 +696,12 @@ function twig_last(Twig_Environment $env, $item)
/**
* Joins the values to a string.
*
- * The separator between elements is an empty string per default, you can define it with the optional parameter.
+ * The separators between elements are empty strings per default, you can define them with the optional parameters.
*
*
+ * {{ [1, 2, 3]|join(', ', ' and ') }}
+ * {# returns 1, 2 and 3 #}
+ *
* {{ [1, 2, 3]|join('|') }}
* {# returns 1|2|3 #}
*
@@ -726,18 +709,34 @@ function twig_last(Twig_Environment $env, $item)
* {# returns 123 #}
*
*
- * @param array $value An array
- * @param string $glue The separator
+ * @param array $value An array
+ * @param string $glue The separator
+ * @param string|null $and The separator for the last pair
*
* @return string The concatenated string
*/
-function twig_join_filter($value, $glue = '')
+function twig_join_filter($value, $glue = '', $and = null)
{
if ($value instanceof Traversable) {
$value = iterator_to_array($value, false);
+ } else {
+ $value = (array) $value;
+ }
+
+ if (0 === count($value)) {
+ return '';
+ }
+
+ if (null === $and || $and === $glue) {
+ return implode($glue, $value);
+ }
+
+ $v = array_values($value);
+ if (1 === count($v)) {
+ return $v[0];
}
- return implode($glue, (array) $value);
+ return implode($glue, array_slice($value, 0, -1)).$and.$v[count($v) - 1];
}
/**
@@ -780,10 +779,10 @@ function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = n
$length = mb_strlen($value, $charset);
if ($length < $limit) {
- return array($value);
+ return [$value];
}
- $r = array();
+ $r = [];
for ($i = 0; $i < $length; $i += $limit) {
$r[] = mb_substr($value, $i, $limit, $charset);
}
@@ -829,7 +828,7 @@ function twig_get_array_keys_filter($array)
}
if ($array instanceof Iterator) {
- $keys = array();
+ $keys = [];
$array->rewind();
while ($array->valid()) {
$keys[] = $array->key();
@@ -839,7 +838,7 @@ function twig_get_array_keys_filter($array)
return $keys;
}
- $keys = array();
+ $keys = [];
foreach ($array as $key => $item) {
$keys[] = $key;
}
@@ -848,7 +847,7 @@ function twig_get_array_keys_filter($array)
}
if (!is_array($array)) {
- return array();
+ return [];
}
return array_keys($array);
@@ -989,11 +988,15 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
if (!is_string($string)) {
if (is_object($string) && method_exists($string, '__toString')) {
$string = (string) $string;
- } elseif (in_array($strategy, array('html', 'js', 'css', 'html_attr', 'url'))) {
+ } elseif (in_array($strategy, ['html', 'js', 'css', 'html_attr', 'url'])) {
return $string;
}
}
+ if ('' === $string) {
+ return '';
+ }
+
if (null === $charset) {
$charset = $env->getCharset();
}
@@ -1005,7 +1008,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
// Using a static variable to avoid initializing the array
// each time the function is called. Moving the declaration on the
// top of the function slow downs other escaping strategies.
- static $htmlspecialcharsCharsets = array(
+ static $htmlspecialcharsCharsets = [
'ISO-8859-1' => true, 'ISO8859-1' => true,
'ISO-8859-15' => true, 'ISO8859-15' => true,
'utf-8' => true, 'UTF-8' => true,
@@ -1020,7 +1023,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
'SHIFT_JIS' => true, 'SJIS' => true, '932' => true,
'EUC-JP' => true, 'EUCJP' => true,
'ISO8859-5' => true, 'ISO-8859-5' => true, 'MACROMAN' => true,
- );
+ ];
if (isset($htmlspecialcharsCharsets[$charset])) {
return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
@@ -1045,7 +1048,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
$string = twig_convert_encoding($string, 'UTF-8', $charset);
}
- if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
+ if (!preg_match('//u', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
@@ -1062,7 +1065,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
$string = twig_convert_encoding($string, 'UTF-8', $charset);
}
- if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
+ if (!preg_match('//u', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
@@ -1079,7 +1082,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
$string = twig_convert_encoding($string, 'UTF-8', $charset);
}
- if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
+ if (!preg_match('//u', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
@@ -1092,10 +1095,6 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
return $string;
case 'url':
- if (PHP_VERSION_ID < 50300) {
- return str_replace('%7E', '~', rawurlencode($string));
- }
-
return rawurlencode($string);
default:
@@ -1109,7 +1108,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
return call_user_func($escapers[$strategy], $env, $string, $charset);
}
- $validStrategies = implode(', ', array_merge(array('html', 'js', 'url', 'css', 'html_attr'), array_keys($escapers)));
+ $validStrategies = implode(', ', array_merge(['html', 'js', 'url', 'css', 'html_attr'], array_keys($escapers)));
throw new Twig_Error_Runtime(sprintf('Invalid escaping strategy "%s" (valid ones: %s).', $strategy, $validStrategies));
}
@@ -1122,13 +1121,13 @@ function twig_escape_filter_is_safe(Twig_Node $filterArgs)
{
foreach ($filterArgs as $arg) {
if ($arg instanceof Twig_Node_Expression_Constant) {
- return array($arg->getAttribute('value'));
+ return [$arg->getAttribute('value')];
}
- return array();
+ return [];
}
- return array('html');
+ return ['html'];
}
if (function_exists('mb_convert_encoding')) {
@@ -1148,6 +1147,29 @@ function twig_convert_encoding($string, $to, $from)
}
}
+if (function_exists('mb_ord')) {
+ function twig_ord($string)
+ {
+ return mb_ord($string, 'UTF-8');
+ }
+} else {
+ function twig_ord($string)
+ {
+ $code = ($string = unpack('C*', substr($string, 0, 4))) ? $string[1] : 0;
+ if (0xF0 <= $code) {
+ return (($code - 0xF0) << 18) + (($string[2] - 0x80) << 12) + (($string[3] - 0x80) << 6) + $string[4] - 0x80;
+ }
+ if (0xE0 <= $code) {
+ return (($code - 0xE0) << 12) + (($string[2] - 0x80) << 6) + $string[3] - 0x80;
+ }
+ if (0xC0 <= $code) {
+ return (($code - 0xC0) << 6) + $string[2] - 0x80;
+ }
+
+ return $code;
+ }
+}
+
function _twig_escape_js_callback($matches)
{
$char = $matches[0];
@@ -1157,7 +1179,7 @@ function _twig_escape_js_callback($matches)
* Escape sequences supported only by JavaScript, not JSON, are ommitted.
* \" is also supported but omitted, because the resulting string is not HTML safe.
*/
- static $shortMap = array(
+ static $shortMap = [
'\\' => '\\\\',
'/' => '\\/',
"\x08" => '\b',
@@ -1165,7 +1187,7 @@ function _twig_escape_js_callback($matches)
"\x0A" => '\n',
"\x0D" => '\r',
"\x09" => '\t',
- );
+ ];
if (isset($shortMap[$char])) {
return $shortMap[$char];
@@ -1186,20 +1208,7 @@ function _twig_escape_css_callback($matches)
{
$char = $matches[0];
- // \xHH
- if (!isset($char[1])) {
- $hex = ltrim(strtoupper(bin2hex($char)), '0');
- if (0 === strlen($hex)) {
- $hex = '0';
- }
-
- return '\\'.$hex.' ';
- }
-
- // \uHHHH
- $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
- return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
+ return sprintf('\\%X ', 1 === strlen($char) ? ord($char) : twig_ord($char));
}
/**
@@ -1210,19 +1219,6 @@ function _twig_escape_css_callback($matches)
*/
function _twig_escape_html_attr_callback($matches)
{
- /*
- * While HTML supports far more named entities, the lowest common denominator
- * has become HTML5's XML Serialisation which is restricted to the those named
- * entities that XML supports. Using HTML entities would result in this error:
- * XML Parsing Error: undefined entity
- */
- static $entityMap = array(
- 34 => 'quot', /* quotation mark */
- 38 => 'amp', /* ampersand */
- 60 => 'lt', /* less-than sign */
- 62 => 'gt', /* greater-than sign */
- );
-
$chr = $matches[0];
$ord = ord($chr);
@@ -1239,22 +1235,31 @@ function _twig_escape_html_attr_callback($matches)
* replace it with while grabbing the hex value of the character.
*/
if (1 == strlen($chr)) {
- $hex = strtoupper(substr('00'.bin2hex($chr), -2));
- } else {
- $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
- $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
- }
+ /*
+ * While HTML supports far more named entities, the lowest common denominator
+ * has become HTML5's XML Serialisation which is restricted to the those named
+ * entities that XML supports. Using HTML entities would result in this error:
+ * XML Parsing Error: undefined entity
+ */
+ static $entityMap = [
+ 34 => '"', /* quotation mark */
+ 38 => '&', /* ampersand */
+ 60 => '<', /* less-than sign */
+ 62 => '>', /* greater-than sign */
+ ];
+
+ if (isset($entityMap[$ord])) {
+ return $entityMap[$ord];
+ }
- $int = hexdec($hex);
- if (array_key_exists($int, $entityMap)) {
- return sprintf('&%s;', $entityMap[$int]);
+ return sprintf('&#x%02X;', $ord);
}
/*
* Per OWASP recommendations, we'll use hex entities for any other
* characters where a named entity does not exist.
*/
- return sprintf('&#x%s;', $hex);
+ return sprintf('&#x%04X;', twig_ord($chr));
}
// add multibyte extensions if possible
@@ -1439,7 +1444,7 @@ function twig_ensure_traversable($seq)
return $seq;
}
- return array();
+ return [];
}
/**
@@ -1466,7 +1471,7 @@ function twig_test_empty($value)
return '' === (string) $value;
}
- return '' === $value || false === $value || null === $value || array() === $value;
+ return '' === $value || false === $value || null === $value || [] === $value;
}
/**
@@ -1501,7 +1506,7 @@ function twig_test_iterable($value)
*
* @return string The rendered template
*/
-function twig_include(Twig_Environment $env, $context, $template, $variables = array(), $withContext = true, $ignoreMissing = false, $sandboxed = false)
+function twig_include(Twig_Environment $env, $context, $template, $variables = [], $withContext = true, $ignoreMissing = false, $sandboxed = false)
{
$alreadySandboxed = false;
$sandbox = null;
@@ -1516,7 +1521,7 @@ function twig_include(Twig_Environment $env, $context, $template, $variables = a
}
}
- $result = null;
+ $result = '';
try {
$result = $env->resolveTemplate($template)->render($variables);
} catch (Twig_Error_Loader $e) {
@@ -1577,7 +1582,7 @@ function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
* Provides the ability to get constants from instances as well as class/global constants.
*
* @param string $constant The name of the constant
- * @param null|object $object The object to get the constant from
+ * @param object|null $object The object to get the constant from
*
* @return string
*/
@@ -1594,7 +1599,7 @@ function twig_constant($constant, $object = null)
* Checks if a constant exists.
*
* @param string $constant The name of the constant
- * @param null|object $object The object to get the constant from
+ * @param object|null $object The object to get the constant from
*
* @return bool
*/
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php
similarity index 86%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php
index d0cd1962..87f47d65 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Debug.php
@@ -26,9 +26,9 @@ public function getFunctions()
|| 'cli' === PHP_SAPI
;
- return array(
- new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
- );
+ return [
+ new Twig_SimpleFunction('dump', 'twig_var_dump', ['is_safe' => $isDumpOutputHtmlSafe ? ['html'] : [], 'needs_context' => true, 'needs_environment' => true]),
+ ];
}
public function getName()
@@ -47,7 +47,7 @@ function twig_var_dump(Twig_Environment $env, $context)
$count = func_num_args();
if (2 === $count) {
- $vars = array();
+ $vars = [];
foreach ($context as $key => $value) {
if (!$value instanceof Twig_Template) {
$vars[$key] = $value;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php
index 46c2d84b..74f0e997 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Escaper.php
@@ -28,19 +28,19 @@ public function __construct($defaultStrategy = 'html')
public function getTokenParsers()
{
- return array(new Twig_TokenParser_AutoEscape());
+ return [new Twig_TokenParser_AutoEscape()];
}
public function getNodeVisitors()
{
- return array(new Twig_NodeVisitor_Escaper());
+ return [new Twig_NodeVisitor_Escaper()];
}
public function getFilters()
{
- return array(
- new Twig_SimpleFilter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
- );
+ return [
+ new Twig_SimpleFilter('raw', 'twig_raw_filter', ['is_safe' => ['all']]),
+ ];
}
/**
@@ -67,7 +67,7 @@ public function setDefaultStrategy($defaultStrategy)
}
if ('name' === $defaultStrategy) {
- $defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
+ $defaultStrategy = ['Twig_FileExtensionEscapingStrategy', 'guess'];
}
$this->defaultStrategy = $defaultStrategy;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
index 6c62e3ef..70a64be3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
@@ -23,7 +23,7 @@ public function __construct($optimizers = -1)
public function getNodeVisitors()
{
- return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
+ return [new Twig_NodeVisitor_Optimizer($this->optimizers)];
}
public function getName()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php
index fcfc002b..d7faef86 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Profiler.php
@@ -11,7 +11,7 @@
class Twig_Extension_Profiler extends Twig_Extension
{
- private $actives = array();
+ private $actives = [];
public function __construct(Twig_Profiler_Profile $profile)
{
@@ -36,7 +36,7 @@ public function leave(Twig_Profiler_Profile $profile)
public function getNodeVisitors()
{
- return array(new Twig_Profiler_NodeVisitor_Profiler(get_class($this)));
+ return [new Twig_Profiler_NodeVisitor_Profiler(get_class($this))];
}
public function getName()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
index 5cb80a71..cacde630 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
@@ -26,12 +26,12 @@ public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandb
public function getTokenParsers()
{
- return array(new Twig_TokenParser_Sandbox());
+ return [new Twig_TokenParser_Sandbox()];
}
public function getNodeVisitors()
{
- return array(new Twig_NodeVisitor_Sandbox());
+ return [new Twig_NodeVisitor_Sandbox()];
}
public function enableSandbox()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php
index d3a0f9c9..897b3794 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -20,12 +20,12 @@
*/
class Twig_Extension_Staging extends Twig_Extension
{
- protected $functions = array();
- protected $filters = array();
- protected $visitors = array();
- protected $tokenParsers = array();
- protected $globals = array();
- protected $tests = array();
+ protected $functions = [];
+ protected $filters = [];
+ protected $visitors = [];
+ protected $tokenParsers = [];
+ protected $globals = [];
+ protected $tests = [];
public function addFunction($name, $function)
{
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
index 2ce3c992..58b731c6 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
@@ -16,9 +16,9 @@ class Twig_Extension_StringLoader extends Twig_Extension
{
public function getFunctions()
{
- return array(
- new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
- );
+ return [
+ new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', ['needs_environment' => true]),
+ ];
}
public function getName()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExtensionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExtensionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ExtensionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ExtensionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
index 2cdaded1..2a867122 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
@@ -21,7 +21,7 @@ class Twig_FactoryRuntimeLoader implements Twig_RuntimeLoaderInterface
/**
* @param array $map An array where keys are class names and values factory callables
*/
- public function __construct($map = array())
+ public function __construct($map = [])
{
$this->map = $map;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
index 8f8cd2ee..6b13c721 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
@@ -31,7 +31,7 @@ class Twig_FileExtensionEscapingStrategy
*/
public static function guess($name)
{
- if (in_array(substr($name, -1), array('/', '\\'))) {
+ if (in_array(substr($name, -1), ['/', '\\'])) {
return 'html'; // return html for directories
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter.php
index 893d75d1..9191c547 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter.php
@@ -23,17 +23,17 @@
abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
{
protected $options;
- protected $arguments = array();
+ protected $arguments = [];
- public function __construct(array $options = array())
+ public function __construct(array $options = [])
{
- $this->options = array_merge(array(
+ $this->options = array_merge([
'needs_environment' => false,
'needs_context' => false,
'pre_escape' => null,
'preserves_safety' => null,
'callable' => null,
- ), $options);
+ ], $options);
}
public function setArguments($arguments)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php
index 71b16554..04231026 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Function.php
@@ -24,7 +24,7 @@ class Twig_Filter_Function extends Twig_Filter
{
protected $function;
- public function __construct($function, array $options = array())
+ public function __construct($function, array $options = [])
{
$options['callable'] = $function;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php
index 1b75676c..2dc39b61 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Method.php
@@ -25,9 +25,9 @@ class Twig_Filter_Method extends Twig_Filter
protected $extension;
protected $method;
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
+ public function __construct(Twig_ExtensionInterface $extension, $method, array $options = [])
{
- $options['callable'] = array($extension, $method);
+ $options['callable'] = [$extension, $method];
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php
index 3e6b12ef..0d96081d 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Filter/Node.php
@@ -24,7 +24,7 @@ class Twig_Filter_Node extends Twig_Filter
{
protected $class;
- public function __construct($class, array $options = array())
+ public function __construct($class, array $options = [])
{
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FilterInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FilterInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FilterInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FilterInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function.php
index 9dc16e90..a829eeea 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function.php
@@ -23,15 +23,15 @@
abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
{
protected $options;
- protected $arguments = array();
+ protected $arguments = [];
- public function __construct(array $options = array())
+ public function __construct(array $options = [])
{
- $this->options = array_merge(array(
+ $this->options = array_merge([
'needs_environment' => false,
'needs_context' => false,
'callable' => null,
- ), $options);
+ ], $options);
}
public function setArguments($arguments)
@@ -64,7 +64,7 @@ public function getSafe(Twig_Node $functionArgs)
return call_user_func($this->options['is_safe_callback'], $functionArgs);
}
- return array();
+ return [];
}
public function getCallable()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php
index 97c0eb77..86f853b9 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Function.php
@@ -25,7 +25,7 @@ class Twig_Function_Function extends Twig_Function
{
protected $function;
- public function __construct($function, array $options = array())
+ public function __construct($function, array $options = [])
{
$options['callable'] = $function;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php
index 4299e118..4806a430 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Method.php
@@ -26,9 +26,9 @@ class Twig_Function_Method extends Twig_Function
protected $extension;
protected $method;
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
+ public function __construct(Twig_ExtensionInterface $extension, $method, array $options = [])
{
- $options['callable'] = array($extension, $method);
+ $options['callable'] = [$extension, $method];
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php
index 0adc5d93..68688c70 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Function/Node.php
@@ -24,7 +24,7 @@ class Twig_Function_Node extends Twig_Function
{
protected $class;
- public function __construct($class, array $options = array())
+ public function __construct($class, array $options = [])
{
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FunctionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FunctionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/FunctionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/FunctionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Lexer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Lexer.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Lexer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Lexer.php
index 41211eb2..eea2d0fc 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Lexer.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Lexer.php
@@ -49,19 +49,19 @@ class Twig_Lexer implements Twig_LexerInterface
const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
const PUNCTUATION = '()[]{}?:.,|';
- public function __construct(Twig_Environment $env, array $options = array())
+ public function __construct(Twig_Environment $env, array $options = [])
{
$this->env = $env;
- $this->options = array_merge(array(
- 'tag_comment' => array('{#', '#}'),
- 'tag_block' => array('{%', '%}'),
- 'tag_variable' => array('{{', '}}'),
+ $this->options = array_merge([
+ 'tag_comment' => ['{#', '#}'],
+ 'tag_block' => ['{%', '%}'],
+ 'tag_variable' => ['{{', '}}'],
'whitespace_trim' => '-',
- 'interpolation' => array('#{', '}'),
- ), $options);
+ 'interpolation' => ['#{', '}'],
+ ], $options);
- $this->regexes = array(
+ $this->regexes = [
'lex_var' => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
'lex_block' => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:end%s)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
@@ -72,7 +72,7 @@ public function __construct(Twig_Environment $env, array $options = array())
'lex_tokens_start' => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
'interpolation_end' => '/\s*'.preg_quote($this->options['interpolation'][1], '/').'/A',
- );
+ ];
}
public function tokenize($code, $name = null)
@@ -95,15 +95,15 @@ public function tokenize($code, $name = null)
$mbEncoding = null;
}
- $this->code = str_replace(array("\r\n", "\r"), "\n", $this->source->getCode());
+ $this->code = str_replace(["\r\n", "\r"], "\n", $this->source->getCode());
$this->filename = $this->source->getName();
$this->cursor = 0;
$this->lineno = 1;
$this->end = strlen($this->code);
- $this->tokens = array();
+ $this->tokens = [];
$this->state = self::STATE_DATA;
- $this->states = array();
- $this->brackets = array();
+ $this->states = [];
+ $this->brackets = [];
$this->position = -1;
// find all token starts in one go
@@ -262,7 +262,7 @@ protected function lexExpression()
elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
// opening bracket
if (false !== strpos('([{', $this->code[$this->cursor])) {
- $this->brackets[] = array($this->code[$this->cursor], $this->lineno);
+ $this->brackets[] = [$this->code[$this->cursor], $this->lineno];
}
// closing bracket
elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
@@ -286,7 +286,7 @@ protected function lexExpression()
}
// opening double quoted string
elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
- $this->brackets[] = array('"', $this->lineno);
+ $this->brackets[] = ['"', $this->lineno];
$this->pushState(self::STATE_STRING);
$this->moveCursor($match[0]);
}
@@ -328,7 +328,7 @@ protected function lexComment()
protected function lexString()
{
if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
- $this->brackets[] = array($this->options['interpolation'][0], $this->lineno);
+ $this->brackets[] = [$this->options['interpolation'][0], $this->lineno];
$this->pushToken(Twig_Token::INTERPOLATION_START_TYPE);
$this->moveCursor($match[0]);
$this->pushState(self::STATE_INTERPOLATION);
@@ -381,7 +381,7 @@ protected function moveCursor($text)
protected function getOperatorRegex()
{
$operators = array_merge(
- array('='),
+ ['='],
array_keys($this->env->getUnaryOperators()),
array_keys($this->env->getBinaryOperators())
);
@@ -389,7 +389,7 @@ protected function getOperatorRegex()
$operators = array_combine($operators, array_map('strlen', $operators));
arsort($operators);
- $regex = array();
+ $regex = [];
foreach ($operators as $operator => $length) {
// an operator that ends with a character must be followed by
// a whitespace or a parenthesis
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/LexerInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/LexerInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/LexerInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/LexerInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php
index 0aac7690..7c513179 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Array.php
@@ -25,12 +25,12 @@
*/
class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
{
- protected $templates = array();
+ protected $templates = [];
/**
* @param array $templates An array of templates (keys are the names, and values are the source code)
*/
- public function __construct(array $templates = array())
+ public function __construct(array $templates = [])
{
$this->templates = $templates;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php
index 59a33796..8ccf8c9c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Chain.php
@@ -18,13 +18,13 @@
*/
class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
{
- private $hasSourceCache = array();
- protected $loaders = array();
+ private $hasSourceCache = [];
+ protected $loaders = [];
/**
* @param Twig_LoaderInterface[] $loaders
*/
- public function __construct(array $loaders = array())
+ public function __construct(array $loaders = [])
{
foreach ($loaders as $loader) {
$this->addLoader($loader);
@@ -34,14 +34,14 @@ public function __construct(array $loaders = array())
public function addLoader(Twig_LoaderInterface $loader)
{
$this->loaders[] = $loader;
- $this->hasSourceCache = array();
+ $this->hasSourceCache = [];
}
public function getSource($name)
{
@trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
- $exceptions = array();
+ $exceptions = [];
foreach ($this->loaders as $loader) {
if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
continue;
@@ -59,7 +59,7 @@ public function getSource($name)
public function getSourceContext($name)
{
- $exceptions = array();
+ $exceptions = [];
foreach ($this->loaders as $loader) {
if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
continue;
@@ -113,7 +113,7 @@ public function exists($name)
public function getCacheKey($name)
{
- $exceptions = array();
+ $exceptions = [];
foreach ($this->loaders as $loader) {
if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
continue;
@@ -131,7 +131,7 @@ public function getCacheKey($name)
public function isFresh($name, $time)
{
- $exceptions = array();
+ $exceptions = [];
foreach ($this->loaders as $loader) {
if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
continue;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
index 4e8be0d5..1263dc4f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
@@ -19,9 +19,9 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
/** Identifier of the main namespace. */
const MAIN_NAMESPACE = '__main__';
- protected $paths = array();
- protected $cache = array();
- protected $errorCache = array();
+ protected $paths = [];
+ protected $cache = [];
+ protected $errorCache = [];
private $rootPath;
@@ -29,7 +29,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
* @param string|array $paths A path or an array of paths where to look for templates
* @param string|null $rootPath The root path common to all relative paths (null for getcwd())
*/
- public function __construct($paths = array(), $rootPath = null)
+ public function __construct($paths = [], $rootPath = null)
{
$this->rootPath = (null === $rootPath ? getcwd() : $rootPath).DIRECTORY_SEPARATOR;
if (false !== $realPath = realpath($rootPath)) {
@@ -50,7 +50,7 @@ public function __construct($paths = array(), $rootPath = null)
*/
public function getPaths($namespace = self::MAIN_NAMESPACE)
{
- return isset($this->paths[$namespace]) ? $this->paths[$namespace] : array();
+ return isset($this->paths[$namespace]) ? $this->paths[$namespace] : [];
}
/**
@@ -74,10 +74,10 @@ public function getNamespaces()
public function setPaths($paths, $namespace = self::MAIN_NAMESPACE)
{
if (!is_array($paths)) {
- $paths = array($paths);
+ $paths = [$paths];
}
- $this->paths[$namespace] = array();
+ $this->paths[$namespace] = [];
foreach ($paths as $path) {
$this->addPath($path, $namespace);
}
@@ -94,7 +94,7 @@ public function setPaths($paths, $namespace = self::MAIN_NAMESPACE)
public function addPath($path, $namespace = self::MAIN_NAMESPACE)
{
// invalidate the cache
- $this->cache = $this->errorCache = array();
+ $this->cache = $this->errorCache = [];
$checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
if (!is_dir($checkPath)) {
@@ -115,7 +115,7 @@ public function addPath($path, $namespace = self::MAIN_NAMESPACE)
public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
{
// invalidate the cache
- $this->cache = $this->errorCache = array();
+ $this->cache = $this->errorCache = [];
$checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
if (!is_dir($checkPath)) {
@@ -195,9 +195,17 @@ protected function findTemplate($name)
throw new Twig_Error_Loader($this->errorCache[$name]);
}
- $this->validateName($name);
+ try {
+ $this->validateName($name);
+
+ list($namespace, $shortname) = $this->parseName($name);
+ } catch (Twig_Error_Loader $e) {
+ if (!$throw) {
+ return false;
+ }
- list($namespace, $shortname) = $this->parseName($name);
+ throw $e;
+ }
if (!isset($this->paths[$namespace])) {
$this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
@@ -242,10 +250,10 @@ protected function parseName($name, $default = self::MAIN_NAMESPACE)
$namespace = substr($name, 1, $pos - 1);
$shortname = substr($name, $pos + 1);
- return array($namespace, $shortname);
+ return [$namespace, $shortname];
}
- return array($default, $name);
+ return [$default, $name];
}
protected function normalizeName($name)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/String.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/String.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Loader/String.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Loader/String.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/LoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/LoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/LoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/LoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Markup.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Markup.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Markup.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Markup.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node.php
index 89ada144..bdc9ec29 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node.php
@@ -35,7 +35,7 @@ class Twig_Node implements Twig_NodeInterface
* @param int $lineno The line number
* @param string $tag The tag name associated with the Node
*/
- public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
+ public function __construct(array $nodes = [], array $attributes = [], $lineno = 0, $tag = null)
{
foreach ($nodes as $name => $node) {
if (!$node instanceof Twig_NodeInterface) {
@@ -50,17 +50,17 @@ public function __construct(array $nodes = array(), array $attributes = array(),
public function __toString()
{
- $attributes = array();
+ $attributes = [];
foreach ($this->attributes as $name => $value) {
$attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
}
- $repr = array(get_class($this).'('.implode(', ', $attributes));
+ $repr = [get_class($this).'('.implode(', ', $attributes)];
if (count($this->nodes)) {
foreach ($this->nodes as $name => $node) {
$len = strlen($name) + 4;
- $noderepr = array();
+ $noderepr = [];
foreach (explode("\n", (string) $node) as $line) {
$noderepr[] = str_repeat(' ', $len).$line;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
index 17e4e381..62e0961b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
@@ -24,7 +24,7 @@ class Twig_Node_AutoEscape extends Twig_Node
{
public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
{
- parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
+ parent::__construct(['body' => $body], ['value' => $value], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php
similarity index 84%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php
index 91752ad2..2d0300ba 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Block.php
@@ -19,14 +19,14 @@ class Twig_Node_Block extends Twig_Node
{
public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
{
- parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
+ parent::__construct(['body' => $body], ['name' => $name], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
{
$compiler
->addDebugInfo($this)
- ->write(sprintf("public function block_%s(\$context, array \$blocks = array())\n", $this->getAttribute('name')), "{\n")
+ ->write(sprintf("public function block_%s(\$context, array \$blocks = [])\n", $this->getAttribute('name')), "{\n")
->indent()
;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php
index 92a9f398..0b0f7b36 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/BlockReference.php
@@ -19,7 +19,7 @@ class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInter
{
public function __construct($name, $lineno, $tag = null)
{
- parent::__construct(array(), array('name' => $name), $lineno, $tag);
+ parent::__construct([], ['name' => $name], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Body.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Body.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Body.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Body.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
similarity index 86%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
index 7258acb6..aecdb832 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
@@ -29,8 +29,8 @@ public function __construct(array $usedFilters, array $usedTags, array $usedFunc
public function compile(Twig_Compiler $compiler)
{
- $tags = $filters = $functions = array();
- foreach (array('tags', 'filters', 'functions') as $type) {
+ $tags = $filters = $functions = [];
+ foreach (['tags', 'filters', 'functions'] as $type) {
foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
if ($node instanceof Twig_Node) {
${$type}[$name] = $node->getTemplateLine();
@@ -48,9 +48,9 @@ public function compile(Twig_Compiler $compiler)
->indent()
->write("\$this->env->getExtension('Twig_Extension_Sandbox')->checkSecurity(\n")
->indent()
- ->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
- ->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
- ->write(!$functions ? "array()\n" : "array('".implode("', '", array_keys($functions))."')\n")
+ ->write(!$tags ? "[],\n" : "['".implode("', '", array_keys($tags))."'],\n")
+ ->write(!$filters ? "[],\n" : "['".implode("', '", array_keys($filters))."'],\n")
+ ->write(!$functions ? "[]\n" : "['".implode("', '", array_keys($functions))."']\n")
->outdent()
->write(");\n")
->outdent()
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Deprecated.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Deprecated.php
new file mode 100644
index 00000000..fc4c3923
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Deprecated.php
@@ -0,0 +1,49 @@
+
+ */
+class Twig_Node_Deprecated extends Twig_Node
+{
+ public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
+ {
+ parent::__construct(['expr' => $expr], [], $lineno, $tag);
+ }
+
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
+
+ $expr = $this->getNode('expr');
+
+ if ($expr instanceof Twig_Node_Expression_Constant) {
+ $compiler->write('@trigger_error(')
+ ->subcompile($expr);
+ } else {
+ $varName = $compiler->getVarName();
+ $compiler->write(sprintf('$%s = ', $varName))
+ ->subcompile($expr)
+ ->raw(";\n")
+ ->write(sprintf('@trigger_error($%s', $varName));
+ }
+
+ $compiler
+ ->raw('.')
+ ->string(sprintf(' ("%s" at line %d).', $this->getTemplateName(), $this->getTemplateLine()))
+ ->raw(", E_USER_DEPRECATED);\n")
+ ;
+ }
+}
+
+class_alias('Twig_Node_Deprecated', 'Twig\Node\DeprecatedNode', false);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php
index cdd7e77a..13350454 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Do.php
@@ -18,7 +18,7 @@ class Twig_Node_Do extends Twig_Node
{
public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
{
- parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+ parent::__construct(['expr' => $expr], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Embed.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Embed.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Embed.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Embed.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
index 0e77bb08..61e0d961 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
@@ -14,7 +14,7 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
public function __construct(array $elements, $lineno)
{
- parent::__construct($elements, array(), $lineno);
+ parent::__construct($elements, [], $lineno);
$this->index = -1;
foreach ($this->getKeyValuePairs() as $pair) {
@@ -26,13 +26,13 @@ public function __construct(array $elements, $lineno)
public function getKeyValuePairs()
{
- $pairs = array();
+ $pairs = [];
foreach (array_chunk($this->nodes, 2) as $pair) {
- $pairs[] = array(
+ $pairs[] = [
'key' => $pair[0],
'value' => $pair[1],
- );
+ ];
}
return $pairs;
@@ -62,7 +62,7 @@ public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $ke
public function compile(Twig_Compiler $compiler)
{
- $compiler->raw('array(');
+ $compiler->raw('[');
$first = true;
foreach ($this->getKeyValuePairs() as $pair) {
if (!$first) {
@@ -76,7 +76,7 @@ public function compile(Twig_Compiler $compiler)
->subcompile($pair['value'])
;
}
- $compiler->raw(')');
+ $compiler->raw(']');
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
index 2b545d98..e9155dd5 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
@@ -13,7 +13,7 @@ abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
{
public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
{
- parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
+ parent::__construct(['left' => $left, 'right' => $right], [], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
index 37a3983d..4beb13aa 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
@@ -28,12 +28,12 @@ public function __construct(Twig_NodeInterface $name, $template = null, $lineno,
$template = null;
}
- $nodes = array('name' => $name);
+ $nodes = ['name' => $name];
if (null !== $template) {
$nodes['template'] = $template;
}
- parent::__construct($nodes, array('is_defined_test' => false, 'output' => false), $lineno, $tag);
+ parent::__construct($nodes, ['is_defined_test' => false, 'output' => false], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
index ec203484..d1d30259 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
@@ -15,6 +15,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
protected function compileCallable(Twig_Compiler $compiler)
{
$closingParenthesis = false;
+ $isArray = false;
if ($this->hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
if (is_string($callable) && false === strpos($callable, '::')) {
$compiler->raw($callable);
@@ -30,24 +31,25 @@ protected function compileCallable(Twig_Compiler $compiler)
$compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', get_class($callable[0]), $callable[1]));
} else {
$type = ucfirst($this->getAttribute('type'));
- $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
+ $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), ', $type, $this->getAttribute('name')));
$closingParenthesis = true;
+ $isArray = true;
}
}
} else {
$compiler->raw($this->getAttribute('thing')->compile());
}
- $this->compileArguments($compiler);
+ $this->compileArguments($compiler, $isArray);
if ($closingParenthesis) {
$compiler->raw(')');
}
}
- protected function compileArguments(Twig_Compiler $compiler)
+ protected function compileArguments(Twig_Compiler $compiler, $isArray = false)
{
- $compiler->raw('(');
+ $compiler->raw($isArray ? '[' : '(');
$first = true;
@@ -96,7 +98,7 @@ protected function compileArguments(Twig_Compiler $compiler)
}
}
- $compiler->raw(')');
+ $compiler->raw($isArray ? ']' : ')');
}
protected function getArguments($callable, $arguments)
@@ -104,7 +106,7 @@ protected function getArguments($callable, $arguments)
$callType = $this->getAttribute('type');
$callName = $this->getAttribute('name');
- $parameters = array();
+ $parameters = [];
$named = false;
foreach ($arguments as $name => $node) {
if (!is_int($name)) {
@@ -133,10 +135,10 @@ protected function getArguments($callable, $arguments)
}
$callableParameters = $this->getCallableParameters($callable, $isVariadic);
- $arguments = array();
- $names = array();
- $missingArguments = array();
- $optionalArguments = array();
+ $arguments = [];
+ $names = [];
+ $missingArguments = [];
+ $optionalArguments = [];
$pos = 0;
foreach ($callableParameters as $callableParameter) {
$names[] = $name = $this->normalizeName($callableParameter->name);
@@ -156,12 +158,12 @@ protected function getArguments($callable, $arguments)
$arguments = array_merge($arguments, $optionalArguments);
$arguments[] = $parameters[$name];
unset($parameters[$name]);
- $optionalArguments = array();
+ $optionalArguments = [];
} elseif (array_key_exists($pos, $parameters)) {
$arguments = array_merge($arguments, $optionalArguments);
$arguments[] = $parameters[$pos];
unset($parameters[$pos]);
- $optionalArguments = array();
+ $optionalArguments = [];
++$pos;
} elseif ($callableParameter->isDefaultValueAvailable()) {
$optionalArguments[] = new Twig_Node_Expression_Constant($callableParameter->getDefaultValue(), -1);
@@ -177,7 +179,7 @@ protected function getArguments($callable, $arguments)
}
if ($isVariadic) {
- $arbitraryArguments = new Twig_Node_Expression_Array(array(), -1);
+ $arbitraryArguments = new Twig_Node_Expression_Array([], -1);
foreach ($parameters as $key => $value) {
if (is_int($key)) {
$arbitraryArguments->addElement($value);
@@ -213,14 +215,14 @@ protected function getArguments($callable, $arguments)
protected function normalizeName($name)
{
- return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), $name));
+ return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], $name));
}
private function getCallableParameters($callable, $isVariadic)
{
list($r) = $this->reflectCallable($callable);
if (null === $r) {
- return array();
+ return [];
}
$parameters = $r->getParameters();
@@ -240,7 +242,7 @@ private function getCallableParameters($callable, $isVariadic)
}
if ($isVariadic) {
$argument = end($parameters);
- if ($argument && $argument->isArray() && $argument->isDefaultValueAvailable() && array() === $argument->getDefaultValue()) {
+ if ($argument && $argument->isArray() && $argument->isDefaultValueAvailable() && [] === $argument->getDefaultValue()) {
array_pop($parameters);
} else {
$callableName = $r->name;
@@ -248,7 +250,7 @@ private function getCallableParameters($callable, $isVariadic)
$callableName = $r->getDeclaringClass()->name.'::'.$callableName;
}
- throw new LogicException(sprintf('The last parameter of "%s" for %s "%s" must be an array with default value, eg. "array $arg = array()".', $callableName, $this->getAttribute('type'), $this->getAttribute('name')));
+ throw new LogicException(sprintf('The last parameter of "%s" for %s "%s" must be an array with default value, eg. "array $arg = []".', $callableName, $this->getAttribute('type'), $this->getAttribute('name')));
}
}
@@ -264,27 +266,27 @@ private function reflectCallable($callable)
if (is_array($callable)) {
if (!method_exists($callable[0], $callable[1])) {
// __call()
- return array(null, array());
+ return [null, []];
}
$r = new ReflectionMethod($callable[0], $callable[1]);
} elseif (is_object($callable) && !$callable instanceof Closure) {
$r = new ReflectionObject($callable);
$r = $r->getMethod('__invoke');
- $callable = array($callable, '__invoke');
+ $callable = [$callable, '__invoke'];
} elseif (is_string($callable) && false !== $pos = strpos($callable, '::')) {
$class = substr($callable, 0, $pos);
$method = substr($callable, $pos + 2);
if (!method_exists($class, $method)) {
// __staticCall()
- return array(null, array());
+ return [null, []];
}
$r = new ReflectionMethod($callable);
- $callable = array($class, $method);
+ $callable = [$class, $method];
} else {
$r = new ReflectionFunction($callable);
}
- return $this->reflector = array($r, $callable);
+ return $this->reflector = [$r, $callable];
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
index c339d773..996772a0 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
@@ -13,7 +13,7 @@ class Twig_Node_Expression_Conditional extends Twig_Node_Expression
{
public function __construct(Twig_Node_Expression $expr1, Twig_Node_Expression $expr2, Twig_Node_Expression $expr3, $lineno)
{
- parent::__construct(array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3), array(), $lineno);
+ parent::__construct(['expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3], [], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
index bf4d031c..7304e8c3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
@@ -13,7 +13,7 @@ class Twig_Node_Expression_Constant extends Twig_Node_Expression
{
public function __construct($value, $lineno)
{
- parent::__construct(array(), array('value' => $value), $lineno);
+ parent::__construct([], ['value' => $value], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
index 114b5cd9..7bcc078c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
@@ -22,7 +22,7 @@ class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
{
public function __construct($name, $lineno, $tag = null)
{
- parent::__construct(array(), array('name' => $name), $lineno, $tag);
+ parent::__construct([], ['name' => $name], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
index 12da1d67..7b5952fb 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
@@ -13,7 +13,7 @@ class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
{
public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
{
- parent::__construct(array('node' => $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
+ parent::__construct(['node' => $node, 'filter' => $filterName, 'arguments' => $arguments], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
index cdee7c97..c19633f1 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
@@ -12,7 +12,7 @@ class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
{
public function __construct($name, Twig_NodeInterface $arguments, $lineno)
{
- parent::__construct(array('arguments' => $arguments), array('name' => $name, 'is_defined_test' => false), $lineno);
+ parent::__construct(['arguments' => $arguments], ['name' => $name, 'is_defined_test' => false], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
index b7823acc..89769150 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
@@ -13,12 +13,12 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
{
public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_Node_Expression $arguments = null, $type, $lineno)
{
- $nodes = array('node' => $node, 'attribute' => $attribute);
+ $nodes = ['node' => $node, 'attribute' => $attribute];
if (null !== $arguments) {
$nodes['arguments'] = $arguments;
}
- parent::__construct($nodes, array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
+ parent::__construct($nodes, ['type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false], $lineno);
}
public function compile(Twig_Compiler $compiler)
@@ -51,7 +51,7 @@ public function compile(Twig_Compiler $compiler)
if ($this->hasNode('arguments')) {
$compiler->raw(', ')->subcompile($this->getNode('arguments'));
} else {
- $compiler->raw(', array()');
+ $compiler->raw(', []');
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
index 709016eb..b8a83450 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
@@ -12,7 +12,7 @@ class Twig_Node_Expression_MethodCall extends Twig_Node_Expression
{
public function __construct(Twig_Node_Expression $node, $method, Twig_Node_Expression_Array $arguments, $lineno)
{
- parent::__construct(array('node' => $node, 'arguments' => $arguments), array('method' => $method, 'safe' => false), $lineno);
+ parent::__construct(['node' => $node, 'arguments' => $arguments], ['method' => $method, 'safe' => false], $lineno);
if ($node instanceof Twig_Node_Expression_Name) {
$node->setAttribute('always_defined', true);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
index 7d3d6220..2d1d3d1c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
@@ -11,15 +11,15 @@
*/
class Twig_Node_Expression_Name extends Twig_Node_Expression
{
- protected $specialVars = array(
+ protected $specialVars = [
'_self' => '$this',
'_context' => '$context',
'_charset' => '$this->env->getCharset()',
- );
+ ];
public function __construct($name, $lineno)
{
- parent::__construct(array(), array('name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false, 'always_defined' => false), $lineno);
+ parent::__construct([], ['name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false, 'always_defined' => false], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
index 78692db2..86236852 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
@@ -19,7 +19,7 @@ class Twig_Node_Expression_Parent extends Twig_Node_Expression
{
public function __construct($name, $lineno, $tag = null)
{
- parent::__construct(array(), array('output' => false, 'name' => $name), $lineno, $tag);
+ parent::__construct([], ['output' => false, 'name' => $name], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
index 0a86e003..4be1cc2c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
@@ -12,7 +12,7 @@ class Twig_Node_Expression_TempName extends Twig_Node_Expression
{
public function __construct($name, $lineno)
{
- parent::__construct(array(), array('name' => $name), $lineno);
+ parent::__construct([], ['name' => $name], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
similarity index 84%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
index ad102ba6..a543ec55 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
@@ -12,12 +12,12 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
{
public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
{
- $nodes = array('node' => $node);
+ $nodes = ['node' => $node];
if (null !== $arguments) {
$nodes['arguments'] = $arguments;
}
- parent::__construct($nodes, array('name' => $name), $lineno);
+ parent::__construct($nodes, ['name' => $name], $lineno);
}
public function compile(Twig_Compiler $compiler)
@@ -28,6 +28,9 @@ public function compile(Twig_Compiler $compiler)
$this->setAttribute('name', $name);
$this->setAttribute('type', 'test');
$this->setAttribute('thing', $test);
+ if ($test instanceof Twig_SimpleTest) {
+ $this->setAttribute('arguments', $test->getArguments());
+ }
if ($test instanceof Twig_TestCallableInterface || $test instanceof Twig_SimpleTest) {
$this->setAttribute('callable', $test->getCallable());
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
index 5804485e..abf191a3 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
@@ -13,7 +13,7 @@ abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
{
public function __construct(Twig_NodeInterface $node, $lineno)
{
- parent::__construct(array('node' => $node), array(), $lineno);
+ parent::__construct(['node' => $node], [], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php
index fcc461ac..5d3ffd52 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Flush.php
@@ -18,7 +18,7 @@ class Twig_Node_Flush extends Twig_Node
{
public function __construct($lineno, $tag)
{
- parent::__construct(array(), array(), $lineno, $tag);
+ parent::__construct([], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/For.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/For.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/For.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/For.php
index 914b70c9..76519457 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/For.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/For.php
@@ -21,18 +21,18 @@ class Twig_Node_For extends Twig_Node
public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
{
- $body = new Twig_Node(array($body, $this->loop = new Twig_Node_ForLoop($lineno, $tag)));
+ $body = new Twig_Node([$body, $this->loop = new Twig_Node_ForLoop($lineno, $tag)]);
if (null !== $ifexpr) {
- $body = new Twig_Node_If(new Twig_Node(array($ifexpr, $body)), null, $lineno, $tag);
+ $body = new Twig_Node_If(new Twig_Node([$ifexpr, $body]), null, $lineno, $tag);
}
- $nodes = array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body);
+ $nodes = ['key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body];
if (null !== $else) {
$nodes['else'] = $else;
}
- parent::__construct($nodes, array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag);
+ parent::__construct($nodes, ['with_loop' => true, 'ifexpr' => null !== $ifexpr], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
@@ -51,12 +51,12 @@ public function compile(Twig_Compiler $compiler)
if ($this->getAttribute('with_loop')) {
$compiler
- ->write("\$context['loop'] = array(\n")
+ ->write("\$context['loop'] = [\n")
->write(" 'parent' => \$context['_parent'],\n")
->write(" 'index0' => 0,\n")
->write(" 'index' => 1,\n")
->write(" 'first' => true,\n")
- ->write(");\n")
+ ->write("];\n")
;
if (!$this->getAttribute('ifexpr')) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php
index 06477cf1..31f282d7 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/ForLoop.php
@@ -18,7 +18,7 @@ class Twig_Node_ForLoop extends Twig_Node
{
public function __construct($lineno, $tag = null)
{
- parent::__construct(array(), array('with_loop' => false, 'ifexpr' => false, 'else' => false), $lineno, $tag);
+ parent::__construct([], ['with_loop' => false, 'ifexpr' => false, 'else' => false], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/If.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/If.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/If.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/If.php
index d82edec7..b096cd4e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/If.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/If.php
@@ -19,12 +19,12 @@ class Twig_Node_If extends Twig_Node
{
public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
{
- $nodes = array('tests' => $tests);
+ $nodes = ['tests' => $tests];
if (null !== $else) {
$nodes['else'] = $else;
}
- parent::__construct($nodes, array(), $lineno, $tag);
+ parent::__construct($nodes, [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php
index c77e320b..44b2131e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Import.php
@@ -18,7 +18,7 @@ class Twig_Node_Import extends Twig_Node
{
public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $var, $lineno, $tag = null)
{
- parent::__construct(array('expr' => $expr, 'var' => $var), array(), $lineno, $tag);
+ parent::__construct(['expr' => $expr, 'var' => $var], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php
index 2a5114cb..4b263819 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Include.php
@@ -19,12 +19,12 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
{
public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
{
- $nodes = array('expr' => $expr);
+ $nodes = ['expr' => $expr];
if (null !== $variables) {
$nodes['variables'] = $variables;
}
- parent::__construct($nodes, array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
+ parent::__construct($nodes, ['only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
@@ -74,7 +74,7 @@ protected function addGetTemplate(Twig_Compiler $compiler)
protected function addTemplateArguments(Twig_Compiler $compiler)
{
if (!$this->hasNode('variables')) {
- $compiler->raw(false === $this->getAttribute('only') ? '$context' : 'array()');
+ $compiler->raw(false === $this->getAttribute('only') ? '$context' : '[]');
} elseif (false === $this->getAttribute('only')) {
$compiler
->raw('array_merge($context, ')
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php
index 3cf54977..0c4f9286 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Macro.php
@@ -26,7 +26,7 @@ public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface
}
}
- parent::__construct(array('body' => $body, 'arguments' => $arguments), array('name' => $name), $lineno, $tag);
+ parent::__construct(['body' => $body, 'arguments' => $arguments], ['name' => $name], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
@@ -64,7 +64,7 @@ public function compile(Twig_Compiler $compiler)
;
$compiler
- ->write("\$context = \$this->env->mergeGlobals(array(\n")
+ ->write("\$context = \$this->env->mergeGlobals([\n")
->indent()
;
@@ -91,14 +91,14 @@ public function compile(Twig_Compiler $compiler)
->repr($count)
->raw(' ? array_slice(func_get_args(), ')
->repr($count)
- ->raw(") : array(),\n")
+ ->raw(") : [],\n")
;
}
$compiler
->outdent()
- ->write("));\n\n")
- ->write("\$blocks = array();\n\n")
+ ->write("]);\n\n")
+ ->write("\$blocks = [];\n\n")
->write("ob_start();\n")
->write("try {\n")
->indent()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php
index 5cd8d050..c33bbe15 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Module.php
@@ -32,7 +32,7 @@ public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $pare
$this->source = $name;
}
- $nodes = array(
+ $nodes = [
'body' => $body,
'blocks' => $blocks,
'macros' => $macros,
@@ -42,20 +42,20 @@ public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $pare
'constructor_start' => new Twig_Node(),
'constructor_end' => new Twig_Node(),
'class_end' => new Twig_Node(),
- );
+ ];
if (null !== $parent) {
$nodes['parent'] = $parent;
}
// embedded templates are set as attributes so that they are only visited once by the visitors
- parent::__construct($nodes, array(
+ parent::__construct($nodes, [
// source to be remove in 2.0
'source' => $this->source->getCode(),
// filename to be remove in 2.0 (use getTemplateName() instead)
'filename' => $this->source->getName(),
'index' => null,
'embedded_templates' => $embeddedTemplates,
- ), 1);
+ ], 1);
// populate the template name of all node children
$this->setTemplateName($this->source->getName());
@@ -257,11 +257,11 @@ protected function compileConstructor(Twig_Compiler $compiler)
->write("\$this->blocks = array_merge(\n")
->indent()
->write("\$this->traits,\n")
- ->write("array(\n")
+ ->write("[\n")
;
} else {
$compiler
- ->write("\$this->blocks = array(\n")
+ ->write("\$this->blocks = [\n")
;
}
@@ -272,20 +272,25 @@ protected function compileConstructor(Twig_Compiler $compiler)
foreach ($this->getNode('blocks') as $name => $node) {
$compiler
- ->write(sprintf("'%s' => array(\$this, 'block_%s'),\n", $name, $name))
+ ->write(sprintf("'%s' => [\$this, 'block_%s'],\n", $name, $name))
;
}
if ($countTraits) {
$compiler
->outdent()
- ->write(")\n")
+ ->write("]\n")
+ ->outdent()
+ ->write(");\n")
+ ;
+ } else {
+ $compiler
+ ->outdent()
+ ->write("];\n")
;
}
$compiler
- ->outdent()
- ->write(");\n")
->outdent()
->subcompile($this->getNode('constructor_end'))
->write("}\n\n")
@@ -295,7 +300,7 @@ protected function compileConstructor(Twig_Compiler $compiler)
protected function compileDisplay(Twig_Compiler $compiler)
{
$compiler
- ->write("protected function doDisplay(array \$context, array \$blocks = array())\n", "{\n")
+ ->write("protected function doDisplay(array \$context, array \$blocks = [])\n", "{\n")
->indent()
->subcompile($this->getNode('display_start'))
->subcompile($this->getNode('body'))
@@ -364,7 +369,7 @@ protected function compileIsTraitable(Twig_Compiler $compiler)
}
if (!count($nodes)) {
- $nodes = new Twig_Node(array($nodes));
+ $nodes = new Twig_Node([$nodes]);
}
foreach ($nodes as $node) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php
index 374db89b..215d712a 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Print.php
@@ -19,7 +19,7 @@ class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
{
public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
{
- parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+ parent::__construct(['expr' => $expr], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php
index 44b30ab9..e06f332b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Sandbox.php
@@ -18,7 +18,7 @@ class Twig_Node_Sandbox extends Twig_Node
{
public function __construct(Twig_NodeInterface $body, $lineno, $tag = null)
{
- parent::__construct(array('body' => $body), array(), $lineno, $tag);
+ parent::__construct(['body' => $body], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php
index 6c6743ee..155cc484 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Set.php
@@ -18,7 +18,7 @@ class Twig_Node_Set extends Twig_Node implements Twig_NodeCaptureInterface
{
public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
{
- parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag);
+ parent::__construct(['names' => $names, 'values' => $values], ['capture' => $capture, 'safe' => false], $lineno, $tag);
/*
* Optimizes the node when capture is used for a large block of text.
@@ -69,7 +69,7 @@ public function compile(Twig_Compiler $compiler)
$compiler->raw(' = ');
if (count($this->getNode('names')) > 1) {
- $compiler->write('array(');
+ $compiler->write('[');
foreach ($this->getNode('values') as $idx => $value) {
if ($idx) {
$compiler->raw(', ');
@@ -77,7 +77,7 @@ public function compile(Twig_Compiler $compiler)
$compiler->subcompile($value);
}
- $compiler->raw(')');
+ $compiler->raw(']');
} else {
if ($this->getAttribute('safe')) {
$compiler
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php
index 996fdcde..c04ff454 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/SetTemp.php
@@ -16,7 +16,7 @@ class Twig_Node_SetTemp extends Twig_Node
{
public function __construct($name, $lineno)
{
- parent::__construct(array(), array('name' => $name), $lineno);
+ parent::__construct([], ['name' => $name], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php
index 76f90cde..43e907af 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Spaceless.php
@@ -20,7 +20,7 @@ class Twig_Node_Spaceless extends Twig_Node
{
public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless')
{
- parent::__construct(array('body' => $body), array(), $lineno, $tag);
+ parent::__construct(['body' => $body], [], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php
index f4577fee..ab24d719 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/Text.php
@@ -19,7 +19,7 @@ class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
{
public function __construct($data, $lineno)
{
- parent::__construct(array(), array('data' => $data), $lineno);
+ parent::__construct([], ['data' => $data], $lineno);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/With.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/With.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/With.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/With.php
index 2ab0ea5d..422cc812 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Node/With.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Node/With.php
@@ -18,12 +18,12 @@ class Twig_Node_With extends Twig_Node
{
public function __construct(Twig_Node $body, Twig_Node $variables = null, $only = false, $lineno, $tag = null)
{
- $nodes = array('body' => $body);
+ $nodes = ['body' => $body];
if (null !== $variables) {
$nodes['variables'] = $variables;
}
- parent::__construct($nodes, array('only' => (bool) $only), $lineno, $tag);
+ parent::__construct($nodes, ['only' => (bool) $only], $lineno, $tag);
}
public function compile(Twig_Compiler $compiler)
@@ -44,7 +44,7 @@ public function compile(Twig_Compiler $compiler)
;
if ($this->getAttribute('only')) {
- $compiler->write("\$context = array('_parent' => \$context);\n");
+ $compiler->write("\$context = ['_parent' => \$context];\n");
} else {
$compiler->write("\$context['_parent'] = \$context;\n");
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeOutputInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php
index f00a0bf5..7f80e76b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeTraverser.php
@@ -21,13 +21,13 @@
class Twig_NodeTraverser
{
protected $env;
- protected $visitors = array();
+ protected $visitors = [];
/**
* @param Twig_Environment $env
* @param Twig_NodeVisitorInterface[] $visitors
*/
- public function __construct(Twig_Environment $env, array $visitors = array())
+ public function __construct(Twig_Environment $env, array $visitors = [])
{
$this->env = $env;
foreach ($visitors as $visitor) {
@@ -38,7 +38,7 @@ public function __construct(Twig_Environment $env, array $visitors = array())
public function addVisitor(Twig_NodeVisitorInterface $visitor)
{
if (!isset($this->visitors[$visitor->getPriority()])) {
- $this->visitors[$visitor->getPriority()] = array();
+ $this->visitors[$visitor->getPriority()] = [];
}
$this->visitors[$visitor->getPriority()][] = $visitor;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
index 1a1ae66f..5eb32ea1 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
@@ -18,12 +18,12 @@
*/
class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
{
- protected $statusStack = array();
- protected $blocks = array();
+ protected $statusStack = [];
+ protected $blocks = [];
protected $safeAnalysis;
protected $traverser;
protected $defaultStrategy = false;
- protected $safeVars = array();
+ protected $safeVars = [];
public function __construct()
{
@@ -36,8 +36,8 @@ protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
if ($env->hasExtension('Twig_Extension_Escaper') && $defaultStrategy = $env->getExtension('Twig_Extension_Escaper')->getDefaultStrategy($node->getTemplateName())) {
$this->defaultStrategy = $defaultStrategy;
}
- $this->safeVars = array();
- $this->blocks = array();
+ $this->safeVars = [];
+ $this->blocks = [];
} elseif ($node instanceof Twig_Node_AutoEscape) {
$this->statusStack[] = $node->getAttribute('value');
} elseif ($node instanceof Twig_Node_Block) {
@@ -53,8 +53,8 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
$this->defaultStrategy = false;
- $this->safeVars = array();
- $this->blocks = array();
+ $this->safeVars = [];
+ $this->blocks = [];
} elseif ($node instanceof Twig_Node_Expression_Filter) {
return $this->preEscapeFilterNode($node, $env);
} elseif ($node instanceof Twig_Node_Print) {
@@ -115,7 +115,7 @@ protected function isSafeFor($type, Twig_NodeInterface $expression, $env)
if (null === $safe) {
if (null === $this->traverser) {
- $this->traverser = new Twig_NodeTraverser($env, array($this->safeAnalysis));
+ $this->traverser = new Twig_NodeTraverser($env, [$this->safeAnalysis]);
}
$this->safeAnalysis->setSafeVars($this->safeVars);
@@ -140,7 +140,7 @@ protected function getEscaperFilter($type, Twig_NodeInterface $node)
{
$line = $node->getTemplateLine();
$name = new Twig_Node_Expression_Constant('escape', $line);
- $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line)));
+ $args = new Twig_Node([new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line)]);
return new Twig_Node_Expression_Filter($node, $name, $args, $line);
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
index c55e40ff..f97ea56f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
@@ -29,10 +29,10 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
const OPTIMIZE_RAW_FILTER = 4;
const OPTIMIZE_VAR_ACCESS = 8;
- protected $loops = array();
- protected $loopsTargets = array();
+ protected $loops = [];
+ protected $loopsTargets = [];
protected $optimizers;
- protected $prependedNodes = array();
+ protected $prependedNodes = [];
protected $inABody = false;
/**
@@ -57,7 +57,7 @@ protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
if ($this->inABody) {
if (!$node instanceof Twig_Node_Expression) {
if ('Twig_Node' !== get_class($node)) {
- array_unshift($this->prependedNodes, array());
+ array_unshift($this->prependedNodes, []);
}
} else {
$node = $this->optimizeVariables($node, $env);
@@ -89,7 +89,7 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
$this->inABody = false;
} elseif ($this->inABody) {
if (!$expression && 'Twig_Node' !== get_class($node) && $prependedNodes = array_shift($this->prependedNodes)) {
- $nodes = array();
+ $nodes = [];
foreach (array_unique($prependedNodes) as $name) {
$nodes[] = new Twig_Node_SetTemp($name, $node->getTemplateLine());
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
similarity index 86%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
index ca31c8fc..eff855b4 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -14,8 +14,8 @@
*/
class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
{
- protected $data = array();
- protected $safeVars = array();
+ protected $data = [];
+ protected $safeVars = [];
public function setSafeVars($safeVars)
{
@@ -54,10 +54,10 @@ protected function setSafe(Twig_NodeInterface $node, array $safe)
}
}
}
- $this->data[$hash][] = array(
+ $this->data[$hash][] = [
'key' => $node,
'value' => $safe,
- );
+ ];
}
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
@@ -69,13 +69,13 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Expression_Constant) {
// constants are marked safe for all
- $this->setSafe($node, array('all'));
+ $this->setSafe($node, ['all']);
} elseif ($node instanceof Twig_Node_Expression_BlockReference) {
// blocks are safe by definition
- $this->setSafe($node, array('all'));
+ $this->setSafe($node, ['all']);
} elseif ($node instanceof Twig_Node_Expression_Parent) {
// parent block is safe by definition
- $this->setSafe($node, array('all'));
+ $this->setSafe($node, ['all']);
} elseif ($node instanceof Twig_Node_Expression_Conditional) {
// intersect safeness of both operands
$safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3')));
@@ -91,7 +91,7 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
}
$this->setSafe($node, $safe);
} else {
- $this->setSafe($node, array());
+ $this->setSafe($node, []);
}
} elseif ($node instanceof Twig_Node_Expression_Function) {
// function expression is safe when the function is safe
@@ -101,24 +101,24 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
if (false !== $function) {
$this->setSafe($node, $function->getSafe($args));
} else {
- $this->setSafe($node, array());
+ $this->setSafe($node, []);
}
} elseif ($node instanceof Twig_Node_Expression_MethodCall) {
if ($node->getAttribute('safe')) {
- $this->setSafe($node, array('all'));
+ $this->setSafe($node, ['all']);
} else {
- $this->setSafe($node, array());
+ $this->setSafe($node, []);
}
} elseif ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name) {
$name = $node->getNode('node')->getAttribute('name');
// attributes on template instances are safe
if ('_self' == $name || in_array($name, $this->safeVars)) {
- $this->setSafe($node, array('all'));
+ $this->setSafe($node, ['all']);
} else {
- $this->setSafe($node, array());
+ $this->setSafe($node, []);
}
} else {
- $this->setSafe($node, array());
+ $this->setSafe($node, []);
}
return $node;
@@ -127,7 +127,7 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
protected function intersectSafe(array $a = null, array $b = null)
{
if (null === $a || null === $b) {
- return array();
+ return [];
}
if (in_array('all', $a)) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
similarity index 88%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
index 71aa4f02..894cc1a0 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
@@ -27,9 +27,9 @@ protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
$this->inAModule = true;
- $this->tags = array();
- $this->filters = array();
- $this->functions = array();
+ $this->tags = [];
+ $this->filters = [];
+ $this->functions = [];
return $node;
} elseif ($this->inAModule) {
@@ -67,7 +67,7 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
if ($node instanceof Twig_Node_Module) {
$this->inAModule = false;
- $node->setNode('display_start', new Twig_Node(array(new Twig_Node_CheckSecurity($this->filters, $this->tags, $this->functions), $node->getNode('display_start'))));
+ $node->setNode('display_start', new Twig_Node([new Twig_Node_CheckSecurity($this->filters, $this->tags, $this->functions), $node->getNode('display_start')]));
}
return $node;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Parser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Parser.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Parser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Parser.php
index 6de879a5..ff444011 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Parser.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Parser.php
@@ -17,7 +17,7 @@
*/
class Twig_Parser implements Twig_ParserInterface
{
- protected $stack = array();
+ protected $stack = [];
protected $stream;
protected $parent;
protected $handlers;
@@ -30,7 +30,7 @@ class Twig_Parser implements Twig_ParserInterface
protected $reservedMacroNames;
protected $importedSymbols;
protected $traits;
- protected $embeddedTemplates = array();
+ protected $embeddedTemplates = [];
private $varNameSalt = 0;
public function __construct(Twig_Environment $env)
@@ -68,7 +68,7 @@ public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = fals
// push all variables into the stack to keep the current state of the parser
// using get_object_vars() instead of foreach would lead to https://bugs.php.net/71336
// This hack can be removed when min version if PHP 7.0
- $vars = array();
+ $vars = [];
foreach ($this as $k => $v) {
$vars[$k] = $v;
}
@@ -93,12 +93,12 @@ public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = fals
$this->stream = $stream;
$this->parent = null;
- $this->blocks = array();
- $this->macros = array();
- $this->traits = array();
- $this->blockStack = array();
- $this->importedSymbols = array(array());
- $this->embeddedTemplates = array();
+ $this->blocks = [];
+ $this->macros = [];
+ $this->traits = [];
+ $this->blockStack = [];
+ $this->importedSymbols = [[]];
+ $this->embeddedTemplates = [];
$this->varNameSalt = 0;
try {
@@ -119,7 +119,7 @@ public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = fals
throw $e;
}
- $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $stream->getSourceContext());
+ $node = new Twig_Node_Module(new Twig_Node_Body([$body]), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $stream->getSourceContext());
$traverser = new Twig_NodeTraverser($this->env, $this->visitors);
@@ -136,7 +136,7 @@ public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = fals
public function subparse($test, $dropNeedle = false)
{
$lineno = $this->getCurrentToken()->getLine();
- $rv = array();
+ $rv = [];
while (!$this->stream->isEOF()) {
switch ($this->getCurrentToken()->getType()) {
case Twig_Token::TEXT_TYPE:
@@ -168,7 +168,7 @@ public function subparse($test, $dropNeedle = false)
return $rv[0];
}
- return new Twig_Node($rv, array(), $lineno);
+ return new Twig_Node($rv, [], $lineno);
}
$subparser = $this->handlers->getTokenParser($token->getValue());
@@ -204,7 +204,7 @@ public function subparse($test, $dropNeedle = false)
return $rv[0];
}
- return new Twig_Node($rv, array(), $lineno);
+ return new Twig_Node($rv, [], $lineno);
}
/**
@@ -259,7 +259,7 @@ public function getBlock($name)
public function setBlock($name, Twig_Node_Block $value)
{
- $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getTemplateLine());
+ $this->blocks[$name] = new Twig_Node_Body([$value], [], $value->getTemplateLine());
}
public function hasMacro($name)
@@ -279,7 +279,7 @@ public function setMacro($name, Twig_Node_Macro $node)
public function isReservedMacroName($name)
{
if (null === $this->reservedMacroNames) {
- $this->reservedMacroNames = array();
+ $this->reservedMacroNames = [];
$r = new ReflectionClass($this->env->getBaseTemplateClass());
foreach ($r->getMethods() as $method) {
$methodName = strtolower($method->getName());
@@ -312,7 +312,7 @@ public function embedTemplate(Twig_Node_Module $template)
public function addImportedSymbol($type, $alias, $name = null, Twig_Node_Expression $node = null)
{
- $this->importedSymbols[0][$type][$alias] = array('name' => $name, 'node' => $node);
+ $this->importedSymbols[0][$type][$alias] = ['name' => $name, 'node' => $node];
}
public function getImportedSymbol($type, $alias)
@@ -331,7 +331,7 @@ public function isMainScope()
public function pushLocalScope()
{
- array_unshift($this->importedSymbols, array());
+ array_unshift($this->importedSymbols, []);
}
public function popLocalScope()
@@ -382,7 +382,11 @@ protected function filterBodyNodes(Twig_NodeInterface $node)
(!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
) {
if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {
- throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext());
+ $t = substr($node->getAttribute('data'), 3);
+ if ('' === $t || ctype_space($t)) {
+ // bypass empty nodes starting with a BOM
+ return;
+ }
}
throw new Twig_Error_Syntax('A template that extends another one cannot include content outside Twig blocks. Did you forget to put the content inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ParserInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ParserInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/ParserInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/ParserInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Base.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
index 7a33baf2..4ebb0d0f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
@@ -18,7 +18,7 @@ class Twig_Profiler_Dumper_Blackfire
{
public function dump(Twig_Profiler_Profile $profile)
{
- $data = array();
+ $data = [];
$this->dumpProfile('main()', $profile, $data);
$this->dumpChildren('main()', $profile, $data);
@@ -54,17 +54,17 @@ private function dumpChildren($parent, Twig_Profiler_Profile $profile, &$data)
private function dumpProfile($edge, Twig_Profiler_Profile $profile, &$data)
{
if (isset($data[$edge])) {
- $data[$edge]['ct'] += 1;
+ ++$data[$edge]['ct'];
$data[$edge]['wt'] += floor($profile->getDuration() * 1000000);
$data[$edge]['mu'] += $profile->getMemoryUsage();
$data[$edge]['pmu'] += $profile->getPeakMemoryUsage();
} else {
- $data[$edge] = array(
+ $data[$edge] = [
'ct' => 1,
'wt' => floor($profile->getDuration() * 1000000),
'mu' => $profile->getMemoryUsage(),
'pmu' => $profile->getPeakMemoryUsage(),
- );
+ ];
}
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
similarity index 97%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
index b57a2551..974b5216 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
@@ -16,12 +16,12 @@
*/
class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Base
{
- private static $colors = array(
+ private static $colors = [
'block' => '#dfd',
'macro' => '#ddf',
'template' => '#ffd',
'big' => '#d44',
- );
+ ];
public function dump(Twig_Profiler_Profile $profile)
{
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
index 69c8f797..b29ec9b7 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
@@ -18,7 +18,7 @@ class Twig_Profiler_Node_EnterProfile extends Twig_Node
{
public function __construct($extensionName, $type, $name, $varName)
{
- parent::__construct(array(), array('extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName));
+ parent::__construct([], ['extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName]);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
index d1d6a7cc..bcb912dd 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
@@ -18,7 +18,7 @@ class Twig_Profiler_Node_LeaveProfile extends Twig_Node
{
public function __construct($varName)
{
- parent::__construct(array(), array('var_name' => $varName));
+ parent::__construct([], ['var_name' => $varName]);
}
public function compile(Twig_Compiler $compiler)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
similarity index 77%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
index 5db41fea..6cf5bb0e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
@@ -32,22 +32,22 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
$varName = $this->getVarName();
- $node->setNode('display_start', new Twig_Node(array(new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getTemplateName(), $varName), $node->getNode('display_start'))));
- $node->setNode('display_end', new Twig_Node(array(new Twig_Profiler_Node_LeaveProfile($varName), $node->getNode('display_end'))));
+ $node->setNode('display_start', new Twig_Node([new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getTemplateName(), $varName), $node->getNode('display_start')]));
+ $node->setNode('display_end', new Twig_Node([new Twig_Profiler_Node_LeaveProfile($varName), $node->getNode('display_end')]));
} elseif ($node instanceof Twig_Node_Block) {
$varName = $this->getVarName();
- $node->setNode('body', new Twig_Node_Body(array(
+ $node->setNode('body', new Twig_Node_Body([
new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::BLOCK, $node->getAttribute('name'), $varName),
$node->getNode('body'),
new Twig_Profiler_Node_LeaveProfile($varName),
- )));
+ ]));
} elseif ($node instanceof Twig_Node_Macro) {
$varName = $this->getVarName();
- $node->setNode('body', new Twig_Node_Body(array(
+ $node->setNode('body', new Twig_Node_Body([
new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::MACRO, $node->getAttribute('name'), $varName),
$node->getNode('body'),
new Twig_Profiler_Node_LeaveProfile($varName),
- )));
+ ]));
}
return $node;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php
index 3fdc1a8a..8ba1c4cc 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Profiler/Profile.php
@@ -24,9 +24,9 @@ class Twig_Profiler_Profile implements IteratorAggregate, Serializable
private $template;
private $name;
private $type;
- private $starts = array();
- private $ends = array();
- private $profiles = array();
+ private $starts = [];
+ private $ends = [];
+ private $profiles = [];
public function __construct($template = 'main', $type = self::ROOT, $name = 'main')
{
@@ -76,7 +76,7 @@ public function getProfiles()
return $this->profiles;
}
- public function addProfile(Twig_Profiler_Profile $profile)
+ public function addProfile(self $profile)
{
$this->profiles[] = $profile;
}
@@ -126,11 +126,11 @@ public function getPeakMemoryUsage()
*/
public function enter()
{
- $this->starts = array(
+ $this->starts = [
'wt' => microtime(true),
'mu' => memory_get_usage(),
'pmu' => memory_get_peak_usage(),
- );
+ ];
}
/**
@@ -138,16 +138,16 @@ public function enter()
*/
public function leave()
{
- $this->ends = array(
+ $this->ends = [
'wt' => microtime(true),
'mu' => memory_get_usage(),
'pmu' => memory_get_peak_usage(),
- );
+ ];
}
public function reset()
{
- $this->starts = $this->ends = $this->profiles = array();
+ $this->starts = $this->ends = $this->profiles = [];
$this->enter();
}
@@ -158,7 +158,7 @@ public function getIterator()
public function serialize()
{
- return serialize(array($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles));
+ return serialize([$this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles]);
}
public function unserialize($data)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
index dca0b82b..cf59117b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
@@ -24,7 +24,7 @@ class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterfac
protected $allowedProperties;
protected $allowedFunctions;
- public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array())
+ public function __construct(array $allowedTags = [], array $allowedFilters = [], array $allowedMethods = [], array $allowedProperties = [], array $allowedFunctions = [])
{
$this->allowedTags = $allowedTags;
$this->allowedFilters = $allowedFilters;
@@ -45,9 +45,9 @@ public function setAllowedFilters(array $filters)
public function setAllowedMethods(array $methods)
{
- $this->allowedMethods = array();
+ $this->allowedMethods = [];
foreach ($methods as $class => $m) {
- $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : array($m));
+ $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : [$m]);
}
}
@@ -109,7 +109,7 @@ public function checkPropertyAllowed($obj, $property)
$allowed = false;
foreach ($this->allowedProperties as $class => $properties) {
if ($obj instanceof $class) {
- $allowed = in_array($property, is_array($properties) ? $properties : array($properties));
+ $allowed = in_array($property, is_array($properties) ? $properties : [$properties]);
break;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php
index ee4c0aeb..5c4cfc56 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFilter.php
@@ -21,13 +21,13 @@ class Twig_SimpleFilter
protected $name;
protected $callable;
protected $options;
- protected $arguments = array();
+ protected $arguments = [];
- public function __construct($name, $callable, array $options = array())
+ public function __construct($name, $callable, array $options = [])
{
$this->name = $name;
$this->callable = $callable;
- $this->options = array_merge(array(
+ $this->options = array_merge([
'needs_environment' => false,
'needs_context' => false,
'is_variadic' => false,
@@ -38,7 +38,7 @@ public function __construct($name, $callable, array $options = array())
'node_class' => 'Twig_Node_Expression_Filter',
'deprecated' => false,
'alternative' => null,
- ), $options);
+ ], $options);
}
public function getName()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php
index a6aa7ca7..fbe06b99 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleFunction.php
@@ -21,13 +21,13 @@ class Twig_SimpleFunction
protected $name;
protected $callable;
protected $options;
- protected $arguments = array();
+ protected $arguments = [];
- public function __construct($name, $callable, array $options = array())
+ public function __construct($name, $callable, array $options = [])
{
$this->name = $name;
$this->callable = $callable;
- $this->options = array_merge(array(
+ $this->options = array_merge([
'needs_environment' => false,
'needs_context' => false,
'is_variadic' => false,
@@ -36,7 +36,7 @@ public function __construct($name, $callable, array $options = array())
'node_class' => 'Twig_Node_Expression_Function',
'deprecated' => false,
'alternative' => null,
- ), $options);
+ ], $options);
}
public function getName()
@@ -84,7 +84,7 @@ public function getSafe(Twig_Node $functionArgs)
return call_user_func($this->options['is_safe_callback'], $functionArgs);
}
- return array();
+ return [];
}
public function isVariadic()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php
similarity index 83%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php
index fee5778b..393fad1e 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SimpleTest.php
@@ -22,16 +22,18 @@ class Twig_SimpleTest
protected $callable;
protected $options;
- public function __construct($name, $callable, array $options = array())
+ private $arguments = [];
+
+ public function __construct($name, $callable, array $options = [])
{
$this->name = $name;
$this->callable = $callable;
- $this->options = array_merge(array(
+ $this->options = array_merge([
'is_variadic' => false,
'node_class' => 'Twig_Node_Expression_Test',
'deprecated' => false,
'alternative' => null,
- ), $options);
+ ], $options);
}
public function getName()
@@ -68,6 +70,16 @@ public function getAlternative()
{
return $this->options['alternative'];
}
+
+ public function setArguments($arguments)
+ {
+ $this->arguments = $arguments;
+ }
+
+ public function getArguments()
+ {
+ return $this->arguments;
+ }
}
class_alias('Twig_SimpleTest', 'Twig\TwigTest', false);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Source.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Source.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Source.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Source.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Template.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Template.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Template.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Template.php
index 3709232a..78a57383 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Template.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Template.php
@@ -26,13 +26,13 @@ abstract class Twig_Template implements Twig_TemplateInterface
/**
* @internal
*/
- protected static $cache = array();
+ protected static $cache = [];
protected $parent;
- protected $parents = array();
+ protected $parents = [];
protected $env;
- protected $blocks = array();
- protected $traits = array();
+ protected $blocks = [];
+ protected $traits = [];
public function __construct(Twig_Environment $env)
{
@@ -63,7 +63,7 @@ abstract public function getTemplateName();
*/
public function getDebugInfo()
{
- return array();
+ return [];
}
/**
@@ -108,7 +108,7 @@ public function getEnvironment()
*
* @param array $context
*
- * @return Twig_TemplateInterface|false The parent template or false if there is no parent
+ * @return Twig_TemplateInterface|Twig_TemplateWrapper|false The parent template or false if there is no parent
*
* @internal
*/
@@ -125,8 +125,8 @@ public function getParent(array $context)
return false;
}
- if ($parent instanceof self) {
- return $this->parents[$parent->getTemplateName()] = $parent;
+ if ($parent instanceof self || $parent instanceof Twig_TemplateWrapper) {
+ return $this->parents[$parent->getSourceContext()->getName()] = $parent;
}
if (!isset($this->parents[$parent])) {
@@ -164,7 +164,7 @@ public function isTraitable()
*
* @internal
*/
- public function displayParentBlock($name, array $context, array $blocks = array())
+ public function displayParentBlock($name, array $context, array $blocks = [])
{
$name = (string) $name;
@@ -190,7 +190,7 @@ public function displayParentBlock($name, array $context, array $blocks = array(
*
* @internal
*/
- public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
+ public function displayBlock($name, array $context, array $blocks = [], $useBlocks = true)
{
$name = (string) $name;
@@ -250,7 +250,7 @@ public function displayBlock($name, array $context, array $blocks = array(), $us
*
* @internal
*/
- public function renderParentBlock($name, array $context, array $blocks = array())
+ public function renderParentBlock($name, array $context, array $blocks = [])
{
ob_start();
$this->displayParentBlock($name, $context, $blocks);
@@ -273,7 +273,7 @@ public function renderParentBlock($name, array $context, array $blocks = array()
*
* @internal
*/
- public function renderBlock($name, array $context, array $blocks = array(), $useBlocks = true)
+ public function renderBlock($name, array $context, array $blocks = [], $useBlocks = true)
{
ob_start();
$this->displayBlock($name, $context, $blocks, $useBlocks);
@@ -295,7 +295,7 @@ public function renderBlock($name, array $context, array $blocks = array(), $use
*
* @internal
*/
- public function hasBlock($name, array $context = null, array $blocks = array())
+ public function hasBlock($name, array $context = null, array $blocks = [])
{
if (null === $context) {
@trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
@@ -331,7 +331,7 @@ public function hasBlock($name, array $context = null, array $blocks = array())
*
* @internal
*/
- public function getBlockNames(array $context = null, array $blocks = array())
+ public function getBlockNames(array $context = null, array $blocks = [])
{
if (null === $context) {
@trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
@@ -355,11 +355,7 @@ protected function loadTemplate($template, $templateName = null, $line = null, $
return $this->env->resolveTemplate($template);
}
- if ($template instanceof self) {
- return $template;
- }
-
- if ($template instanceof Twig_TemplateWrapper) {
+ if ($template instanceof self || $template instanceof Twig_TemplateWrapper) {
return $template;
}
@@ -398,7 +394,7 @@ public function getBlocks()
return $this->blocks;
}
- public function display(array $context, array $blocks = array())
+ public function display(array $context, array $blocks = [])
{
$this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
}
@@ -426,7 +422,7 @@ public function render(array $context)
return ob_get_clean();
}
- protected function displayWithErrorHandling(array $context, array $blocks = array())
+ protected function displayWithErrorHandling(array $context, array $blocks = [])
{
try {
$this->doDisplay($context, $blocks);
@@ -454,7 +450,7 @@ protected function displayWithErrorHandling(array $context, array $blocks = arra
* @param array $context An array of parameters to pass to the template
* @param array $blocks An array of blocks to pass to the template
*/
- abstract protected function doDisplay(array $context, array $blocks = array());
+ abstract protected function doDisplay(array $context, array $blocks = []);
/**
* Returns a variable from the context.
@@ -506,13 +502,13 @@ final protected function getContext($context, $item, $ignoreStrictCheck = false)
*
* @internal
*/
- protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
+ protected function getAttribute($object, $item, array $arguments = [], $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
{
// array
if (self::METHOD_CALL !== $type) {
$arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
- if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
+ if (((is_array($object) || $object instanceof ArrayObject) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
|| ($object instanceof ArrayAccess && isset($object[$arrayItem]))
) {
if ($isDefinedTest) {
@@ -599,7 +595,7 @@ protected function getAttribute($object, $item, array $arguments = array(), $typ
// get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
if ($object instanceof self) {
$ref = new ReflectionClass($class);
- $methods = array();
+ $methods = [];
foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
// Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
@@ -613,7 +609,7 @@ protected function getAttribute($object, $item, array $arguments = array(), $typ
// sort values to have consistent behavior, so that "get" methods win precedence over "is" methods
sort($methods);
- $cache = array();
+ $cache = [];
foreach ($methods as $method) {
$cache[$method] = $method;
@@ -676,7 +672,7 @@ protected function getAttribute($object, $item, array $arguments = array(), $typ
if (!$arguments) {
$ret = $object->$method();
} else {
- $ret = call_user_func_array(array($object, $method), $arguments);
+ $ret = call_user_func_array([$object, $method], $arguments);
}
} catch (BadMethodCallException $e) {
if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php
index 457ef7d7..4ab9c570 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateInterface.php
@@ -37,7 +37,7 @@ public function render(array $context);
* @param array $context An array of parameters to pass to the template
* @param array $blocks An array of blocks to pass to the template
*/
- public function display(array $context, array $blocks = array());
+ public function display(array $context, array $blocks = []);
/**
* Returns the bound environment for this template.
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php
similarity index 79%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php
index 497f6e98..430e91c5 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TemplateWrapper.php
@@ -38,9 +38,11 @@ public function __construct(Twig_Environment $env, Twig_Template $template)
*
* @return string The rendered template
*/
- public function render($context = array())
+ public function render($context = [])
{
- return $this->template->render($context);
+ // using func_get_args() allows to not expose the blocks argument
+ // as it should only be used by internal code
+ return $this->template->render($context, func_num_args() > 1 ? func_get_arg(1) : []);
}
/**
@@ -48,9 +50,11 @@ public function render($context = array())
*
* @param array $context An array of parameters to pass to the template
*/
- public function display($context = array())
+ public function display($context = [])
{
- $this->template->display($context);
+ // using func_get_args() allows to not expose the blocks argument
+ // as it should only be used by internal code
+ $this->template->display($context, func_num_args() >= 1 ? func_get_arg(1) : []);
}
/**
@@ -61,7 +65,7 @@ public function display($context = array())
*
* @return bool
*/
- public function hasBlock($name, $context = array())
+ public function hasBlock($name, $context = [])
{
return $this->template->hasBlock($name, $context);
}
@@ -73,7 +77,7 @@ public function hasBlock($name, $context = array())
*
* @return string[] An array of defined template block names
*/
- public function getBlockNames($context = array())
+ public function getBlockNames($context = [])
{
return $this->template->getBlockNames($context);
}
@@ -86,7 +90,7 @@ public function getBlockNames($context = array())
*
* @return string The rendered block
*/
- public function renderBlock($name, $context = array())
+ public function renderBlock($name, $context = [])
{
$context = $this->env->mergeGlobals($context);
$level = ob_get_level();
@@ -116,7 +120,7 @@ public function renderBlock($name, $context = array())
* @param string $name The block name to render
* @param array $context An array of parameters to pass to the template
*/
- public function displayBlock($name, $context = array())
+ public function displayBlock($name, $context = [])
{
$this->template->displayBlock($name, $this->env->mergeGlobals($context));
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test.php
similarity index 82%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test.php
index b450ec62..53966442 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test.php
@@ -21,13 +21,13 @@
abstract class Twig_Test implements Twig_TestInterface, Twig_TestCallableInterface
{
protected $options;
- protected $arguments = array();
+ protected $arguments = [];
- public function __construct(array $options = array())
+ public function __construct(array $options = [])
{
- $this->options = array_merge(array(
+ $this->options = array_merge([
'callable' => null,
- ), $options);
+ ], $options);
}
public function getCallable()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php
index 9e83c3f8..f34fb053 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Function.php
@@ -22,7 +22,7 @@ class Twig_Test_Function extends Twig_Test
{
protected $function;
- public function __construct($function, array $options = array())
+ public function __construct($function, array $options = [])
{
$options['callable'] = $function;
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
similarity index 89%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
index 382a3f2a..31db139c 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
@@ -29,7 +29,7 @@ abstract protected function getFixturesDir();
*/
protected function getRuntimeLoaders()
{
- return array();
+ return [];
}
/**
@@ -37,7 +37,7 @@ protected function getRuntimeLoaders()
*/
protected function getExtensions()
{
- return array();
+ return [];
}
/**
@@ -45,7 +45,7 @@ protected function getExtensions()
*/
protected function getTwigFilters()
{
- return array();
+ return [];
}
/**
@@ -53,7 +53,7 @@ protected function getTwigFilters()
*/
protected function getTwigFunctions()
{
- return array();
+ return [];
}
/**
@@ -61,7 +61,7 @@ protected function getTwigFunctions()
*/
protected function getTwigTests()
{
- return array();
+ return [];
}
/**
@@ -84,7 +84,7 @@ public function testLegacyIntegration($file, $message, $condition, $templates, $
public function getTests($name, $legacyTests = false)
{
$fixturesDir = realpath($this->getFixturesDir());
- $tests = array();
+ $tests = [];
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($fixturesDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
if (!preg_match('/\.test$/', $file)) {
@@ -102,7 +102,7 @@ public function getTests($name, $legacyTests = false)
$condition = $match[2];
$templates = self::parseTemplates($match[3]);
$exception = $match[5];
- $outputs = array(array(null, $match[4], null, ''));
+ $outputs = [[null, $match[4], null, '']];
} elseif (preg_match('/--TEST--\s*(.*?)\s*(?:--CONDITION--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)--DATA--.*?--EXPECT--.*/s', $test, $match)) {
$message = $match[1];
$condition = $match[2];
@@ -113,12 +113,12 @@ public function getTests($name, $legacyTests = false)
throw new InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
}
- $tests[] = array(str_replace($fixturesDir.'/', '', $file), $message, $condition, $templates, $exception, $outputs);
+ $tests[] = [str_replace($fixturesDir.'/', '', $file), $message, $condition, $templates, $exception, $outputs];
}
if ($legacyTests && empty($tests)) {
// add a dummy test to avoid a PHPUnit message
- return array(array('not', '-', '', array(), '', array()));
+ return [['not', '-', '', [], '', []]];
}
return $tests;
@@ -145,10 +145,10 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
$loader = new Twig_Loader_Array($templates);
foreach ($outputs as $i => $match) {
- $config = array_merge(array(
+ $config = array_merge([
'cache' => false,
'strict_variables' => true,
- ), $match[2] ? eval($match[2].';') : array());
+ ], $match[2] ? eval($match[2].';') : []);
$twig = new Twig_Environment($loader, $config);
$twig->addGlobal('global', 'global');
foreach ($this->getRuntimeLoaders() as $runtimeLoader) {
@@ -171,13 +171,9 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
$twig->addFunction($function);
}
- // avoid using the same PHP class name for different cases
- // only for PHP 5.2+
- if (PHP_VERSION_ID >= 50300) {
- $p = new ReflectionProperty($twig, 'templateClassPrefix');
- $p->setAccessible(true);
- $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
- }
+ $p = new ReflectionProperty($twig, 'templateClassPrefix');
+ $p->setAccessible(true);
+ $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
try {
$template = $twig->loadTemplate('index.twig');
@@ -236,7 +232,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
protected static function parseTemplates($test)
{
- $templates = array();
+ $templates = [];
preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
$templates[($match[1] ? $match[1] : 'index.twig')] = $match[2];
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php
similarity index 90%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php
index feccd5db..6949bb23 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Method.php
@@ -23,9 +23,9 @@ class Twig_Test_Method extends Twig_Test
protected $extension;
protected $method;
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
+ public function __construct(Twig_ExtensionInterface $extension, $method, array $options = [])
{
- $options['callable'] = array($extension, $method);
+ $options['callable'] = [$extension, $method];
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php
index 6098a527..6b5de159 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/Node.php
@@ -22,7 +22,7 @@ class Twig_Test_Node extends Twig_Test
{
protected $class;
- public function __construct($class, array $options = array())
+ public function __construct($class, array $options = [])
{
parent::__construct($options);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
index 47942675..a20fbbac 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
@@ -42,7 +42,7 @@ protected function getCompiler(Twig_Environment $environment = null)
protected function getEnvironment()
{
- return new Twig_Environment(new Twig_Loader_Array(array()));
+ return new Twig_Environment(new Twig_Loader_Array([]));
}
protected function getVariableGetter($name, $line = false)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TestCallableInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TestCallableInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TestCallableInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TestInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TestInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TestInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TestInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Token.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Token.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Token.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Token.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
index a20dedd1..0a3ba099 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
@@ -63,7 +63,7 @@ public function parse(Twig_Token $token)
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag());
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php
index f30f86b5..2f833157 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Block.php
@@ -32,12 +32,12 @@ public function parse(Twig_Token $token)
if ($this->parser->hasBlock($name)) {
throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
- $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
+ $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node([]), $lineno));
$this->parser->pushLocalScope();
$this->parser->pushBlockStack($name);
if ($stream->nextIf(Twig_Token::BLOCK_END_TYPE)) {
- $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
$value = $token->getValue();
@@ -46,9 +46,9 @@ public function parse(Twig_Token $token)
}
}
} else {
- $body = new Twig_Node(array(
+ $body = new Twig_Node([
new Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno),
- ));
+ ]);
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Deprecated.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Deprecated.php
new file mode 100644
index 00000000..be5d5496
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Deprecated.php
@@ -0,0 +1,42 @@
+
+ * {% deprecated 'The "base.twig" template is deprecated, use "layout.twig" instead.' %}
+ *
+ * {% extends 'layout.html.twig' %}
+ *
+ *
+ * @author Yonel Ceruto
+ *
+ * @final
+ */
+class Twig_TokenParser_Deprecated extends Twig_TokenParser
+{
+ public function parse(Twig_Token $token)
+ {
+ $expr = $this->parser->getExpressionParser()->parseExpression();
+
+ $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+
+ return new Twig_Node_Deprecated($expr, $token->getLine(), $this->getTag());
+ }
+
+ public function getTag()
+ {
+ return 'deprecated';
+ }
+}
+
+class_alias('Twig_TokenParser_Deprecated', 'Twig\TokenParser\DeprecatedTokenParser', false);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Do.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Do.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Do.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Do.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
index 44644cc6..62ad9170 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
@@ -32,14 +32,14 @@ public function parse(Twig_Token $token)
}
// inject a fake parent to make the parent() function work
- $stream->injectTokens(array(
+ $stream->injectTokens([
new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', $token->getLine()),
new Twig_Token(Twig_Token::NAME_TYPE, 'extends', $token->getLine()),
$parentToken,
new Twig_Token(Twig_Token::BLOCK_END_TYPE, '', $token->getLine()),
- ));
+ ]);
- $module = $this->parser->parse($stream, array($this, 'decideBlockEnd'), true);
+ $module = $this->parser->parse($stream, [$this, 'decideBlockEnd'], true);
// override the parent with the correct one
if ($fakeParentToken === $parentToken) {
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Extends.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
index 76017829..e956d04b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
@@ -30,7 +30,7 @@ public function parse(Twig_Token $token)
$filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
$block = new Twig_Node_Block($name, $body, $token->getLine());
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Flush.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php
index 8e737c5f..fecf58b1 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/For.php
@@ -39,10 +39,10 @@ public function parse(Twig_Token $token)
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideForFork'));
+ $body = $this->parser->subparse([$this, 'decideForFork']);
if ('else' == $stream->next()->getValue()) {
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $else = $this->parser->subparse(array($this, 'decideForEnd'), true);
+ $else = $this->parser->subparse([$this, 'decideForEnd'], true);
} else {
$else = null;
}
@@ -69,7 +69,7 @@ public function parse(Twig_Token $token)
public function decideForFork(Twig_Token $token)
{
- return $token->test(array('else', 'endfor'));
+ return $token->test(['else', 'endfor']);
}
public function decideForEnd(Twig_Token $token)
@@ -99,7 +99,7 @@ protected function checkLoopUsageBody(Twig_TokenStream $stream, Twig_NodeInterfa
{
if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
$attribute = $node->getNode('attribute');
- if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {
+ if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), ['length', 'revindex0', 'revindex', 'last'])) {
throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getTemplateLine(), $stream->getSourceContext());
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php
similarity index 98%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php
index f3053da4..234301b0 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/From.php
@@ -26,7 +26,7 @@ public function parse(Twig_Token $token)
$stream = $this->parser->getStream();
$stream->expect('import');
- $targets = array();
+ $targets = [];
do {
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php
similarity index 84%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php
index f081df3a..ba48e27f 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/If.php
@@ -33,8 +33,8 @@ public function parse(Twig_Token $token)
$expr = $this->parser->getExpressionParser()->parseExpression();
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideIfFork'));
- $tests = array($expr, $body);
+ $body = $this->parser->subparse([$this, 'decideIfFork']);
+ $tests = [$expr, $body];
$else = null;
$end = false;
@@ -42,13 +42,13 @@ public function parse(Twig_Token $token)
switch ($stream->next()->getValue()) {
case 'else':
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $else = $this->parser->subparse(array($this, 'decideIfEnd'));
+ $else = $this->parser->subparse([$this, 'decideIfEnd']);
break;
case 'elseif':
$expr = $this->parser->getExpressionParser()->parseExpression();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideIfFork'));
+ $body = $this->parser->subparse([$this, 'decideIfFork']);
$tests[] = $expr;
$tests[] = $body;
break;
@@ -69,12 +69,12 @@ public function parse(Twig_Token $token)
public function decideIfFork(Twig_Token $token)
{
- return $token->test(array('elseif', 'else', 'endif'));
+ return $token->test(['elseif', 'else', 'endif']);
}
public function decideIfEnd(Twig_Token $token)
{
- return $token->test(array('endif'));
+ return $token->test(['endif']);
}
public function getTag()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Import.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Import.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Import.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Import.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php
similarity index 96%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php
index 309f11db..483f1078 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Include.php
@@ -53,7 +53,7 @@ protected function parseArguments()
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- return array($variables, $only, $ignoreMissing);
+ return [$variables, $only, $ignoreMissing];
}
public function getTag()
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
similarity index 91%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
index 4287934b..fa55a7c2 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
@@ -32,7 +32,7 @@ public function parse(Twig_Token $token)
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$this->parser->pushLocalScope();
- $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
$value = $token->getValue();
@@ -43,7 +43,7 @@ public function parse(Twig_Token $token)
$this->parser->popLocalScope();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body(array($body)), $arguments, $lineno, $this->getTag()));
+ $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body([$body]), $arguments, $lineno, $this->getTag()));
}
public function decideBlockEnd(Twig_Token $token)
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
index 7fc70d9a..5161458a 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
@@ -28,7 +28,7 @@ public function parse(Twig_Token $token)
{
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
// in a sandbox tag, only include tags are allowed
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php
similarity index 95%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php
index 48c6b3ae..a6929478 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Set.php
@@ -54,7 +54,7 @@ public function parse(Twig_Token $token)
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $values = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $values = $this->parser->subparse([$this, 'decideBlockEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
index cecf27c6..934717ce 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
@@ -31,7 +31,7 @@ public function parse(Twig_Token $token)
$lineno = $token->getLine();
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideSpacelessEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideSpacelessEnd'], true);
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_Spaceless($body, $lineno, $this->getTag());
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php
similarity index 92%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php
index 1ab24e2c..fc4471f6 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/Use.php
@@ -36,7 +36,7 @@ public function parse(Twig_Token $token)
throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
- $targets = array();
+ $targets = [];
if ($stream->nextIf('with')) {
do {
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
@@ -56,7 +56,7 @@ public function parse(Twig_Token $token)
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
+ $this->parser->addTrait(new Twig_Node(['template' => $template, 'targets' => new Twig_Node($targets)]));
return new Twig_Node();
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php
index 7a692597..34a08122 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParser/With.php
@@ -31,7 +31,7 @@ public function parse(Twig_Token $token)
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $body = $this->parser->subparse(array($this, 'decideWithEnd'), true);
+ $body = $this->parser->subparse([$this, 'decideWithEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php
index 0d7d6e52..c90a3c6b 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBroker.php
@@ -20,15 +20,15 @@
class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
{
protected $parser;
- protected $parsers = array();
- protected $brokers = array();
+ protected $parsers = [];
+ protected $brokers = [];
/**
* @param array|Traversable $parsers A Traversable of Twig_TokenParserInterface instances
* @param array|Traversable $brokers A Traversable of Twig_TokenParserBrokerInterface instances
* @param bool $triggerDeprecationError
*/
- public function __construct($parsers = array(), $brokers = array(), $triggerDeprecationError = true)
+ public function __construct($parsers = [], $brokers = [], $triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
@trigger_error('The '.__CLASS__.' class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
@@ -80,7 +80,7 @@ public function removeTokenParserBroker(self $broker)
*
* @param string $tag A tag name
*
- * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
+ * @return Twig_TokenParserInterface|null A Twig_TokenParserInterface or null if no suitable TokenParser was found
*/
public function getTokenParser($tag)
{
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
similarity index 94%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
index 6c93f5ea..c239c2ec 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
@@ -38,7 +38,7 @@ public function setParser(Twig_ParserInterface $parser);
/**
* Gets the Twig_ParserInterface.
*
- * @return null|Twig_ParserInterface A Twig_ParserInterface instance or null
+ * @return Twig_ParserInterface|null A Twig_ParserInterface instance or null
*/
public function getParser();
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenParserInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenParserInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenStream.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenStream.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/TokenStream.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/TokenStream.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
similarity index 93%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
index c7bf53be..b6cccf24 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
@@ -52,9 +52,9 @@ public function collectDir($dir, $ext = '.twig')
*/
public function collect(Traversable $iterator)
{
- $this->deprecations = array();
+ $this->deprecations = [];
- set_error_handler(array($this, 'errorHandler'));
+ set_error_handler([$this, 'errorHandler']);
foreach ($iterator as $name => $contents) {
try {
@@ -67,7 +67,7 @@ public function collect(Traversable $iterator)
restore_error_handler();
$deprecations = $this->deprecations;
- $this->deprecations = array();
+ $this->deprecations = [];
return $deprecations;
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/phpunit.xml.dist b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/phpunit.xml.dist
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/phpunit.xml.dist
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/phpunit.xml.dist
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/CacheInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/CacheInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/CacheInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/CacheInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/FilesystemCache.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/FilesystemCache.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/FilesystemCache.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/FilesystemCache.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/NullCache.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/NullCache.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Cache/NullCache.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Cache/NullCache.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Compiler.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Compiler.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Compiler.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Compiler.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Environment.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Environment.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Environment.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Environment.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/Error.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/Error.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/Error.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/Error.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/LoaderError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/LoaderError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/LoaderError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/LoaderError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/RuntimeError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/RuntimeError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/RuntimeError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/RuntimeError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/SyntaxError.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/SyntaxError.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Error/SyntaxError.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Error/SyntaxError.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/ExpressionParser.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/ExpressionParser.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/ExpressionParser.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/ExpressionParser.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/AbstractExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/AbstractExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/AbstractExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/AbstractExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/CoreExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/CoreExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/CoreExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/CoreExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/DebugExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/DebugExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/DebugExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/DebugExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/EscaperExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/EscaperExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/EscaperExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/EscaperExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/ExtensionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/ExtensionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/ExtensionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/ExtensionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php
similarity index 60%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php
index 024f314d..c170068a 100644
--- a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/GlobalsInterface.php
@@ -5,7 +5,7 @@
class_exists('Twig_Extension_GlobalsInterface');
if (\false) {
- interface GlobalsInterface extends \Twig_Extension_ExtensionInterface
+ interface GlobalsInterface extends \Twig_Extension_GlobalsInterface
{
}
}
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/InitRuntimeInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/InitRuntimeInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/InitRuntimeInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/InitRuntimeInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/OptimizerExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/OptimizerExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/OptimizerExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/OptimizerExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/ProfilerExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/ProfilerExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/ProfilerExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/ProfilerExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/SandboxExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/SandboxExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/SandboxExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/SandboxExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/StagingExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/StagingExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/StagingExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/StagingExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/StringLoaderExtension.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/StringLoaderExtension.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Extension/StringLoaderExtension.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Extension/StringLoaderExtension.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/FileExtensionEscapingStrategy.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/FileExtensionEscapingStrategy.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/FileExtensionEscapingStrategy.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/FileExtensionEscapingStrategy.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Lexer.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Lexer.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Lexer.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Lexer.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ArrayLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ArrayLoader.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ArrayLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ArrayLoader.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ChainLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ChainLoader.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ChainLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ChainLoader.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/ExistsLoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/FilesystemLoader.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/FilesystemLoader.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/FilesystemLoader.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/FilesystemLoader.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/LoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/LoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/LoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/LoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Markup.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Markup.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Markup.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Markup.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/AutoEscapeNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/AutoEscapeNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/AutoEscapeNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/AutoEscapeNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BlockNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BlockNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BlockNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BlockNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BlockReferenceNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BlockReferenceNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BlockReferenceNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BlockReferenceNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BodyNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BodyNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/BodyNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/BodyNode.php
diff --git a/Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/CheckSecurityNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/CheckSecurityNode.php
similarity index 100%
rename from Vendor/phpMyAdmin-4.8.4-all-languages/vendor/twig/twig/src/Node/CheckSecurityNode.php
rename to Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/CheckSecurityNode.php
diff --git a/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/DeprecatedNode.php b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/DeprecatedNode.php
new file mode 100644
index 00000000..0c0e1b0a
--- /dev/null
+++ b/Vendor/phpMyAdmin-4.8.5-all-languages/vendor/twig/twig/src/Node/DeprecatedNode.php
@@ -0,0 +1,11 @@
+