- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
-
- {% endif %}
- {% endfor %}
+ {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %}
+ {% block inner_markup_field_open %}
- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
-
- {% endif %}
- {% endfor %}
+ {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %}
+ {% block inner_markup_field_open %}
- {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|tu }}
+ {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|t }}
{% include 'partials/messages.html.twig' %}
diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig
index e079e479..74b1ce87 100644
--- a/themes/grav/templates/themes.html.twig
+++ b/themes/grav/templates/themes.html.twig
@@ -4,7 +4,7 @@
{% set installing = admin.route starts with 'install' %}
{% if installing %}
- {% set title = "PLUGIN_ADMIN.THEMES"|tu %}
+ {% set title = "PLUGIN_ADMIN.THEMES"|t %}
{% else %}
{% set installed = true %}
@@ -18,10 +18,10 @@
{% set theme = package.toArray() %}
{% set state = config.get('system.pages.theme') == theme.slug ? 'active' : 'inactive' %}
- {% set title = "PLUGIN_ADMIN.THEME"|tu ~ ": " ~ theme.name|e %}
+ {% set title = "PLUGIN_ADMIN.THEME"|t ~ ": " ~ theme.name %}
{% endif %}
{% else %}
- {% set title = "PLUGIN_ADMIN.THEMES"|tu %}
+ {% set title = "PLUGIN_ADMIN.THEMES"|t %}
{% endif %}
{% if admin.route or installing %}
@@ -39,30 +39,30 @@
{% if not admin.route or installing %}
-
{{ "PLUGIN_ADMIN.THEMES"|tu }}
+
{{ "PLUGIN_ADMIN.THEMES"|t }}
{% else %}
{% if (installed) %}
{% else %}
{% endif %}
-
{{ "PLUGIN_ADMIN.THEME"|tu }}: {{ theme.name|e }}
+
{{ "PLUGIN_ADMIN.THEME"|t }}: {{ theme.name }}
{% endif %}
{% endblock %}
diff --git a/themes/grav/templates/tools.html.twig b/themes/grav/templates/tools.html.twig
index 383c1eca..7706707a 100644
--- a/themes/grav/templates/tools.html.twig
+++ b/themes/grav/templates/tools.html.twig
@@ -1,8 +1,8 @@
{% extends 'partials/base.html.twig' %}
-{% set tools_slug = uri.basename|e %}
+{% set tools_slug = uri.basename %}
{% if tools_slug == 'tools' %}{% set tools_slug = 'backups' %}{% endif %}
-{% set title = "PLUGIN_ADMIN.TOOLS"|tu ~ ": " ~ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|tu %}
+{% set title = "PLUGIN_ADMIN.TOOLS"|t ~ ": " ~ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|t %}
{% set tools = admin.tools() %}
{% set titlebar -%}
@@ -14,9 +14,9 @@
{{ titlebar }}
{% else %}
-
{{ "PLUGIN_ADMIN.TOOLS"|tu }} - {{ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|tu }}
+
{{ "PLUGIN_ADMIN.TOOLS"|t }} - {{ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|t }}
{% endif %}
{% endblock %}
@@ -29,7 +29,7 @@
{% set name = tool|last %}
{% if authorize(perms) %}
- {{ name|tu|capitalize }}
+ {{ name|t|capitalize }}
{% endif %}
{% endfor %}
diff --git a/themes/grav/templates/user.html.twig b/themes/grav/templates/user.html.twig
index fd6de897..7cb5aae1 100644
--- a/themes/grav/templates/user.html.twig
+++ b/themes/grav/templates/user.html.twig
@@ -2,32 +2,32 @@
{% if admin.route %}
{% set user = admin.data('users/' ~ admin.route) %}
- {% set title = "PLUGIN_ADMIN.USER"|tu ~ ": " ~ admin.route|e %}
+ {% set title = "PLUGIN_ADMIN.USER"|t ~ ": " ~ admin.route|e %}
{% else %}
- {% set title = "PLUGIN_ADMIN_PRO.USERS"|tu %}
+ {% set title = "PLUGIN_ADMIN_PRO.USERS"|t %}
{% endif %}
{% block titlebar %}
{% if not admin.route %}
{% if authorize(['admin.users', 'admin.super']) %}
-
{{ "PLUGIN_ADMIN.USERS"|tu }}
+
{{ "PLUGIN_ADMIN.USERS"|t }}
{% else %}
-
{{ "PLUGIN_ADMIN.ACCESS_DENIED"|tu }}
+
{{ "PLUGIN_ADMIN.ACCESS_DENIED"|t }}
{% endif %}
{% else %}
{% if authorize(['admin.users', 'admin.super']) or grav.user.username == user.username %}
-
{{ "PLUGIN_ADMIN.USER"|tu }}: {{ user.username|e }}
+
{{ "PLUGIN_ADMIN.USER"|t }}: {{ user.username }}
{% else %}
-
{{ "PLUGIN_ADMIN.ACCESS_DENIED"|tu }}
+
{{ "PLUGIN_ADMIN.ACCESS_DENIED"|t }}
{% endif %}
{% endif %}
{% endblock %}
@@ -48,14 +48,14 @@
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 047b6ce9..73722434 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ private static $installed = array (
'aliases' =>
array (
),
- 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
+ 'reference' => '315e35fa69d28436e276274382262866360c64e9',
'name' => 'getgrav/grav-plugin-admin',
),
'versions' =>
@@ -41,7 +41,7 @@ private static $installed = array (
'aliases' =>
array (
),
- 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
+ 'reference' => '315e35fa69d28436e276274382262866360c64e9',
),
'laminas/laminas-xml' =>
array (
@@ -54,12 +54,12 @@ private static $installed = array (
),
'laminas/laminas-zendframework-bridge' =>
array (
- 'pretty_version' => '1.2.0',
- 'version' => '1.2.0.0',
+ 'pretty_version' => '1.3.0',
+ 'version' => '1.3.0.0',
'aliases' =>
array (
),
- 'reference' => '6cccbddfcfc742eb02158d6137ca5687d92cee32',
+ 'reference' => '13af2502d9bb6f7d33be2de4b51fb68c6cdb476e',
),
'miniflux/picofeed' =>
array (
@@ -79,12 +79,12 @@ private static $installed = array (
),
'scssphp/scssphp' =>
array (
- 'pretty_version' => 'v1.5.2',
- 'version' => '1.5.2.0',
+ 'pretty_version' => 'v1.6.0',
+ 'version' => '1.6.0.0',
'aliases' =>
array (
),
- 'reference' => '6fe16f169f55f5e793474fb210aac0a4481619e5',
+ 'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530',
),
'symfony/polyfill-php72' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 19869b38..192445ea 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -63,17 +63,17 @@
},
{
"name": "laminas/laminas-zendframework-bridge",
- "version": "1.2.0",
- "version_normalized": "1.2.0.0",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
- "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32"
+ "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32",
- "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
+ "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
"shasum": ""
},
"require": {
@@ -85,7 +85,7 @@
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.6"
},
- "time": "2021-02-25T21:54:58+00:00",
+ "time": "2021-06-24T12:49:22+00:00",
"type": "library",
"extra": {
"laminas": {
@@ -191,17 +191,17 @@
},
{
"name": "scssphp/scssphp",
- "version": "v1.5.2",
- "version_normalized": "1.5.2.0",
+ "version": "v1.6.0",
+ "version_normalized": "1.6.0.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
- "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5"
+ "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scssphp/scssphp/zipball/6fe16f169f55f5e793474fb210aac0a4481619e5",
- "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5",
+ "url": "https://api.github.com/repos/scssphp/scssphp/zipball/b83594e2323c5d6e80785df3f91b9d1d32aad530",
+ "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530",
"shasum": ""
},
"require": {
@@ -223,7 +223,7 @@
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
- "time": "2021-05-18T00:05:58+00:00",
+ "time": "2021-07-02T16:28:10+00:00",
"bin": [
"bin/pscss"
],
@@ -261,7 +261,7 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
- "source": "https://github.com/scssphp/scssphp/tree/v1.5.2"
+ "source": "https://github.com/scssphp/scssphp/tree/v1.6.0"
},
"install-path": "../scssphp/scssphp"
}
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index ac886b5e..0300f07c 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
+ 'reference' => '315e35fa69d28436e276274382262866360c64e9',
'name' => 'getgrav/grav-plugin-admin',
),
'versions' =>
@@ -18,7 +18,7 @@
'aliases' =>
array (
),
- 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
+ 'reference' => '315e35fa69d28436e276274382262866360c64e9',
),
'laminas/laminas-xml' =>
array (
@@ -31,12 +31,12 @@
),
'laminas/laminas-zendframework-bridge' =>
array (
- 'pretty_version' => '1.2.0',
- 'version' => '1.2.0.0',
+ 'pretty_version' => '1.3.0',
+ 'version' => '1.3.0.0',
'aliases' =>
array (
),
- 'reference' => '6cccbddfcfc742eb02158d6137ca5687d92cee32',
+ 'reference' => '13af2502d9bb6f7d33be2de4b51fb68c6cdb476e',
),
'miniflux/picofeed' =>
array (
@@ -56,12 +56,12 @@
),
'scssphp/scssphp' =>
array (
- 'pretty_version' => 'v1.5.2',
- 'version' => '1.5.2.0',
+ 'pretty_version' => 'v1.6.0',
+ 'version' => '1.6.0.0',
'aliases' =>
array (
),
- 'reference' => '6fe16f169f55f5e793474fb210aac0a4481619e5',
+ 'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530',
),
'symfony/polyfill-php72' =>
array (
diff --git a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
index 626f7c2c..646828a6 100644
--- a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
+++ b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
@@ -2,6 +2,28 @@
All notable changes to this project will be documented in this file, in reverse chronological order by release.
+## 1.2.1 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
## 1.2.0 - 2021-02-25
@@ -115,7 +137,7 @@ Feature release (minor)
### Fixed
-- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuraiton post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio.
+- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuration post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio.
- [#61](https://github.com/laminas/laminas-zendframework-bridge/pull/61) ensures configuration for delegator factories gets rewritten; the functionality broke in version 1.0.1.
@@ -709,4 +731,4 @@ Feature release (minor)
### Fixed
-- Nothing.
+- Nothing.
\ No newline at end of file
diff --git a/vendor/laminas/laminas-zendframework-bridge/README.md b/vendor/laminas/laminas-zendframework-bridge/README.md
index f8e068e6..a8d8526f 100644
--- a/vendor/laminas/laminas-zendframework-bridge/README.md
+++ b/vendor/laminas/laminas-zendframework-bridge/README.md
@@ -10,6 +10,12 @@ Project.
This package should be installed only if you are also using the composer plugin
that installs Laminas packages to replace ZF/Apigility/Expressive packages.
+This tool supports:
+
+* Zend Framework MVC projects, all v2 and v3 releases
+* Apigility projects, all stable versions
+* Expressive versions, all stable versions
+
## Installation
Run the following to install this library:
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
index 6048766a..261bb888 100644
--- a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
+++ b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
@@ -1,11 +1,5 @@
replacementRuleMatch($value, $keys);
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Module.php b/vendor/laminas/laminas-zendframework-bridge/src/Module.php
index d10cb43d..9bb12980 100644
--- a/vendor/laminas/laminas-zendframework-bridge/src/Module.php
+++ b/vendor/laminas/laminas-zendframework-bridge/src/Module.php
@@ -1,11 +1,5 @@
multiplySelectors($this->env, $child['selfParent']);
}
+ if (\count($result) > 1) {
+ $replacement = implode(', ', $result);
+ $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
+ $line = $this->sourceLine;
+
+ $message = <<
logger->warn($message);
+ }
+
$this->pushExtends($result, $selectors, $child);
}
}
diff --git a/vendor/scssphp/scssphp/src/Parser.php b/vendor/scssphp/scssphp/src/Parser.php
index bb5d6b30..ab54885e 100644
--- a/vendor/scssphp/scssphp/src/Parser.php
+++ b/vendor/scssphp/scssphp/src/Parser.php
@@ -2415,10 +2415,8 @@ class Parser
break;
}
- // peek and see if rhs belongs to next operator
- if ($this->peek($operators, $next) && static::$precedence[$next[1]] > static::$precedence[$op]) {
- $rhs = $this->expHelper($rhs, static::$precedence[$next[1]]);
- }
+ // consume higher-precedence operators on the right-hand side
+ $rhs = $this->expHelper($rhs, static::$precedence[$op] + 1);
$lhs = [Type::T_EXPRESSION, $op, $lhs, $rhs, $this->inParens, $whiteBefore, $whiteAfter];
diff --git a/vendor/scssphp/scssphp/src/Version.php b/vendor/scssphp/scssphp/src/Version.php
index e8bf3bee..b103b4bf 100644
--- a/vendor/scssphp/scssphp/src/Version.php
+++ b/vendor/scssphp/scssphp/src/Version.php
@@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp;
*/
class Version
{
- const VERSION = '1.5.2';
+ const VERSION = '1.6.0';
}