prepare for beta.7 release

# Conflicts:
#	composer.json
#	composer.lock
#	system/defines.php

CHANGELOG.md

@@ -1,11 +1,118 @@
+# v1.7.0-beta.7
+## 08/30/2019
+
+1. [](#improved)
+    * Improved language support
+1. [](#bugfix)
+    * `FlexForm`: Fixed some compatibility issues with Form plugin
+
+# v1.7.0-beta.6
+## 08/29/2019
+
+1. [](#new)
+    * Added experimental support for `Flex Pages` (**Flex Objects** plugin required)
+1. [](#improved)
+    * Improved `bin/grav yamllinter` CLI command by adding an option to find YAML Linting issues from the whole site or custom folder
+    * Added support for not instantiating pages, useful to speed up tasks
+    * Greatly improved speed of loading Flex collections
+1. [](#bugfix)
+    * Fixed `$page->summary()` always striping HTML tags if the summary was set by `$page->setSummary()`
+    * Fixed `Flex->getObject()` when using Flex Key
+    * Grav 1.7: Fixed enabling PHP Debug Bar causes fatal error in Gantry [#2634](https://github.com/getgrav/grav/issues/2634)
+    * Grav 1.7: Fixed broken taxonomies [#2633](https://github.com/getgrav/grav/issues/2633)
+    * Grav 1.7: Fixed unpublished blog posts being displayed on the front-end [#2650](https://github.com/getgrav/grav/issues/2650)
+
+# v1.7.0-beta.5
+## 08/11/2019
+
+1. [](#new)
+    * Added a new `bin/grav server` CLI command to easily run Symfony or PHP built-in webservers
+    * Added `hasFlexFeature()` method to test if `FlexObject` or `FlexCollection` implements a given feature
+    * Added `getFlexFeatures()` method to return all features that `FlexObject` or `FlexCollection` implements
+    * Deprecated `FlexDirectory::update()` and `FlexDirectory::remove()`
+    * Added `FlexStorage::getMetaData()` to get updated object meta information for listed keys
+    * Added `Language::getPageExtensions()` to get full list of supported page language extensions
+    * Added `$grav->close()` method to properly terminate the request with a response
+    * Added `Pages::getCollection()` method
+1. [](#improved)
+    * Better support for Symfony local server `symfony server:start`
+    * Make `Route` objects immutable
+    * `FlexDirectory::getObject()` can now be called without any parameters to create a new object
+    * Flex objects no longer return temporary key if they do not have one; empty key is returned instead
+    * Updated vendor libraries
+    * Moved `collection()` and `evaluate()` logic from `Page` class into `Pages` class
+1. [](#bugfix)
+    * Fixed `Form` not to use deleted flash object until the end of the request fixing issues with reset
+    * Fixed `FlexForm` to allow multiple form instances with non-existing objects
+    * Fixed `FlexObject` search by using `key`
+    * Grav 1.7: Fixed clockwork messages with arrays and objects
+
+# v1.7.0-beta.4
+## 07/01/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.12 features, improvements & fixes
+    * Added new configuration option `system.debugger.censored` to hide potentially sensitive information
+    * Added new configuration option `system.languages.include_default_lang_file_extension` to keep default language in `.md` files if set to `false`
+    * Added configuration option to set fallback content languages individually for every language
+1. [](#improved)
+    * Updated Vendor libraries
+1. [](#bugfix)
+    * Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
+    * Fixed `Language::getFallbackPageExtensions()` to fall back only to default language instead of going through all languages
+    * Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
+
+# v1.7.0-beta.3
+## 06/24/2019
+
+1. [](#bugfix)
+    * Fixed Clockwork on Windows machines
+    * Fixed parent field issues on Windows machines
+    * Fixed unreliable Clockwork calls in sub-folders
+
+# v1.7.0-beta.2
+## 06/21/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.11 fixes
+1. [](#improved)
+    * Updated the Clockwork text
+    
+# v1.7.0-beta.1
+## 06/14/2019
+
+1. [](#new)
+    * Added support for [Clockwork](https://underground.works/clockwork) developer tools (now default debugger)
+    * Added support for [Tideways XHProf](https://github.com/tideways/php-xhprof-extension) PHP Extension for profiling method calls
+    * Added Twig profiling for Clockwork debugger
+    * Updated Symfony Components to 4.3
+    * Added support for Twig 2.11 (compatible with Twig 1.40+)
+    * Optimization: Initialize debugbar only after the configuration has been loaded
+    * Optimization: Combine some early Grav processors into a single one
+
+# v1.6.15
+## 08/20/2019
+
+1. [](#improved)
+    * Improved robots.txt [#2632](https://github.com/getgrav/grav/issues/2632)
+1. [](#bugfix)
+    * Fixed broken markdown Twig tag [#2635](https://github.com/getgrav/grav/issues/2635)
+    * Force Symfony 4.2 in Grav 1.6 to remove a bunch of deprecated messages
+
+# v1.6.14
+## 08/18/2019
+
+1. [](#bugfix)
+    * Actually include fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627)
+
 # v1.6.13
-## 08/12/2019
+## 08/16/2019
 
 1. [](#bugfix)
     * Regression fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627)
 
 # v1.6.12
-## 08/11/2019
+## 08/14/2019
 
 1. [](#new)
     * Added support for custom `FormFlash` save locations

bin/grav

@@ -63,5 +63,6 @@ $app->addCommands(array(
     new \Grav\Console\Cli\SecurityCommand(),
     new \Grav\Console\Cli\LogViewerCommand(),
     new \Grav\Console\Cli\YamlLinterCommand(),
+    new \Grav\Console\Cli\ServerCommand(),
 ));
 $app->run();

composer.json

@@ -24,14 +24,14 @@
         "kodus/psr7-server": "*",
         "nyholm/psr7": "^1.0",
 
-        "twig/twig": "~1.40",
+        "twig/twig": "~1.0",
         "erusev/parsedown": "1.6.4",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~4.2",
-        "symfony/console": "~4.2",
+        "symfony/console": "~4.2.0",
-        "symfony/event-dispatcher": "~4.2",
+        "symfony/event-dispatcher": "~4.2.0",
-        "symfony/var-dumper": "~4.2",
+        "symfony/var-dumper": "~4.2.0",
-        "symfony/process": "~4.2",
+        "symfony/process": "~4.2.0",
         "doctrine/cache": "^1.8",
         "doctrine/collections": "^1.5",
         "guzzlehttp/psr7": "^1.4",
@@ -50,7 +50,8 @@
         "composer/ca-bundle": "^1.0",
         "dragonmantank/cron-expression": "^1.2",
         "phive/twig-extensions-deferred": "^1.0",
-        "willdurand/negotiation": "^2.3"
+        "willdurand/negotiation": "^2.3",
+        "itsgoingd/clockwork": "~4.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.4",
@@ -77,6 +78,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/itsgoingd/clockwork"
         }
     ],
     "autoload": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f9429e7cd2e75a232f968b01a1024983",
+    "content-hash": "fe6ec382807a811a027202be339f8384",
     "packages": [
         {
             "name": "antoligy/dom-string-iterators",
@@ -286,9 +286,9 @@
             "authors": [
                 {
                     "name": "Jesse G. Donat",
+                    "role": "Developer",
                     "email": "donatj@gmail.com",
-                    "homepage": "http://donatstudios.com",
+                    "homepage": "http://donatstudios.com"
-                    "role": "Developer"
                 }
             ],
             "description": "Lightning fast, minimalist PHP UserAgent string parser.",
@@ -662,6 +662,67 @@
             ],
             "time": "2019-07-01T23:21:34+00:00"
         },
+        {
+            "name": "itsgoingd/clockwork",
+            "version": "v4.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/itsgoingd/clockwork.git",
+                "reference": "aa4c909b74fc5eb69367266bfad5a592bcc98b63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/aa4c909b74fc5eb69367266bfad5a592bcc98b63",
+                "reference": "aa4c909b74fc5eb69367266bfad5a592bcc98b63",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "psr/log": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Clockwork\\Support\\Laravel\\ClockworkServiceProvider"
+                    ],
+                    "aliases": {
+                        "Clockwork": "Clockwork\\Support\\Laravel\\Facade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Clockwork\\": "Clockwork/"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "itsgoingd",
+                    "email": "itsgoingd@luzer.sk",
+                    "homepage": "https://twitter.com/itsgoingd"
+                }
+            ],
+            "description": "php dev tools integrated to your browser",
+            "homepage": "https://underground.works/clockwork",
+            "keywords": [
+                "debugging",
+                "devtools",
+                "laravel",
+                "logging",
+                "lumen",
+                "profiling",
+                "slim"
+            ],
+            "support": {
+                "source": "https://github.com/itsgoingd/clockwork/tree/v4.0.7",
+                "issues": "https://github.com/itsgoingd/clockwork/issues"
+            },
+            "time": "2019-08-07T12:40:49+00:00"
+        },
         {
             "name": "kodus/psr7-server",
             "version": "1.0.1",
@@ -757,15 +818,15 @@
             "authors": [
                 {
                     "name": "Craig Duncan",
+                    "role": "Developer",
                     "email": "git@duncanc.co.uk",
-                    "homepage": "https://github.com/duncan3dc",
+                    "homepage": "https://github.com/duncan3dc"
-                    "role": "Developer"
                 },
                 {
                     "name": "Joe Tannenbaum",
+                    "role": "Developer",
                     "email": "hey@joe.codes",
-                    "homepage": "http://joe.codes/",
+                    "homepage": "http://joe.codes/"
-                    "role": "Developer"
                 }
             ],
             "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
@@ -822,9 +883,9 @@
             "authors": [
                 {
                     "name": "Matthias Mullie",
+                    "role": "Developer",
                     "email": "minify@mullie.eu",
-                    "homepage": "http://www.mullie.eu",
+                    "homepage": "http://www.mullie.eu"
-                    "role": "Developer"
                 }
             ],
             "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.",
@@ -872,9 +933,9 @@
             "authors": [
                 {
                     "name": "Matthias Mullie",
+                    "role": "Developer",
                     "email": "pathconverter@mullie.eu",
-                    "homepage": "http://www.mullie.eu",
+                    "homepage": "http://www.mullie.eu"
-                    "role": "Developer"
                 }
             ],
             "description": "Relative path converter",
@@ -990,8 +1051,8 @@
             "authors": [
                 {
                     "name": "Tom Van Herreweghe",
-                    "homepage": "http://theanalogguy.be",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "homepage": "http://theanalogguy.be"
                 }
             ],
             "description": "Object-Oriented EXIF parsing",
@@ -1825,27 +1886,25 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.3.3",
+            "version": "v4.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9"
+                "reference": "fc2e274aade6567a750551942094b2145ade9b6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fc2e274aade6567a750551942094b2145ade9b6c",
-                "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9",
+                "reference": "fc2e274aade6567a750551942094b2145ade9b6c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
-                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/contracts": "^1.0",
-                "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-mbstring": "~1.0"
-                "symfony/service-contracts": "^1.1"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4",
-                "symfony/event-dispatcher": "<4.3",
                 "symfony/process": "<3.3"
             },
             "provide": {
@@ -1855,10 +1914,9 @@
                 "psr/log": "~1.0",
                 "symfony/config": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "^4.3",
+                "symfony/event-dispatcher": "~3.4|~4.0",
                 "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0"
-                "symfony/var-dumper": "^4.3"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -1869,7 +1927,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1896,7 +1954,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2019-07-24T17:13:59+00:00"
+            "time": "2019-07-24T17:13:20+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -1977,36 +2035,30 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.3.3",
+            "version": "v4.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "212b020949331b6531250584531363844b34a94e"
+                "reference": "852548c7c704f14d2f6700c8d872a05bd2028732"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/852548c7c704f14d2f6700c8d872a05bd2028732",
-                "reference": "212b020949331b6531250584531363844b34a94e",
+                "reference": "852548c7c704f14d2f6700c8d872a05bd2028732",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
-                "symfony/event-dispatcher-contracts": "^1.1"
+                "symfony/contracts": "^1.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4"
             },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "1.1"
-            },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
                 "symfony/expression-language": "~3.4|~4.0",
-                "symfony/http-foundation": "^3.4|^4.0",
-                "symfony/service-contracts": "^1.1",
                 "symfony/stopwatch": "~3.4|~4.0"
             },
             "suggest": {
@@ -2016,7 +2068,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2043,7 +2095,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-06-27T06:42:14+00:00"
+            "time": "2019-06-26T06:46:55+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2336,16 +2388,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.3.3",
+            "version": "v4.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c"
+                "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c",
+                "url": "https://api.github.com/repos/symfony/process/zipball/808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2",
-                "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c",
+                "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2",
                 "shasum": ""
             },
             "require": {
@@ -2354,7 +2406,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2381,20 +2433,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-30T16:10:05+00:00"
+            "time": "2019-05-30T16:06:08+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.3.3",
+            "version": "v4.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07"
+                "reference": "4e18e041a477edbb8c54e053f179672f9413816c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4110b992d2cbe198d7d3b244d079c1c58761d07",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4e18e041a477edbb8c54e053f179672f9413816c",
-                "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07",
+                "reference": "4e18e041a477edbb8c54e053f179672f9413816c",
                 "shasum": ""
             },
             "require": {
@@ -2423,7 +2475,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2457,7 +2509,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2019-07-27T06:42:46+00:00"
+            "time": "2019-07-27T06:42:33+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -2562,19 +2614,19 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
+                    "role": "Lead Developer",
                     "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
+                    "homepage": "http://fabien.potencier.org"
-                    "role": "Lead Developer"
                 },
                 {
                     "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder",
-                    "role": "Project Founder"
+                    "email": "armin.ronacher@active-4.com"
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "https://twig.symfony.com/contributors",
+                    "role": "Contributors",
-                    "role": "Contributors"
+                    "homepage": "https://twig.symfony.com/contributors"
                 }
             ],
             "description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -3241,16 +3293,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.1",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
                 "shasum": ""
             },
             "require": {
@@ -3285,7 +3337,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2019-04-07T13:18:21+00:00"
+            "time": "2019-08-09T12:45:53+00:00"
         },
         {
             "name": "nette/bootstrap",
@@ -3812,16 +3864,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420"
+                "reference": "e612609022e935f3d0337c1295176505b41188c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8",
-                "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
+                "reference": "e612609022e935f3d0337c1295176505b41188c8",
                 "shasum": ""
             },
             "require": {
@@ -3829,7 +3881,7 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5 || ^7.0"
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -3859,7 +3911,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-05-25T20:07:01+00:00"
+            "time": "2019-08-12T20:17:41+00:00"
         },
         {
             "name": "ocramius/package-versions",
@@ -3949,18 +4001,18 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "arne@blankerts.de"
                 },
                 {
                     "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "sebastian@phpeople.de"
                 },
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
@@ -3996,18 +4048,18 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "arne@blankerts.de"
                 },
                 {
                     "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "sebastian@phpeople.de"
                 },
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Library for handling version information and constraints",
@@ -4277,16 +4329,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.11.12",
+            "version": "0.11.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30"
+                "reference": "b343bbf83d0dd08db917408d8efd99b140ce04c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/56b3eb2a371b60537fd20794e24af9e7e8ed4e30",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b343bbf83d0dd08db917408d8efd99b140ce04c6",
-                "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30",
+                "reference": "b343bbf83d0dd08db917408d8efd99b140ce04c6",
                 "shasum": ""
             },
             "require": {
@@ -4297,7 +4349,7 @@
                 "nette/robot-loader": "^3.0.1",
                 "nette/schema": "^1.0",
                 "nette/utils": "^2.4.5 || ^3.0",
-                "nikic/php-parser": "^4.0.2",
+                "nikic/php-parser": "^4.2.3",
                 "php": "~7.1",
                 "phpstan/phpdoc-parser": "^0.3.5",
                 "symfony/console": "~3.2 || ~4.0",
@@ -4307,7 +4359,7 @@
                 "symfony/console": "3.4.16 || 4.1.5"
             },
             "require-dev": {
-                "brianium/paratest": "^2.0",
+                "brianium/paratest": "^2.0 || ^3.0",
                 "consistence/coding-standard": "^3.5",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
                 "ext-intl": "*",
@@ -4322,7 +4374,7 @@
                 "phpstan/phpstan-php-parser": "^0.11",
                 "phpstan/phpstan-phpunit": "^0.11",
                 "phpstan/phpstan-strict-rules": "^0.11",
-                "phpunit/phpunit": "^7.0",
+                "phpunit/phpunit": "^7.5.14 || ^8.0",
                 "slevomat/coding-standard": "^4.7.2",
                 "squizlabs/php_codesniffer": "^3.3.2"
             },
@@ -4348,7 +4400,7 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2019-07-08T06:55:18+00:00"
+            "time": "2019-08-17T12:49:22+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -4451,8 +4503,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -4502,8 +4554,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "FilterIterator implementation that filters files based on a list of suffixes.",
@@ -4544,8 +4596,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Simple template engine.",
@@ -4593,8 +4645,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Utility class for timing",
@@ -4724,8 +4776,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "The PHP Unit Testing framework.",
@@ -4957,16 +5009,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+                "reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
                 "shasum": ""
             },
             "require": {
@@ -4993,6 +5045,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -5001,17 +5057,13 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -5020,7 +5072,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2019-08-11T12:43:14+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -5295,8 +5347,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "role": "lead",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
@@ -5558,8 +5610,8 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
+                    "role": "Developer",
-                    "role": "Developer"
+                    "email": "arne@blankerts.de"
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",

index.php

@@ -16,8 +16,11 @@ if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
-if (PHP_SAPI === 'cli-server' && !isset($_SERVER['PHP_CLI_ROUTER'])) {
+if (PHP_SAPI === 'cli-server') {
-    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    $symfony_server = strpos(getenv('_'), 'symfony') !== false;
+    if (!isset($_SERVER['PHP_CLI_ROUTER']) && !$symfony_server) {
+        die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    }
 }
 
 // Ensure vendor libraries exist

robots.txt

@@ -10,3 +10,4 @@ Disallow: /user/
 Allow: /user/pages/
 Allow: /user/themes/
 Allow: /user/images/
+Allow: /

system/assets/debugger.css

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

system/assets/debugger/clockwork.css

@@ -0,0 +1,2 @@
+/** Clockwork Debugger CSS **/
+.clockwork-badge{position:fixed;z-index:10;bottom:0;left:0;padding:2px 4px;background-color:#eee;border:1px solid #ccc;border-bottom:0;border-left:0;display:flex;align-items:center}.clockwork-badge:hover{width:auto}.clockwork-badge:hover:after{content:'Grav Clockwork debugger enabled. Install Clockwork Browser extension (Chrome or Firefox), open your Developer tools and then select the Clockwork tab.'}.clockwork-badge:after{margin-left:10px;font-family:Monaco,Consolas,"Lucida Console",monospace;font-size:12px;line-height:1.5;color:#666}.clockwork-badge i{display:block;float:left;height:22px;width:22px;min-width:22px;background-size:contain;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4AAAD///8EBAT7+/sLCwv29vYVFRUvLy/t7e3m5ubCwsKxsbE/Pz+mpqZMTEwcHBzy8vLp6emfn5+AgIA2Njbi4uLf39+rq6tzc3NWVlYhISHa2trW1tbS0tLMzMy7u7uZmZmUlJSMjIxvb29kZGRHR0c7Ozt5eXkqKiq1tbWQkJBqampbW1tSUlLHx8eHh4ckJCRDQ0M3wD42AAAAI3RSTlMA/PibTbQ0x76TVAlw4LhZLOuEYCAN9Hjx0a2ppGZEGYw97djhXHwAAATZSURBVFjDlVcHW+MwDO1eFCjj2McNOzvdpXTTXVbL/P+/5SQ7QSSX5Di1X1onfi/Sk+Q4sTDbKqWK+YuznZ2zi3wxVdqK/Zf92M1nT9gnO8rmd398GX6Z3xaoOFoiAQcx3E5efgmeSuN8F6Xg1x3G06l/wjNpMR1B0uif4EhnIuFb+0diIoFXk3IVfokisR+h52GO4JKgyjmfaMhAFNlSaPR7DpwI+lzn/E4QKIqmKIJirxCMP4izBPPZPXhgXwMBYgULw0nfg/BF5scDbslb7QeJ08yqqTEmGYoB95d4H8ETL8+n9wBqrLu6ao3bBsMwAnxISf/9BHcqxNB8Y7cWl3Zz7TAUfPrvAT6AoNEFFXvsjutL01yOuMrtBxnFXsmT/1wQHmdWAFNnI3uI48Yj0FUcHbKf62GfUfr8eeQt7Uk3mQZpZNoVRPEui5vtEz5zFEpgWnyqVBZMc6oaGNriH2hGVZ0OxEvInPeMaZWJBA7vmPbCr5jjws5HBnAUxvDMH40aCIf4G5BjRQSs8E8HFFYf8bGxgDvD55bzGhwWkoBcuIyHR/AMdaCagxXDhtL6tSqoWpd4BMnlIR+Or+rYTK/a3EAGcc6e4AWHISnWv20iCCojsHoVlQdjrMexFF2C7UMg2A2WEGWbQhXN6l3eXC6XGp4b9qxbuEB2EBGBwtocrK90cVG5mbRXm6vmx/0phq1sIAGKDgLOBiN1MrO5a9aDl+D0W6x0Ar9BCTRuIIANa90Y7LrLVRXzwVtDInCqMRWcf2bUOEAsa4wJqFowQALL9EiAtVRk8QC4OW+1pOM9jIaVASwYagyNXDj+W0NcfuZNzjtXOiL0Zzg30Llj+ptfxQs4+vBPNiL5PawFCBkgXpUaVtqGl+A8dgZHL34BcBUQrwPptToW+o37Ku+UH9eYByJIx3YkAeFnMFuGO7S5gEp7YhXxa5OOAM39RXDPXb0qmpROsswZe+twXdU55oUIZAiEv3bD1UFwIYKkmGqytPCDCwKFQCKK0yL7qtSAPX54UAbtsLuBHkb9zyLmPQSNjsSgmQwKUOIfEY8F8t4B34DvndJY9BA8tNBJq1Nev9axmaStFcQLhgYoCTo0salkIaW8OUDdWjMTR2sHPhrAFZqx6cqcKE4pl2BJJ4K6hfwvqNgAnXfKX/HU6X3Zrhnu0k7tLNZtTBRv1hkwTDBY1NzFU6doDYjJbWdQkQhWwuU7/LvhTh3SDoco4ECL4i5dwURbc8NdDZz2IwKicE8d0KIqWetLE3+lL4hvUuGSeRfVWNLfj/gpOw4smBJBkKQHCzlHGwvAj4woB1gq5NGGLSXtORBPnUQPV5/MPVkDMxbpwG7w4x0xL6Ltxka0A/4NBvV09UVk4DoSn/jl2+JQS9q9KYawisAD4CfhsZ4TH3htylsdEHARIQBusqCKyUpymycgbbkkXEXjT3z7/oKQFTFVuZD2FMJHZIDsO5x2d4aAr2jR+GLwZhtAb028/0yJ9J8dE87jQyKObcjtTXT8dH+fDuKF4/eiPwzH44wTf/yUi6wrpRIOZ9lM1EtXAifFI+CJn9+iX/t2xMQwOMth/UZbASi8btAwR9FHWSpJr75g9Oqbin3VDg+SpwlP6k6TB4ex/7JvmcJx8jydy6XPk8eFTKhyfwCgX71MSvaBHgAAAABJRU5ErkJggg==)}

system/assets/debugger/clockwork.js

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

system/assets/debugger/phpdebugbar.css

@@ -0,0 +1,70 @@
+div.phpdebugbar {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+.phpdebugbar pre {
+    padding: 1rem;
+}
+
+.phpdebugbar div.phpdebugbar-header > div > * {
+    padding: 5px 15px;
+}
+
+.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * {
+    padding: 5px 8px;
+}
+
+.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4AAAD///8EBAT7+/sLCwv29vYVFRUvLy/t7e3m5ubCwsKxsbE/Pz+mpqZMTEwcHBzy8vLp6emfn5+AgIA2Njbi4uLf39+rq6tzc3NWVlYhISHa2trW1tbS0tLMzMy7u7uZmZmUlJSMjIxvb29kZGRHR0c7Ozt5eXkqKiq1tbWQkJBqampbW1tSUlLHx8eHh4ckJCRDQ0M3wD42AAAAI3RSTlMA/PibTbQ0x76TVAlw4LhZLOuEYCAN9Hjx0a2ppGZEGYw97djhXHwAAATZSURBVFjDlVcHW+MwDO1eFCjj2McNOzvdpXTTXVbL/P+/5SQ7QSSX5Di1X1onfi/Sk+Q4sTDbKqWK+YuznZ2zi3wxVdqK/Zf92M1nT9gnO8rmd398GX6Z3xaoOFoiAQcx3E5efgmeSuN8F6Xg1x3G06l/wjNpMR1B0uif4EhnIuFb+0diIoFXk3IVfokisR+h52GO4JKgyjmfaMhAFNlSaPR7DpwI+lzn/E4QKIqmKIJirxCMP4izBPPZPXhgXwMBYgULw0nfg/BF5scDbslb7QeJ08yqqTEmGYoB95d4H8ETL8+n9wBqrLu6ao3bBsMwAnxISf/9BHcqxNB8Y7cWl3Zz7TAUfPrvAT6AoNEFFXvsjutL01yOuMrtBxnFXsmT/1wQHmdWAFNnI3uI48Yj0FUcHbKf62GfUfr8eeQt7Uk3mQZpZNoVRPEui5vtEz5zFEpgWnyqVBZMc6oaGNriH2hGVZ0OxEvInPeMaZWJBA7vmPbCr5jjws5HBnAUxvDMH40aCIf4G5BjRQSs8E8HFFYf8bGxgDvD55bzGhwWkoBcuIyHR/AMdaCagxXDhtL6tSqoWpd4BMnlIR+Or+rYTK/a3EAGcc6e4AWHISnWv20iCCojsHoVlQdjrMexFF2C7UMg2A2WEGWbQhXN6l3eXC6XGp4b9qxbuEB2EBGBwtocrK90cVG5mbRXm6vmx/0phq1sIAGKDgLOBiN1MrO5a9aDl+D0W6x0Ar9BCTRuIIANa90Y7LrLVRXzwVtDInCqMRWcf2bUOEAsa4wJqFowQALL9EiAtVRk8QC4OW+1pOM9jIaVASwYagyNXDj+W0NcfuZNzjtXOiL0Zzg30Llj+ptfxQs4+vBPNiL5PawFCBkgXpUaVtqGl+A8dgZHL34BcBUQrwPptToW+o37Ku+UH9eYByJIx3YkAeFnMFuGO7S5gEp7YhXxa5OOAM39RXDPXb0qmpROsswZe+twXdU55oUIZAiEv3bD1UFwIYKkmGqytPCDCwKFQCKK0yL7qtSAPX54UAbtsLuBHkb9zyLmPQSNjsSgmQwKUOIfEY8F8t4B34DvndJY9BA8tNBJq1Nev9axmaStFcQLhgYoCTo0salkIaW8OUDdWjMTR2sHPhrAFZqx6cqcKE4pl2BJJ4K6hfwvqNgAnXfKX/HU6X3Zrhnu0k7tLNZtTBRv1hkwTDBY1NzFU6doDYjJbWdQkQhWwuU7/LvhTh3SDoco4ECL4i5dwURbc8NdDZz2IwKicE8d0KIqWetLE3+lL4hvUuGSeRfVWNLfj/gpOw4smBJBkKQHCzlHGwvAj4woB1gq5NGGLSXtORBPnUQPV5/MPVkDMxbpwG7w4x0xL6Ltxka0A/4NBvV09UVk4DoSn/jl2+JQS9q9KYawisAD4CfhsZ4TH3htylsdEHARIQBusqCKyUpymycgbbkkXEXjT3z7/oKQFTFVuZD2FMJHZIDsO5x2d4aAr2jR+GLwZhtAb028/0yJ9J8dE87jQyKObcjtTXT8dH+fDuKF4/eiPwzH44wTf/yUi6wrpRIOZ9lM1EtXAifFI+CJn9+iX/t2xMQwOMth/UZbASi8btAwR9FHWSpJr75g9Oqbin3VDg+SpwlP6k6TB4ex/7JvmcJx8jydy6XPk8eFTKhyfwCgX71MSvaBHgAAAABJRU5ErkJggg==);
+}
+
+.phpdebugbar a.phpdebugbar-restore-btn {
+    width: 13px;
+}
+
+.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active {
+    background: #3DB9EC;
+    color: #fff;
+    margin-top: -1px;
+    padding-top: 6px;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar {
+    border-top: 1px solid #ddd;
+    padding-left: 5px;
+    padding-right: 2px;
+    padding-top: 2px;
+    background-color: #fafafa !important;
+    width: auto !important;
+    left: 0;
+    right: 0;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar input {
+    background: transparent !important;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
+
+}
+
+
+.phpdebugbar input[type=text] {
+    padding: 0;
+    display: inline;
+}
+
+.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
+    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
+    font-size: 12px;
+}
+
+ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
+    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
+    top: 0;
+}
+
+.phpdebugbar pre, .phpdebugbar code {
+    margin: 0;
+    font-size: 14px;
+}

system/blueprints/user/accounts.yaml

@@ -27,6 +27,7 @@ config:
         title: Accounts
         icon: fa-users
         authorize: ['admin.users', 'admin.accounts', 'admin.super']
+        priority: 6
 
 form:
   fields:
@@ -36,4 +37,4 @@ form:
       flex-readonly@: exists
       readonly: false
       validate:
-        required: true
+        required: true

system/config/system.yaml

@@ -27,6 +27,7 @@ home:
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
+  type: page                                     # EXPERIMENTAL: Page type: page or flex
   theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
@@ -125,6 +126,8 @@ log:
 
 debugger:
   enabled: false                                 # Enable Grav debugger and following settings
+  provider: clockwork                            # Debugger provider: debugbar | clockwork
+  censored: false                                # Censor potentially sensitive information (POST parameters, cookies, files, configuration and most array/object data in log messages)
   shutdown:
     close_connection: true                       # Close the connection before calling onShutdown(). false for debugging
 
@@ -154,15 +157,15 @@ session:
   path:
 
 gpm:
-  releases: stable                               # Set to either 'stable' or 'testing'
+  releases: testing                              # Set to either 'stable' or 'testing'
   proxy_url:                                     # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
   method: 'auto'                                 # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
   verify_peer: true                              # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.
   official_gpm_only: true                        # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security
 
 accounts:
-  type: data                                     # Account type: data or flex
+  type: data                                     # EXPERIMENTAL: Account type: data or flex
-  storage: file                                  # Flex storage type: file or folder
+  storage: file                                  # EXPERIMENTAL: Flex storage type: file or folder
 
 strict_mode:
   yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility

system/defines.php

@@ -8,8 +8,8 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.13');
+define('GRAV_VERSION', '1.7.0-beta.7');
-define('GRAV_TESTING', false);
+define('GRAV_TESTING', true);
 define('DS', '/');
 
 if (!defined('GRAV_PHP_MIN')) {

system/router.php

@@ -20,9 +20,9 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N
 $grav_index = 'index.php';
 
 /* Check the GRAV_BASEDIR environment variable and use if set */
-$grav_basedir = getenv('GRAV_BASEDIR') ?: '';
 
-if (isset($grav_basedir)) {
+$grav_basedir = getenv('GRAV_BASEDIR') ?: '';
+if ($grav_basedir) {
     $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index;
     $grav_basedir = DIRECTORY_SEPARATOR . trim($grav_basedir, DIRECTORY_SEPARATOR);
     define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . $grav_basedir);

system/src/Grav/Common/Cache.php

@@ -334,7 +334,7 @@ class Cache extends Getters
      * Stores a new cached entry.
      *
      * @param  string       $id       the id of the cached entry
-     * @param  array|object $data     the data for the cached entry to store
+     * @param  array|object|int $data     the data for the cached entry to store
      * @param  int          $lifetime the lifetime to store the entry in seconds
      */
     public function save($id, $data, $lifetime = null)

system/src/Grav/Common/Data/Blueprint.php

@@ -25,6 +25,9 @@ class Blueprint extends BlueprintForm
     /** @var BlueprintSchema */
     protected $blueprintSchema;
 
+    /** @var object */
+    protected $object;
+
     /** @var array */
     protected $defaults;
 
@@ -42,6 +45,11 @@ class Blueprint extends BlueprintForm
         $this->scope = $scope;
     }
 
+    public function setObject($object)
+    {
+        $this->object = $object;
+    }
+
     /**
      * Set default values for field types.
      *
@@ -111,6 +119,7 @@ class Blueprint extends BlueprintForm
             foreach ($data as $property => $call) {
                 $action = $call['action'];
                 $method = 'dynamic' . ucfirst($action);
+                $call['object'] = $this->object;
 
                 if (isset($this->handlers[$action])) {
                     $callable = $this->handlers[$action];

system/src/Grav/Common/Data/BlueprintSchema.php

@@ -244,8 +244,8 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
                     || !empty($field['disabled'])
                     // Field validation is set to be ignored
                     || !empty($field['validate']['ignore'])
-                    // Field is toggleable and the toggle is turned off
+                    // Field is overridable and the toggle is turned off
-                    || (!empty($field['toggleable']) && empty($toggles[$key]))
+                    || (!empty($field['overridable']) && empty($toggles[$key]))
                 ) {
                     continue;
                 }
@@ -279,6 +279,12 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
                 continue;
             }
 
+            // Skip overridable fields without value.
+            // TODO: We need better overridable support, which is not just ignoring required values but also looking if defaults are good.
+            if (!empty($field['overridable']) && !isset($data[$name])) {
+                continue;
+            }
+
             // Check if required.
             if (isset($field['validate']['required'])
                 && $field['validate']['required'] === true) {

system/src/Grav/Common/Debugger.php

@@ -9,6 +9,14 @@
 
 namespace Grav\Common;
 
+use Clockwork\Clockwork;
+use Clockwork\DataSource\MonologDataSource;
+use Clockwork\DataSource\PhpDataSource;
+use Clockwork\DataSource\PsrMessageDataSource;
+use Clockwork\DataSource\XdebugDataSource;
+use Clockwork\Helpers\ServerTiming;
+use Clockwork\Request\UserData;
+use Clockwork\Storage\FileStorage;
 use DebugBar\DataCollector\ConfigCollector;
 use DebugBar\DataCollector\DataCollectorInterface;
 use DebugBar\DataCollector\ExceptionsCollector;
@@ -22,11 +30,23 @@ use DebugBar\JavascriptRenderer;
 use DebugBar\StandardDebugBar;
 use Grav\Common\Config\Config;
 use Grav\Common\Processors\ProcessorInterface;
+use Grav\Common\Twig\TwigClockworkDataSource;
+use Grav\Framework\Psr7\Response;
+use Monolog\Logger;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use RocketTheme\Toolbox\Event\Event;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Twig\Environment;
 use Twig\Template;
 use Twig\TemplateWrapper;
 
 class Debugger
 {
+    /** @var static */
+    protected static $instance;
+
     /** @var Grav $grav */
     protected $grav;
 
@@ -39,8 +59,11 @@ class Debugger
     /** @var StandardDebugBar $debugbar */
     protected $debugbar;
 
+    /** @var Clockwork */
+    protected $clockwork;
+
     /** @var bool */
-    protected $enabled;
+    protected $enabled = false;
 
     protected $initialized = false;
 
@@ -53,36 +76,38 @@ class Debugger
     /** @var callable */
     protected $errorHandler;
 
+    protected $requestTime;
+    protected $currentTime;
+
+    /** @var int */
+    protected $profiling = 0;
+
+    protected $censored = false;
+
     /**
      * Debugger constructor.
      */
     public function __construct()
     {
-        $currentTime = microtime(true);
+        static::$instance = $this;
+
+        $this->currentTime = microtime(true);
 
         if (!\defined('GRAV_REQUEST_TIME')) {
-            \define('GRAV_REQUEST_TIME', $currentTime);
+            \define('GRAV_REQUEST_TIME', $this->currentTime);
         }
 
-        // Enable debugger until $this->init() gets called.
+        $this->requestTime = $_SERVER['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME;
-        $this->enabled = true;
-
-        $debugbar = new DebugBar();
-        $debugbar->addCollector(new PhpInfoCollector());
-        $debugbar->addCollector(new MessagesCollector());
-        $debugbar->addCollector(new RequestDataCollector());
-        $debugbar->addCollector(new TimeDataCollector($_SERVER['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME));
-
-        $debugbar['time']->addMeasure('Server', $debugbar['time']->getRequestStartTime(), GRAV_REQUEST_TIME);
-        $debugbar['time']->addMeasure('Loading', GRAV_REQUEST_TIME, $currentTime);
-        $debugbar['time']->addMeasure('Debugger', $currentTime, microtime(true));
-
-        $this->debugbar = $debugbar;
 
         // Set deprecation collector.
         $this->setErrorHandler();
     }
 
+    public function getClockwork(): ?Clockwork
+    {
+        return $this->enabled ? $this->clockwork : null;
+    }
+
     /**
      * Initialize the debugger
      *
@@ -100,25 +125,234 @@ class Debugger
 
         // Enable/disable debugger based on configuration.
         $this->enabled = (bool)$this->config->get('system.debugger.enabled');
+        $this->censored = (bool)$this->config->get('system.debugger.censored', false);
 
-        if ($this->enabled()) {
+        if ($this->enabled) {
             $this->initialized = true;
 
-            $plugins_config = (array)$this->config->get('plugins');
+            $clockwork = $debugbar = null;
 
+            switch ($this->config->get('system.debugger.provider', 'debugbar')) {
+                case 'clockwork':
+                    $this->clockwork = $clockwork = new Clockwork();
+                    break;
+                default:
+                    $this->debugbar = $debugbar = new DebugBar();
+            }
+
+            $plugins_config = (array)$this->config->get('plugins');
             ksort($plugins_config);
 
-            $debugbar = $this->debugbar;
+            if ($clockwork) {
-            $debugbar->addCollector(new MemoryCollector());
+                $log = $this->grav['log'];
-            $debugbar->addCollector(new ExceptionsCollector());
+                $clockwork->setStorage(new FileStorage('cache://clockwork'));
-            $debugbar->addCollector(new ConfigCollector((array)$this->config->get('system'), 'Config'));
+                if (extension_loaded('xdebug')) {
-            $debugbar->addCollector(new ConfigCollector($plugins_config, 'Plugins'));
+                    $clockwork->addDataSource(new XdebugDataSource());
-            $this->addMessage('Grav v' . GRAV_VERSION);
+                }
+                if ($log instanceof Logger) {
+                    $clockwork->addDataSource(new MonologDataSource($log));
+                }
+
+                $clockwork->addDataSource(new TwigClockworkDataSource());
+
+                $timeLine = $clockwork->getTimeline();
+                if ($this->requestTime !== GRAV_REQUEST_TIME) {
+                    $timeLine->addEvent('server', 'Server', $this->requestTime, GRAV_REQUEST_TIME);
+                }
+                if ($this->currentTime !== GRAV_REQUEST_TIME) {
+                    $timeLine->addEvent('loading', 'Loading', GRAV_REQUEST_TIME, $this->currentTime);
+                }
+                $timeLine->addEvent('setup', 'Site Setup', $this->currentTime, microtime(true));
+            }
+
+            if ($this->censored) {
+                $censored = ['CENSORED' => true];
+            }
+
+            if ($debugbar) {
+                $debugbar->addCollector(new PhpInfoCollector());
+                $debugbar->addCollector(new MessagesCollector());
+                if (!$this->censored) {
+                    $debugbar->addCollector(new RequestDataCollector());
+                }
+                $debugbar->addCollector(new TimeDataCollector($this->requestTime));
+                $debugbar->addCollector(new MemoryCollector());
+                $debugbar->addCollector(new ExceptionsCollector());
+                $debugbar->addCollector(new ConfigCollector($censored ?? (array)$this->config->get('system'), 'Config'));
+                $debugbar->addCollector(new ConfigCollector($censored ?? $plugins_config, 'Plugins'));
+                $debugbar->addCollector(new ConfigCollector($this->config->get('streams.schemes'), 'Streams'));
+
+                if ($this->requestTime !== GRAV_REQUEST_TIME) {
+                    $debugbar['time']->addMeasure('Server', $debugbar['time']->getRequestStartTime(), GRAV_REQUEST_TIME);
+                }
+                if ($this->currentTime !== GRAV_REQUEST_TIME) {
+                    $debugbar['time']->addMeasure('Loading', GRAV_REQUEST_TIME, $this->currentTime);
+                }
+                $debugbar['time']->addMeasure('Site Setup', $this->currentTime,  microtime(true));
+            }
+
+            $this->addMessage('Grav v' . GRAV_VERSION . ' - PHP ' . PHP_VERSION);
+            $this->config->debug();
+
+            if ($clockwork) {
+                $clockwork->info('System Configuration', $censored ?? $this->config->get('system'));
+                $clockwork->info('Plugins Configuration', $censored ?? $plugins_config);
+                $clockwork->info('Streams', $this->config->get('streams.schemes'));
+            }
         }
 
         return $this;
     }
 
+    public function finalize(): void
+    {
+        if ($this->clockwork && $this->enabled) {
+            $this->stopProfiling('Profiler Analysis');
+            $this->addMeasures();
+
+            $deprecations = $this->getDeprecations();
+            $count = count($deprecations);
+            if (!$count) {
+                return;
+            }
+
+            /** @var UserData $userData */
+            $userData = $this->clockwork->userData('Deprecated');
+            $userData->counters([
+                'Deprecated' => count($deprecations)
+            ]);
+            foreach ($deprecations as &$deprecation) {
+                if (0) {
+                    $d = $deprecation;
+                    unset($d['message']);
+                    $this->clockwork->log('deprecated', $deprecation['message'], $d);
+                }
+            }
+            unset($deprecation);
+
+            $userData->table('Your site is using following deprecated features', $deprecations);
+        }
+    }
+
+    public function logRequest(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+    {
+        if (!$this->enabled || !$this->clockwork) {
+            return $response;
+        }
+
+        $clockwork = $this->clockwork;
+
+        $this->finalize();
+
+        $clockwork->getTimeline()->finalize($request->getAttribute('request_time'));
+
+        if ($this->censored) {
+            $censored = 'CENSORED';
+            $request = $request
+                ->withCookieParams([$censored => ''])
+                ->withUploadedFiles([])
+                ->withHeader('cookie', $censored);
+            if ($request->getBody()) {
+                $request = $request->withParsedBody([$censored => '']);
+            }
+        }
+
+        $clockwork->addDataSource(new PsrMessageDataSource($request, $response));
+
+        $clockwork->resolveRequest();
+        $clockwork->storeRequest();
+
+        $clockworkRequest = $clockwork->getRequest();
+
+        $response = $response
+            ->withHeader('X-Clockwork-Id', $clockworkRequest->id)
+            ->withHeader('X-Clockwork-Version', $clockwork::VERSION);
+
+        $basePath = Grav::instance()['uri']->rootUrl();
+        if ($basePath) {
+            $response = $response->withHeader('X-Clockwork-Path', $basePath . '/__clockwork/');
+        }
+
+        return $response->withHeader('Server-Timing', ServerTiming::fromRequest($clockworkRequest)->value());
+    }
+
+
+    public function debuggerRequest(RequestInterface $request): Response
+    {
+        $clockwork = $this->clockwork;
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Grav-Internal-SkipShutdown' => 1
+        ];
+
+        $path = $request->getUri()->getPath();
+        $clockworkDataUri = '#/__clockwork(?:/(?<id>[0-9-]+))?(?:/(?<direction>(?:previous|next)))?(?:/(?<count>\d+))?#';
+        if (preg_match($clockworkDataUri, $path, $matches) === false) {
+            $response = ['message' => 'Bad Input'];
+
+            return new Response(400, $headers, json_encode($response));
+        }
+
+        $id = $matches['id'] ?? null;
+        $direction = $matches['direction'] ?? null;
+        $count = $matches['count'] ?? null;
+
+        $storage = $clockwork->getStorage();
+
+        if ($direction === 'previous') {
+            $data = $storage->previous($id, $count);
+        } elseif ($direction === 'next') {
+            $data = $storage->next($id, $count);
+        } elseif ($id === 'latest') {
+            $data = $storage->latest();
+        } else {
+            $data = $storage->find($id);
+        }
+
+        if (preg_match('#(?<id>[0-9-]+|latest)/extended#', $path)) {
+            $clockwork->extendRequest($data);
+        }
+
+        if (!$data) {
+            $response = ['message' => 'Not Found'];
+
+            return new Response(404, $headers, json_encode($response));
+        }
+
+        $data = is_array($data) ? array_map(function ($item) { return $item->toArray(); }, $data) : $data->toArray();
+
+        return new Response(200, $headers, json_encode($data));
+    }
+
+    protected function addMeasures()
+    {
+        if (!$this->enabled) {
+            return;
+        }
+
+        $nowTime = microtime(true);
+        $clkTimeLine = $this->clockwork ? $this->clockwork->getTimeline() : null;
+        $debTimeLine = $this->debugbar ? $this->debugbar['time'] : null;
+        foreach ($this->timers as $name => $data) {
+            $description = $data[0];
+            $startTime = $data[1] ?? null;
+            $endTime = $data[2] ?? $nowTime;
+            if ($endTime - $startTime < 0.001) {
+                continue;
+            }
+
+            if ($clkTimeLine) {
+                $clkTimeLine->addEvent($name, $description ?? $name, $startTime, $endTime);
+            }
+
+            if ($debTimeLine) {
+                $debTimeLine->addMeasure($description ?? $name, $startTime,  $endTime);
+            }
+        }
+        $this->timers = [];
+    }
+
     /**
      * Set/get the enabled state of the debugger
      *
@@ -142,7 +376,8 @@ class Debugger
      */
     public function addAssets()
     {
-        if ($this->enabled()) {
+        if ($this->enabled) {
+
 
             // Only add assets if Page is HTML
             $page = $this->grav['page'];
@@ -153,23 +388,35 @@ class Debugger
             /** @var Assets $assets */
             $assets = $this->grav['assets'];
 
-            // Add jquery library
+            // Clockwork specific assets
-            $assets->add('jquery', 101);
+            if ($this->clockwork) {
-
+                $assets->addCss('/system/assets/debugger/clockwork.css', ['loading' => 'inline']);
-            $this->renderer = $this->debugbar->getJavascriptRenderer();
+                $assets->addJs('/system/assets/debugger/clockwork.js', ['loading' => 'inline']);
-            $this->renderer->setIncludeVendors(false);
-
-            // Get the required CSS files
-            list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL);
-            foreach ((array)$css_files as $css) {
-                $assets->addCss($css);
             }
 
-            $assets->addCss('/system/assets/debugger.css');
 
-            foreach ((array)$js_files as $js) {
+            // Debugbar specific assets
-                $assets->addJs($js);
+            if ($this->debugbar) {
+
+                // Add jquery library
+                $assets->add('jquery', 101);
+
+                $this->renderer = $this->debugbar->getJavascriptRenderer();
+                $this->renderer->setIncludeVendors(false);
+
+                list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL);
+
+                foreach ((array)$css_files as $css) {
+                    $assets->addCss($css);
+                }
+
+                $assets->addCss('/system/assets/debugger/phpdebugbar.css', ['loading' => 'inline']);
+
+                foreach ((array)$js_files as $js) {
+                    $assets->addJs($js);
+                }
             }
+
         }
 
         return $this;
@@ -192,7 +439,9 @@ class Debugger
      */
     public function addCollector($collector)
     {
-        $this->debugbar->addCollector($collector);
+        if ($this->debugbar && !$this->debugbar->hasCollector($collector->getName())) {
+            $this->debugbar->addCollector($collector);
+        }
 
         return $this;
     }
@@ -200,14 +449,18 @@ class Debugger
     /**
      * Returns a data collector
      *
-     * @param DataCollectorInterface $collector
+     * @param string $name
      *
      * @return DataCollectorInterface
      * @throws \DebugBar\DebugBarException
      */
-    public function getCollector($collector)
+    public function getCollector($name)
     {
-        return $this->debugbar->getCollector($collector);
+        if ($this->debugbar && $this->debugbar->hasCollector($name)) {
+            return $this->debugbar->getCollector($name);
+        }
+
+        return null;
     }
 
     /**
@@ -217,13 +470,14 @@ class Debugger
      */
     public function render()
     {
-        if ($this->enabled()) {
+        if ($this->enabled && $this->debugbar) {
             // Only add assets if Page is HTML
             $page = $this->grav['page'];
             if (!$this->renderer || $page->templateFormat() !== 'html') {
                 return $this;
             }
 
+            $this->addMeasures();
             $this->addDeprecations();
 
             echo $this->renderer->render();
@@ -239,7 +493,8 @@ class Debugger
      */
     public function sendDataInHeaders()
     {
-        if ($this->enabled()) {
+        if ($this->enabled && $this->debugbar) {
+            $this->addMeasures();
             $this->addDeprecations();
             $this->debugbar->sendDataInHeaders();
         }
@@ -254,16 +509,146 @@ class Debugger
      */
     public function getData()
     {
-        if (!$this->enabled()) {
+        if (!$this->enabled || !$this->debugbar) {
             return null;
         }
 
+        $this->addMeasures();
         $this->addDeprecations();
         $this->timers = [];
 
         return $this->debugbar->getData();
     }
 
+    /**
+     * Hierarchical Profiler support.
+     *
+     * @param callable $callable
+     * @param string $message
+     * @return mixed
+     */
+    public function profile(callable $callable, string $message = null)
+    {
+        $this->startProfiling();
+        $response = $callable();
+        $this->stopProfiling($message);
+
+        return $response;
+    }
+
+    /**
+     * Start profiling code.
+     */
+    public function startProfiling(): void
+    {
+        if ($this->enabled && extension_loaded('tideways_xhprof')) {
+            $this->profiling++;
+            if ($this->profiling === 1) {
+                \tideways_xhprof_enable(TIDEWAYS_XHPROF_FLAGS_NO_BUILTINS);
+            }
+        }
+    }
+
+    /**
+     * Stop profiling code. Returns profiling array or null if profiling couldn't be done.
+     *
+     * @param string $message
+     * @return array|null
+     */
+    public function stopProfiling(string $message = null): ?array
+    {
+        $timings = null;
+        if ($this->enabled && extension_loaded('tideways_xhprof')) {
+            $profiling = $this->profiling - 1;
+            if ($profiling === 0) {
+                $timings = \tideways_xhprof_disable();
+                $timings = $this->buildProfilerTimings($timings);
+
+                if ($this->clockwork) {
+                    /** @var UserData $userData */
+                    $userData = $this->clockwork->userData('Profiler');
+                    $userData->counters([
+                        'Calls' => count($timings)
+                    ]);
+                    $userData->table('Profiler', $timings);
+                } else {
+                    $this->addMessage($message ?? 'Profiler Analysis', 'debug', $timings);
+                }
+            }
+            $this->profiling = max(0, $profiling);
+        }
+
+        return $timings;
+    }
+
+    protected function buildProfilerTimings(array $timings): array
+    {
+        // Filter method calls which take almost no time.
+        $timings = array_filter($timings, function ($value) {
+            return $value['wt'] > 50;
+        });
+
+        uasort($timings, function (array $a, array $b) {
+           return $b['wt'] <=> $a['wt'];
+        });
+
+        $table = [];
+        foreach ($timings as $key => $timing) {
+            $parts = explode('==>', $key);
+            $method = $this->parseProfilerCall(array_pop($parts));
+            $context = $this->parseProfilerCall(array_pop($parts));
+
+            // Skip redundant method calls.
+            if ($context === 'Grav\Framework\RequestHandler\RequestHandler::handle()') {
+                continue;
+            }
+
+            // Do not profile library calls.
+            if (strpos($context, 'Grav\\') !== 0) {
+                continue;
+            }
+
+            $table[] = [
+                'Context' => $context,
+                'Method' => $method,
+                'Calls' => $timing['ct'],
+                'Time (ms)' => $timing['wt'] / 1000,
+            ];
+        }
+
+        return $table;
+    }
+
+    protected function parseProfilerCall(?string $call)
+    {
+        if (null === $call) {
+            return '';
+        }
+        if (strpos($call, '@')) {
+            [$call,] = explode('@', $call);
+        }
+        if (strpos($call, '::')) {
+            [$class, $call] = explode('::', $call);
+        }
+
+        if (!isset($class)) {
+            return $call;
+        }
+
+        // It is also possible to display twig files, but they are being logged in views.
+        /*
+        if (strpos($class, '__TwigTemplate_') === 0 && class_exists($class)) {
+            $env = new Environment();
+            / ** @var Template $template * /
+            $template = new $class($env);
+
+            return $template->getTemplateName();
+        }
+        */
+
+        return "{$class}::{$call}()";
+    }
+
     /**
      * Start a timer with an associated name and description
      *
@@ -274,10 +659,7 @@ class Debugger
      */
     public function startTimer($name, $description = null)
     {
-        if (strpos($name, '_') === 0 || $this->enabled()) {
+        $this->timers[$name] = [$description, microtime(true)];
-            $this->debugbar['time']->startMeasure($name, $description);
-            $this->timers[] = $name;
-        }
 
         return $this;
     }
@@ -291,8 +673,9 @@ class Debugger
      */
     public function stopTimer($name)
     {
-        if (\in_array($name, $this->timers, true) && (strpos($name, '_') === 0 || $this->enabled())) {
+        if (isset($this->timers[$name])) {
-            $this->debugbar['time']->stopMeasure($name);
+            $endTime = microtime(true);
+            $this->timers[$name][] = $endTime;
         }
 
         return $this;
@@ -303,14 +686,56 @@ class Debugger
      *
      * @param mixed  $message
      * @param string $label
-     * @param bool   $isString
+     * @param mixed|bool $isString
      *
      * @return $this
      */
     public function addMessage($message, $label = 'info', $isString = true)
     {
-        if ($this->enabled()) {
+        if ($this->enabled) {
-            $this->debugbar['messages']->addMessage($message, $label, $isString);
+            if ($this->censored) {
+                if (!is_scalar($message)) {
+                    $message = 'CENSORED';
+                }
+                if (!is_scalar($isString)) {
+                    $isString = ['CENSORED'];
+                }
+            }
+
+            if ($this->debugbar) {
+                $this->debugbar['messages']->addMessage($message, $label, is_bool($isString) ? $isString : true);
+                if (is_array($isString)) {
+                    $this->debugbar['messages']->addMessage($isString, $label, false);
+                }
+            }
+
+            if ($this->clockwork) {
+                if (!is_scalar($message)) {
+                    $isString = $message;
+                    $message = '';
+                } elseif (is_bool($isString)) {
+                    $isString = [];
+                }
+                if (!is_array($isString)) {
+                    $isString = [gettype($isString) => $isString];
+                }
+                $this->clockwork->log($label, $message, $isString);
+            }
+        }
+
+        return $this;
+    }
+
+    public function addEvent(string $name, ?Event $event, EventDispatcherInterface $dispatcher)
+    {
+        if ($this->enabled) {
+            if ($this->clockwork) {
+                $listeners = [];
+                foreach ($dispatcher->getListeners($name) as $listener) {
+                    $listeners[] = $this->resolveCallable($listener);
+                }
+                $this->clockwork->addEvent($name, null, microtime(true), ['listeners' => $listeners]);
+            }
         }
 
         return $this;
@@ -319,13 +744,23 @@ class Debugger
     /**
      * Dump exception into the Messages tab of the Debug Bar
      *
-     * @param \Exception $e
+     * @param \Throwable $e
      * @return Debugger
      */
-    public function addException(\Exception $e)
+    public function addException(\Throwable $e)
     {
-        if ($this->initialized && $this->enabled()) {
+        if ($this->initialized && $this->enabled) {
-            $this->debugbar['exceptions']->addException($e);
+            if ($this->debugbar) {
+                $this->debugbar['exceptions']->addException($e);
+            }
+
+            if ($this->clockwork) {
+                /** @var UserData $exceptions */
+                $exceptions = $this->clockwork->userData('Exceptions');
+                $exceptions->data(['message' => $e->getMessage()]);
+
+                $this->clockwork->alert($e->getMessage(), ['exception' => $e]);
+            }
         }
 
         return $this;
@@ -355,7 +790,7 @@ class Debugger
             return true;
         }
 
-        if (!$this->enabled()) {
+        if (!$this->enabled) {
             return true;
         }
 
@@ -540,6 +975,21 @@ class Debugger
         return true;
     }
 
+    protected function getDeprecations(): array
+    {
+        if (!$this->deprecations) {
+            return [];
+        }
+
+        $list = [];
+        /** @var array $deprecated */
+        foreach ($this->deprecations as $deprecated) {
+            $list[] = $this->getDepracatedMessage($deprecated)[0];
+        }
+
+        return $list;
+    }
+
     protected function addDeprecations()
     {
         if (!$this->deprecations) {
@@ -603,4 +1053,13 @@ class Debugger
 
         return $trace['function'] . '(' . implode(', ', $trace['args'] ?? []) . ')';
     }
+
+    protected function resolveCallable(callable $callable)
+    {
+        if (is_array($callable)) {
+            return get_class($callable[0]) . '->' . $callable[1] . '()';
+        }
+
+        return 'unknown';
+    }
 }

system/src/Grav/Common/GPM/Common/Package.php

@@ -11,6 +11,9 @@ namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Data\Data;
 
+/**
+ * @property string $name
+ */
 class Package
 {
     /**

system/src/Grav/Common/Grav.php

@@ -16,12 +16,8 @@ use Grav\Common\Page\Medium\ImageMedium;
 use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Processors\AssetsProcessor;
 use Grav\Common\Processors\BackupsProcessor;
-use Grav\Common\Processors\ConfigurationProcessor;
 use Grav\Common\Processors\DebuggerAssetsProcessor;
-use Grav\Common\Processors\DebuggerProcessor;
-use Grav\Common\Processors\ErrorsProcessor;
 use Grav\Common\Processors\InitializeProcessor;
-use Grav\Common\Processors\LoggerProcessor;
 use Grav\Common\Processors\PagesProcessor;
 use Grav\Common\Processors\PluginsProcessor;
 use Grav\Common\Processors\RenderProcessor;
@@ -90,10 +86,6 @@ class Grav extends Container
      * @var array All middleware processors that are processed in $this->process()
      */
     protected $middleware = [
-        'configurationProcessor',
-        'loggerProcessor',
-        'errorsProcessor',
-        'debuggerProcessor',
         'initializeProcessor',
         'pluginsProcessor',
         'themesProcessor',
@@ -157,15 +149,13 @@ class Grav extends Container
 
         $this->initialized['setup'] = true;
 
-        $this->measureTime('_setup', 'Site Setup', function () use ($environment) {
+        // Force environment if passed to the method.
-            // Force environment if passed to the method.
+        if ($environment) {
-            if ($environment) {
+            Setup::$environment = $environment;
-                Setup::$environment = $environment;
+        }
-            }
 
-            $this['setup'];
+        $this['setup'];
-            $this['streams'];
+        $this['streams'];
-        });
 
         return $this;
     }
@@ -186,18 +176,6 @@ class Grav extends Container
 
         $container = new Container(
             [
-                'configurationProcessor' => function () {
-                    return new ConfigurationProcessor($this);
-                },
-                'loggerProcessor' => function () {
-                    return new LoggerProcessor($this);
-                },
-                'errorsProcessor' => function () {
-                    return new ErrorsProcessor($this);
-                },
-                'debuggerProcessor' => function () {
-                    return new DebuggerProcessor($this);
-                },
                 'initializeProcessor' => function () {
                     return new InitializeProcessor($this);
                 },
@@ -237,13 +215,10 @@ class Grav extends Container
             ]
         );
 
-        $default = function (ServerRequestInterface $request) {
+        $default = static function () {
             return new Response(404);
         };
 
-        /** @var Debugger $debugger */
-        $debugger = $this['debugger'];
-
         $collection = new RequestHandler($this->middleware, $default, $container);
 
         $response = $collection->handle($this['request']);
@@ -251,32 +226,65 @@ class Grav extends Container
         $this->header($response);
         echo $response->getBody();
 
-        $debugger->render();
+        $this['debugger']->render();
 
-        register_shutdown_function([$this, 'shutdown']);
+        // Response object can turn off all shutdown processing. This can be used for example to speed up AJAX responses.
-    }
+        // Note that using this feature will also turn off response compression.
-
+        if ($response->getHeaderLine('Grav-Internal-SkipShutdown') !== '1') {
-    /**
+            register_shutdown_function([$this, 'shutdown']);
-     * Set the system locale based on the language and configuration
-     */
-    public function setLocale()
-    {
-        // Initialize Locale if set and configured.
-        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
-            $language = $this['language']->getLanguage();
-            setlocale(LC_ALL, \strlen($language) < 3 ? ($language . '_' . strtoupper($language)) : $language);
-        } elseif ($this['config']->get('system.default_locale')) {
-            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
         }
     }
 
     /**
-     * Redirect browser to another location.
+     * Terminates Grav request with a response.
+     *
+     * Please use this method instead of calling `die();` or `exit();`. Note that you need to create a response object.
+     *
+     * @param ResponseInterface $response
+     */
+    public function close(ResponseInterface $response): void
+    {
+        // Make sure nothing extra gets written to the response.
+        while (ob_get_level()) {
+            ob_end_clean();
+        }
+
+        // Close the session.
+        if (isset($this['session'])) {
+            $this['session']->close();
+        }
+
+        /** @var ServerRequestInterface $request */
+        $request = $this['request'];
+
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+        $response = $debugger->logRequest($request, $response);
+
+        // Send the response and terminate.
+        $this->header($response);
+        echo $response->getBody();
+        exit();
+    }
+
+    /**
+     * @param ResponseInterface $response
+     * @deprecated 1.7 Do not use
+     */
+    public function exit(ResponseInterface $response): void
+    {
+        $this->close($response);
+    }
+
+    /**
+     * Terminates Grav request and redirects browser to another location.
+     *
+     * Please use this method instead of calling `header("Location: {$url}", true, 302); exit();`.
      *
      * @param string $route Internal route.
      * @param int    $code  Redirection code (30x)
      */
-    public function redirect($route, $code = null)
+    public function redirect($route, $code = null): void
     {
         /** @var Uri $uri */
         $uri = $this['uri'];
@@ -293,11 +301,7 @@ class Grav extends Container
             $code = $this['config']->get('system.pages.redirect_default_code', 302);
         }
 
-        if (isset($this['session'])) {
+        if ($uri::isExternal($route)) {
-            $this['session']->close();
-        }
-
-        if ($uri->isExternal($route)) {
             $url = $route;
         } else {
             $url = rtrim($uri->rootUrl(), '/') . '/';
@@ -309,8 +313,9 @@ class Grav extends Container
             }
         }
 
-        header("Location: {$url}", true, $code);
+        $response = new Response($code, ['Location' => $url]);
-        exit();
+
+        $this->close($response);
     }
 
     /**
@@ -343,12 +348,30 @@ class Grav extends Container
 
         header("HTTP/{$response->getProtocolVersion()} {$response->getStatusCode()} {$response->getReasonPhrase()}");
         foreach ($response->getHeaders() as $key => $values) {
+            // Skip internal Grav headers.
+            if (strpos($key, 'Grav-Internal-') === 0) {
+                continue;
+            }
             foreach ($values as $i => $value) {
                 header($key . ': ' . $value, $i === 0);
             }
         }
     }
 
+    /**
+     * Set the system locale based on the language and configuration
+     */
+    public function setLocale()
+    {
+        // Initialize Locale if set and configured.
+        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
+            $language = $this['language']->getLanguage();
+            setlocale(LC_ALL, \strlen($language) < 3 ? ($language . '_' . strtoupper($language)) : $language);
+        } elseif ($this['config']->get('system.default_locale')) {
+            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
+        }
+    }
+
     /**
      * Fires an event with optional parameters.
      *
@@ -362,6 +385,10 @@ class Grav extends Container
         /** @var EventDispatcher $events */
         $events = $this['events'];
 
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+        $debugger->addEvent($eventName, $event, $events);
+
         return $events->dispatch($eventName, $event);
     }
 
@@ -470,9 +497,7 @@ class Grav extends Container
             return $container;
         };
 
-        $container->measureTime('_services', 'Services', function () use ($container) {
+        $container->registerServices();
-            $container->registerServices();
-        });
 
         return $container;
     }

system/src/Grav/Common/Helpers/Truncator.php

@@ -190,7 +190,7 @@ class Truncator {
      * Clean extra code
      *
      * @param DOMDocument $doc
-     * @param $container
+     * @param DOMDocument $container
      * @return string
      */
     private static function getCleanedHTML(DOMDocument $doc, $container)
@@ -203,8 +203,7 @@ class Truncator {
             $doc->appendChild($container->firstChild);
         }
 
-        $html = trim($doc->saveHTML());
+        return trim($doc->saveHTML());
-        return $html;
     }
 
     /**
@@ -242,17 +241,20 @@ class Truncator {
         $ending = '...',
         $exact = false,
         $considerHtml = true
-    ) {
+    )
+    {
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
             if (strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
                 return $text;
             }
+
             // splits all html-tags to scanable lines
             preg_match_all('/(<.+?>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
             $total_length = strlen($ending);
-            $open_tags = array();
             $truncate = '';
+            $open_tags = [];
+
             foreach ($lines as $line_matchings) {
                 // if there is any html-tag in this line, handle it and add it (uncounted) to the output
                 if (!empty($line_matchings[1])) {
@@ -308,22 +310,22 @@ class Truncator {
         } else {
             if (strlen($text) <= $length) {
                 return $text;
-            } else {
-                $truncate = substr($text, 0, $length - strlen($ending));
             }
+
+            $truncate = substr($text, 0, $length - strlen($ending));
         }
         // if the words shouldn't be cut in the middle...
         if (!$exact) {
             // ...search the last occurance of a space...
             $spacepos = strrpos($truncate, ' ');
-            if (isset($spacepos)) {
+            if (false !== $spacepos) {
                 // ...and cut the text in this position
                 $truncate = substr($truncate, 0, $spacepos);
             }
         }
         // add the defined ending to the text
         $truncate .= $ending;
-        if($considerHtml) {
+        if (isset($open_tags)) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
                 $truncate .= '</' . $tag . '>';

system/src/Grav/Common/Helpers/YamlLinter.php

@@ -16,13 +16,15 @@ use Symfony\Component\Yaml\Yaml;
 
 class YamlLinter
 {
-    public static function lint()
+    public static function lint(string $folder = null)
     {
-        $errors = static::lintConfig();
+        if (null !== $folder) {
-        $errors = $errors + static::lintPages();
+            $folder = $folder ?: GRAV_ROOT;
-        $errors = $errors + static::lintBlueprints();
+
-        
+            return static::recurseFolder($folder);
-        return $errors;
+        }
+
+        return array_merge(static::lintConfig(), static::lintPages(), static::lintBlueprints());
     }
 
     public static function lintPages()
@@ -47,7 +49,7 @@ class YamlLinter
         return static::recurseFolder('blueprints://');
     }
 
-    public static function recurseFolder($path, $extensions = 'md|yaml')
+    public static function recurseFolder($path, $extensions = '(md|yaml)')
     {
         $lint_errors = [];
 

system/src/Grav/Common/Language/Language.php

@@ -9,6 +9,7 @@
 
 namespace Grav\Common\Language;
 
+use Grav\Common\Debugger;
 use Grav\Common\Grav;
 use Grav\Common\Config\Config;
 use Negotiation\AcceptLanguage;
@@ -16,20 +17,22 @@ use Negotiation\LanguageNegotiator;
 
 class Language
 {
+    /** @var Grav */
     protected $grav;
-    protected $enabled = true;
-    /**
-     * @var array
-     */
-    protected $languages = [];
-    protected $page_extensions = [];
-    protected $fallback_languages = [];
-    protected $default;
-    protected $active = null;
 
-    /** @var Config $config */
+    /** @var Config */
     protected $config;
 
+    protected $enabled = true;
+
+    /** @var array */
+    protected $languages = [];
+    protected $fallback_languages = [];
+    protected $fallback_extensions = [];
+    protected $page_extesions = [];
+    protected $default;
+    protected $active;
+
     protected $http_accept_language;
     protected $lang_in_url = false;
 
@@ -58,7 +61,7 @@ class Language
             $this->default = reset($this->languages);
         }
 
-        $this->page_extensions = null;
+        $this->resetFallbackPageExtensions();
 
         if (empty($this->languages)) {
             $this->enabled = false;
@@ -93,20 +96,22 @@ class Language
     public function setLanguages($langs)
     {
         $this->languages = $langs;
+
         $this->init();
     }
 
     /**
      * Gets a pipe-separated string of available languages
      *
+     * @param string|null $delimiter Delimiter to be quoted.
      * @return string
      */
-    public function getAvailable()
+    public function getAvailable($delimiter = null)
     {
         $languagesArray = $this->languages; //Make local copy
 
-        $languagesArray = array_map(function($value) {
+        $languagesArray = array_map(function($value) use ($delimiter) {
-            return preg_quote($value);
+            return preg_quote($value, $delimiter);
         }, $languagesArray);
 
         sort($languagesArray);
@@ -172,6 +177,10 @@ class Language
     public function setActive($lang)
     {
         if ($this->validate($lang)) {
+            /** @var Debugger $debugger */
+            $debugger = $this->grav['debugger'];
+            $debugger->addMessage('Active language set to ' . $lang, 'debug');
+
             $this->active = $lang;
 
             return $lang;
@@ -196,7 +205,7 @@ class Language
             // Try setting language from prefix of URL (/en/blah/blah).
             if (preg_match($regex, $uri, $matches)) {
                 $this->lang_in_url = true;
-                $this->active = $matches[2];
+                $this->setActive($matches[2]);
                 $uri = preg_replace("/\\" . $matches[1] . '/', '', $uri, 1);
 
                 // Store in session if language is different.
@@ -210,7 +219,7 @@ class Language
                 // Try getting language from the session, else no active.
                 if (isset($this->grav['session']) && $this->grav['session']->isStarted() &&
                     $this->config->get('system.languages.session_store_active', true)) {
-                    $this->active = $this->grav['session']->active_language ?: null;
+                    $this->setActive($this->grav['session']->active_language ?: null);
                 }
                 // if still null, try from http_accept_language header
                 if ($this->active === null &&
@@ -221,9 +230,9 @@ class Language
                     $best_language = $negotiator->getBest($accept, $this->languages);
 
                     if ($best_language instanceof AcceptLanguage) {
-                        $this->active = $best_language->getType();
+                        $this->setActive($best_language->getType());
                     } else {
-                        $this->active = $this->getDefault();
+                        $this->setActive($this->getDefault());
                     }
 
                 }
@@ -275,52 +284,61 @@ class Language
         return (bool) $this->lang_in_url;
     }
 
+    /**
+     * Get full list of used language page extensions: [''=>'.md', 'en'=>'.en.md', ...]
+     *
+     * @param string|null $fileExtension
+     * @return mixed
+     */
+    public function getPageExtensions($fileExtension = null)
+    {
+        $fileExtension = $fileExtension ?: CONTENT_EXT;
+
+        if (!isset($this->fallback_extensions[$fileExtension])) {
+            $extensions[''] = $fileExtension;
+            foreach ($this->languages as $code) {
+                $extensions[$code] = ".{$code}{$fileExtension}";
+            }
+
+            $this->fallback_extensions[$fileExtension] = $extensions;
+        }
+
+        return $this->fallback_extensions[$fileExtension];
+    }
 
     /**
      * Gets an array of valid extensions with active first, then fallback extensions
      *
-     * @param string|null $file_ext
+     * @param string|null $fileExtension
-     *
+     * @param string|null $languageCode
-     * @return array
+     * @param bool $assoc  Return values in ['en' => '.en.md', ...] format.
+     * @return array Key is the language code, value is the file extension to be used.
      */
-    public function getFallbackPageExtensions($file_ext = null)
+    public function getFallbackPageExtensions(string $fileExtension = null, string $languageCode = null, bool $assoc = false)
     {
-        if (empty($this->page_extensions)) {
+        $fileExtension = $fileExtension ?: CONTENT_EXT;
-            if (!$file_ext) {
+        $key = $fileExtension . '-' . ($languageCode ?? 'default') . '-' . (int)$assoc;
-                $file_ext = CONTENT_EXT;
+
+        if (!isset($this->fallback_extensions[$key])) {
+            $all = $this->getPageExtensions($fileExtension);
+            $fallback = array_flip($this->getFallbackLanguages($languageCode, true));
+            $list = array_intersect_key($all, $fallback);
+            if (!$assoc) {
+                $list = array_values($list);
             }
 
-            if ($this->enabled()) {
+            $this->fallback_extensions[$key] = $list;
-                $valid_lang_extensions = [];
-                foreach ($this->languages as $lang) {
-                    $valid_lang_extensions[] = '.' . $lang . $file_ext;
-                }
 
-                if ($this->active) {
+            /** @var Debugger $debugger */
-                    $active_extension = '.' . $this->active . $file_ext;
+            $debugger = $this->grav['debugger'];
-                    $key = \array_search($active_extension, $valid_lang_extensions, true);
+            $debugger->addMessage("Language fallback extensions for {$languageCode}", 'debug', $list);
-
-                    // Default behavior is to find any language other than active
-                    if ($this->config->get('system.languages.pages_fallback_only')) {
-                        $slice = \array_slice($valid_lang_extensions, 0, $key+1);
-                        $valid_lang_extensions = array_reverse($slice);
-                    } else {
-                        unset($valid_lang_extensions[$key]);
-                        array_unshift($valid_lang_extensions, $active_extension);
-                    }
-                }
-                $valid_lang_extensions[] = $file_ext;
-                $this->page_extensions = $valid_lang_extensions;
-            } else {
-                $this->page_extensions = (array)$file_ext;
-            }
         }
 
-        return $this->page_extensions;
+        return $this->fallback_extensions[$key];
     }
 
     /**
-     * Resets the page_extensions value.
+     * Resets the fallback_languages value.
      *
      * Useful to re-initialize the pages and change site language at runtime, example:
      *
@@ -332,33 +350,77 @@ class Language
      */
     public function resetFallbackPageExtensions()
     {
-        $this->page_extensions = null;
+        $this->fallback_languages = [];
+        $this->fallback_extensions = [];
+        $this->page_extesions = [];
     }
 
     /**
-     * Gets an array of languages with active first, then fallback languages
+     * Gets an array of languages with active first, then fallback languages.
      *
+     *
+     * @param string|null  $languageCode
+     * @param bool $includeDefault  If true, list contains '', which can be used for default
      * @return array
      */
-    public function getFallbackLanguages()
+    public function getFallbackLanguages(string $languageCode = null, bool $includeDefault = false)
     {
-        if (empty($this->fallback_languages)) {
+        // Handle default.
-            if ($this->enabled()) {
+        if ($languageCode === '' || !$this->enabled()) {
-                $fallback_languages = $this->languages;
+            return [''];
-
-                if ($this->active) {
-                    $active_extension = $this->active;
-                    $key = \array_search($active_extension, $fallback_languages, true);
-                    unset($fallback_languages[$key]);
-                    array_unshift($fallback_languages, $active_extension);
-                }
-                $this->fallback_languages = $fallback_languages;
-            }
-            // always add english in case a translation doesn't exist
-            $this->fallback_languages[] = 'en';
         }
 
-        return $this->fallback_languages;
+        $default = $this->getDefault() ?? 'en';
+        $active = $languageCode ?? $this->getActive() ?? $default;
+        $key = $active . '-' . (int)$includeDefault;
+
+        if (!isset($this->fallback_languages[$key])) {
+            $fallback = $this->config->get('system.languages.content_fallback.' . $active);
+            $fallback_languages = [];
+
+            if (null === $fallback && $this->config->get('system.languages.pages_fallback_only', false)) {
+                // Special fallback list returns itself and all the previous items in reverse order:
+                // active: 'v2', languages: ['v1', 'v2', 'v3', 'v4'] => ['v2', 'v1', '']
+                if ($includeDefault) {
+                    $fallback_languages[''] = '';
+                }
+                foreach ($this->languages as $code) {
+                    $fallback_languages[$code] = $code;
+                    if ($code === $active) {
+                        break;
+                    }
+                }
+                $fallback_languages = array_reverse($fallback_languages);
+
+            } else {
+                if (null === $fallback) {
+                    $fallback = [$default];
+                } elseif (!is_array($fallback)) {
+                    $fallback = is_string($fallback) && $fallback !== '' ? explode(',', $fallback) : [];
+                }
+                array_unshift($fallback, $active);
+                $fallback = array_unique($fallback);
+
+                foreach ($fallback as $code) {
+                    // Default fallback list has active language followed by default language and extensionless file:
+                    // active: 'fi', default: 'en', languages: ['sv', 'en', 'de', 'fi'] => ['fi', 'en', '']
+                    $fallback_languages[$code] = $code;
+                    if ($includeDefault && $code === $default) {
+                        $fallback_languages[''] = '';
+                    }
+                }
+            }
+
+            $fallback_languages = array_values($fallback_languages);
+
+            $this->fallback_languages[$key] = $fallback_languages;
+
+            /** @var Debugger $debugger */
+            $debugger = $this->grav['debugger'];
+            $debugger->addMessage("Language fallback for {$active}", 'debug', $fallback_languages);
+        }
+
+        return $this->fallback_languages[$key];
     }
 
     /**
@@ -534,4 +596,11 @@ class Language
         return LanguageCodes::get($code, $type);
     }
 
+    public function __debugInfo()
+    {
+        $vars = get_object_vars($this);
+        unset($vars['grav'], $vars['config']);
+
+        return $vars;
+    }
 }

system/src/Grav/Common/Language/LanguageCodes.php

@@ -202,4 +202,13 @@ class LanguageCodes
 
         return false;
     }
+
+    public static function getList($native = true)
+    {
+        $list = [];
+        foreach (static::$codes as $key => $names) {
+            $list[$key] = $native ? $names['nativeName'] : $names['name'];
+        }
+        return $list;
+    }
 }

system/src/Grav/Common/Page/Collection.php

@@ -11,10 +11,11 @@ namespace Grav\Common\Page;
 
 use Grav\Common\Grav;
 use Grav\Common\Iterator;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Utils;
 
-class Collection extends Iterator
+class Collection extends Iterator implements PageCollectionInterface
 {
     /**
      * @var Pages
@@ -51,6 +52,20 @@ class Collection extends Iterator
         return $this->params;
     }
 
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     *
+     * @return $this
+     */
+    public function setParams(array $params)
+    {
+        $this->params = array_merge($this->params, $params);
+
+        return $this;
+    }
+
     /**
      * Add a single page to a collection
      *
@@ -94,10 +109,10 @@ class Collection extends Iterator
      *
      * Merge another collection with the current collection
      *
-     * @param Collection $collection
+     * @param PageCollectionInterface $collection
      * @return $this
      */
-    public function merge(Collection $collection)
+    public function merge(PageCollectionInterface $collection)
     {
         foreach($collection as $page) {
             $this->addPage($page);
@@ -109,10 +124,10 @@ class Collection extends Iterator
     /**
      * Intersect another collection with the current collection
      *
-     * @param Collection $collection
+     * @param PageCollectionInterface $collection
      * @return $this
      */
-    public function intersect(Collection $collection)
+    public function intersect(PageCollectionInterface $collection)
     {
         $array1 = $this->items;
         $array2 = $collection->toArray();
@@ -124,20 +139,6 @@ class Collection extends Iterator
         return $this;
     }
 
-    /**
-     * Set parameters to the Collection
-     *
-     * @param array $params
-     *
-     * @return $this
-     */
-    public function setParams(array $params)
-    {
-        $this->params = array_merge($this->params, $params);
-
-        return $this;
-    }
-
     /**
      * Returns current page.
      *
@@ -240,7 +241,7 @@ class Collection extends Iterator
      *
      * @return bool True if item is first.
      */
-    public function isFirst($path)
+    public function isFirst($path): bool
     {
         return $this->items && $path === array_keys($this->items)[0];
     }
@@ -252,7 +253,7 @@ class Collection extends Iterator
      *
      * @return bool True if item is last.
      */
-    public function isLast($path)
+    public function isLast($path): bool
     {
         return $this->items && $path === array_keys($this->items)[\count($this->items) - 1];
     }
@@ -301,7 +302,6 @@ class Collection extends Iterator
         }
 
         return $this;
-
     }
 
     /**
@@ -309,11 +309,13 @@ class Collection extends Iterator
      *
      * @param  string $path the path the item
      *
-     * @return int   the index of the current page.
+     * @return int|null The index of the current page, null if not found.
      */
-    public function currentPosition($path)
+    public function currentPosition($path): ?int
     {
-        return \array_search($path, \array_keys($this->items), true);
+        $pos = \array_search($path, \array_keys($this->items), true);
+
+        return $pos !== false ? $pos : null;
     }
 
     /**

system/src/Grav/Common/Page/Header.php

@@ -10,9 +10,13 @@
 namespace Grav\Common\Page;
 
 use RocketTheme\Toolbox\ArrayTraits\Constructor;
-use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccess;
+use RocketTheme\Toolbox\ArrayTraits\Export;
+use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
 
-class Header implements \ArrayAccess
+class Header implements \ArrayAccess, ExportInterface
 {
-    use NestedArrayAccess, Constructor;
+    use NestedArrayAccessWithGetters, Constructor, Export;
+
+    protected $items;
 }

system/src/Grav/Common/Page/Interfaces/PageCollectionInterface.php

@@ -0,0 +1,263 @@
+<?php
+
+/**
+ * @package    Grav\Common\Page
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Page\Interfaces;
+
+interface PageCollectionInterface extends \Traversable, \ArrayAccess, \Countable, \Serializable
+{
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function params();
+
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     *
+     * @return $this
+     */
+    public function setParams(array $params);
+
+    /**
+     * Add a single page to a collection
+     *
+     * @param PageInterface $page
+     *
+     * @return $this
+     */
+    public function addPage(PageInterface $page);
+
+    /**
+     * Add a page with path and slug
+     *
+     * @param string $path
+     * @param string $slug
+     * @return $this
+     */
+    //public function add($path, $slug);
+
+    /**
+     *
+     * Create a copy of this collection
+     *
+     * @return static
+     */
+    public function copy();
+
+    /**
+     *
+     * Merge another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return $this
+     */
+    public function merge(PageCollectionInterface $collection);
+
+    /**
+     * Intersect another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return $this
+     */
+    public function intersect(PageCollectionInterface $collection);
+
+    /**
+     * Split collection into array of smaller collections.
+     *
+     * @param int $size
+     * @return PageCollectionInterface[]
+     */
+    public function batch($size);
+
+    /**
+     * Remove item from the list.
+     *
+     * @param PageInterface|string|null $key
+     *
+     * @return $this
+     * @throws \InvalidArgumentException
+     */
+    //public function remove($key = null);
+
+    /**
+     * Reorder collection.
+     *
+     * @param string $by
+     * @param string $dir
+     * @param array  $manual
+     * @param string $sort_flags
+     *
+     * @return $this
+     */
+    public function order($by, $dir = 'asc', $manual = null, $sort_flags = null);
+
+    /**
+     * Check to see if this item is the first in the collection.
+     *
+     * @param  string $path
+     *
+     * @return bool True if item is first.
+     */
+    public function isFirst($path): bool;
+
+    /**
+     * Check to see if this item is the last in the collection.
+     *
+     * @param  string $path
+     *
+     * @return bool True if item is last.
+     */
+    public function isLast($path): bool;
+
+    /**
+     * Gets the previous sibling based on current position.
+     *
+     * @param  string $path
+     *
+     * @return PageInterface  The previous item.
+     */
+    public function prevSibling($path);
+
+    /**
+     * Gets the next sibling based on current position.
+     *
+     * @param  string $path
+     *
+     * @return PageInterface The next item.
+     */
+    public function nextSibling($path);
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  string  $path
+     * @param  int $direction either -1 or +1
+     *
+     * @return PageInterface|PageCollectionInterface    The sibling item.
+     */
+    public function adjacentSibling($path, $direction = 1);
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @param  string $path the path the item
+     *
+     * @return int|null The index of the current page, null if not found.
+     */
+    public function currentPosition($path): ?int;
+
+    /**
+     * Returns the items between a set of date ranges of either the page date field (default) or
+     * an arbitrary datetime page field where end date is optional
+     * Dates can be passed in as text that strtotime() can process
+     * http://php.net/manual/en/function.strtotime.php
+     *
+     * @param string $startDate
+     * @param bool $endDate
+     * @param string|null $field
+     *
+     * @return $this
+     * @throws \Exception
+     */
+    public function dateRange($startDate, $endDate = false, $field = null);
+
+    /**
+     * Creates new collection with only visible pages
+     *
+     * @return PageCollectionInterface The collection with only visible pages
+     */
+    public function visible();
+
+    /**
+     * Creates new collection with only non-visible pages
+     *
+     * @return PageCollectionInterface The collection with only non-visible pages
+     */
+    public function nonVisible();
+
+    /**
+     * Creates new collection with only modular pages
+     *
+     * @return PageCollectionInterface The collection with only modular pages
+     */
+    public function modular();
+
+    /**
+     * Creates new collection with only non-modular pages
+     *
+     * @return PageCollectionInterface The collection with only non-modular pages
+     */
+    public function nonModular();
+
+    /**
+     * Creates new collection with only published pages
+     *
+     * @return PageCollectionInterface The collection with only published pages
+     */
+    public function published();
+
+    /**
+     * Creates new collection with only non-published pages
+     *
+     * @return PageCollectionInterface The collection with only non-published pages
+     */
+    public function nonPublished();
+
+    /**
+     * Creates new collection with only routable pages
+     *
+     * @return PageCollectionInterface The collection with only routable pages
+     */
+    public function routable();
+
+    /**
+     * Creates new collection with only non-routable pages
+     *
+     * @return PageCollectionInterface The collection with only non-routable pages
+     */
+    public function nonRoutable();
+
+    /**
+     * Creates new collection with only pages of the specified type
+     *
+     * @param string $type
+     *
+     * @return PageCollectionInterface The collection
+     */
+    public function ofType($type);
+
+    /**
+     * Creates new collection with only pages of one of the specified types
+     *
+     * @param string[] $types
+     *
+     * @return PageCollectionInterface The collection
+     */
+    public function ofOneOfTheseTypes($types);
+
+    /**
+     * Creates new collection with only pages of one of the specified access levels
+     *
+     * @param array $accessLevels
+     *
+     * @return PageCollectionInterface The collection
+     */
+    public function ofOneOfTheseAccessLevels($accessLevels);
+
+    /**
+     * Get the extended version of this Collection with each page keyed by route
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function toExtendedArray();
+}

system/src/Grav/Common/Page/Interfaces/PageContentInterface.php

@@ -36,6 +36,13 @@ interface PageContentInterface
      */
     public function summary($size = null, $textOnly = false);
 
+    /**
+     * Sets the summary of the page
+     *
+     * @param string $summary Summary
+     */
+    public function setSummary($summary);
+
     /**
      * Gets and Sets the content based on content portion of the .md file
      *
@@ -64,7 +71,7 @@ interface PageContentInterface
      *
      * @param string|null $var
      *
-     * @return null
+     * @return string
      */
     public function rawMarkdown($var = null);
 
@@ -167,7 +174,7 @@ interface PageContentInterface
      *
      * @param int $var
      *
-     * @return int|bool
+     * @return string|bool
      */
     public function order($var = null);
 

system/src/Grav/Common/Page/Interfaces/PageFormInterface.php

@@ -0,0 +1,30 @@
+<?php
+namespace Grav\Common\Page\Interfaces;
+
+interface PageFormInterface
+{
+    /**
+     * Return all the forms which are associated to this page.
+     *
+     * Forms are returned as [name => blueprint, ...], where blueprint follows the regular form blueprint format.
+     *
+     * @return array
+     */
+    //public function getForms(): array;
+
+    /**
+     * Add forms to this page.
+     *
+     * @param array $new
+     * @param bool $override
+     * @return $this
+     */
+    public function addForms(array $new/*, $override = true*/);
+
+    /**
+     * Alias of $this->getForms();
+     *
+     * @return array
+     */
+    public function forms();//: array;
+}

system/src/Grav/Common/Page/Interfaces/PageInterface.php

@@ -14,6 +14,12 @@ use Grav\Common\Media\Interfaces\MediaInterface;
 /**
  * Class implements page interface.
  */
-interface PageInterface extends PageContentInterface, PageRoutableInterface, PageTranslateInterface, MediaInterface, PageLegacyInterface
+interface PageInterface extends
+    PageContentInterface,
+    PageFormInterface,
+    PageRoutableInterface,
+    PageTranslateInterface,
+    MediaInterface,
+    PageLegacyInterface
 {
 }

system/src/Grav/Common/Page/Interfaces/PageLegacyInterface.php

@@ -51,13 +51,6 @@ interface PageLegacyInterface
 
     public function httpHeaders();
 
-    /**
-     * Sets the summary of the page
-     *
-     * @param string $summary Summary
-     */
-    public function setSummary($summary);
-
     /**
      * Get the contentMeta array and initialize content first if it's not already
      *
@@ -69,7 +62,7 @@ interface PageLegacyInterface
      * Add an entry to the page's contentMeta array
      *
      * @param string $name
-     * @param string $value
+     * @param mixed $value
      */
     public function addContentMeta($name, $value);
 
@@ -229,9 +222,9 @@ interface PageLegacyInterface
      * Allows a page to override the output render format, usually the extension provided
      * in the URL. (e.g. `html`, `json`, `xml`, etc).
      *
-     * @param null $var
+     * @param string|null $var
      *
-     * @return null
+     * @return string
      */
     public function templateFormat($var = null);
 

system/src/Grav/Common/Page/Medium/ImageFile.php

@@ -109,7 +109,7 @@ class ImageFile extends Image
      * Gets the hash.
      * @param string $type
      * @param int $quality
-     * @param [] $extras
+     * @param array $extras
      * @return null
      */
     public function getHash($type = 'guess', $quality = 80, $extras = [])

system/src/Grav/Common/Page/Page.php

@@ -15,17 +15,17 @@ use Grav\Common\Data\Blueprint;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use Grav\Common\Language\Language;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
+use Grav\Common\Media\Interfaces\MediaCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Media\Traits\MediaTrait;
 use Grav\Common\Page\Markdown\Excerpts;
-use Grav\Common\Taxonomy;
+use Grav\Common\Page\Traits\PageFormTrait;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Common\Yaml;
-use Negotiation\Accept;
-use Negotiation\Negotiator;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\MarkdownFile;
 
@@ -33,6 +33,7 @@ define('PAGE_ORDER_PREFIX_REGEX', '/^[0-9]+\./u');
 
 class Page implements PageInterface
 {
+    use PageFormTrait;
     use MediaTrait;
 
     /**
@@ -93,11 +94,9 @@ class Page implements PageInterface
     protected $ssl;
     protected $template_format;
     protected $debugger;
-    /** @var array */
-    protected $forms;
 
     /**
-     * @var PageInterface Unmodified (original) version of the page. Used for copying and moving the page.
+     * @var PageInterface|null Unmodified (original) version of the page. Used for copying and moving the page.
      */
     private $_original;
 
@@ -129,7 +128,10 @@ class Page implements PageInterface
      */
     public function init(\SplFileInfo $file, $extension = null)
     {
-        $config = Grav::instance()['config'];
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
 
         // some extension logic
         if (empty($extension)) {
@@ -139,8 +141,13 @@ class Page implements PageInterface
         }
 
         // extract page language from page extension
-        $language = trim(basename($this->extension(), 'md'), '.') ?: null;
+        $languageCode = trim(basename($this->extension(), 'md'), '.') ?: null;
-        $this->language($language);
+        if (!$languageCode) {
+            /** @var Language $language */
+            $language = $grav['language'];
+            $languageCode = $language->enabled() ? $language->getDefault() : null;
+        }
+        $this->language($languageCode);
 
         $this->hide_home_route = $config->get('system.home.hide_in_urls', false);
         $this->home_route = $this->adjustRouteCase($config->get('system.home.alias'));
@@ -188,16 +195,32 @@ class Page implements PageInterface
      */
     public function translatedLanguages($onlyPublished = false)
     {
-        $filename = substr($this->name, 0, -(strlen($this->extension())));
+        $grav = Grav::instance();
-        $config = Grav::instance()['config'];
+
-        $languages = $config->get('system.languages.supported', []);
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        $languages = $language->getLanguages();
+        $defaultCode = $language->getDefault();
+
+        $name = substr($this->name, 0, -strlen($this->extension()));
         $translatedLanguages = [];
 
-        foreach ($languages as $language) {
+        foreach ($languages as $languageCode) {
-            $path = $this->path . DS . $this->folder . DS . $filename . '.' . $language . '.md';
+            $languageExtension = ".{$languageCode}.md";
-            if (file_exists($path)) {
+            $path = $this->path . DS . $this->folder . DS . $name . $languageExtension;
+            $exists = file_exists($path);
+
+            // Default language may be saved without language file location.
+            if (!$exists && $languageCode === $defaultCode) {
+                $languageExtension = '.md';
+                $path = $this->path . DS . $this->folder . DS . $name . $languageExtension;
+                $exists = file_exists($path);
+            }
+
+            if ($exists) {
                 $aPage = new Page();
-                $aPage->init(new \SplFileInfo($path), $language . '.md');
+                $aPage->init(new \SplFileInfo($path), $languageExtension);
 
                 $route = $aPage->header()->routes['default'] ?? $aPage->rawRoute();
                 if (!$route) {
@@ -208,7 +231,7 @@ class Page implements PageInterface
                     continue;
                 }
 
-                $translatedLanguages[$language] = $route;
+                $translatedLanguages[$languageCode] = $route;
             }
         }
 
@@ -224,22 +247,41 @@ class Page implements PageInterface
      */
     public function untranslatedLanguages($includeUnpublished = false)
     {
-        $filename = substr($this->name, 0, -strlen($this->extension()));
+        $grav = Grav::instance();
-        $config = Grav::instance()['config'];
+
-        $languages = $config->get('system.languages.supported', []);
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        $languages = $language->getLanguages();
+        $defaultCode = $language->getDefault();
+
+        $name = substr($this->name, 0, -strlen($this->extension()));
         $untranslatedLanguages = [];
 
-        foreach ($languages as $language) {
+        foreach ($languages as $languageCode) {
-            $path = $this->path . DS . $this->folder . DS . $filename . '.' . $language . '.md';
+            $path = $this->path . DS . $this->folder . DS . $name . '.' . $languageCode . '.md';
-            if (file_exists($path)) {
+            $exists = file_exists($path);
-                $aPage = new Page();
+
-                $aPage->init(new \SplFileInfo($path), $language . '.md');
+            // Default language may be saved without language file location.
-                if ($includeUnpublished && !$aPage->published()) {
+            if (!$exists && $languageCode === $defaultCode) {
-                    $untranslatedLanguages[] = $language;
+                $path = $this->path . DS . $this->folder . DS . $name . '.md';
-                }
+                $exists = file_exists($path);
-            } else {
-                $untranslatedLanguages[] = $language;
             }
+
+            if ($exists) {
+                if ($includeUnpublished) {
+                    continue;
+                }
+
+                $aPage = new Page();
+                $aPage->init(new \SplFileInfo($path), $languageCode . '.md');
+
+                if (!$aPage->published()) {
+                    continue;
+                }
+            }
+
+            $untranslatedLanguages[] = $languageCode;
         }
 
         return $untranslatedLanguages;
@@ -568,8 +610,7 @@ class Page implements PageInterface
             $content = $textOnly ? strip_tags($this->content()) : $this->content();
             $summary_size = $this->summary_size;
         } else {
-            $content = strip_tags($this->summary);
+            $content = $textOnly ? strip_tags($this->summary) : $this->summary;
-            // Use mb_strwidth to deal with the 2 character widths characters
             $summary_size = mb_strwidth($content, 'utf-8');
         }
 
@@ -772,7 +813,7 @@ class Page implements PageInterface
      * Add an entry to the page's contentMeta array
      *
      * @param string $name
-     * @param string $value
+     * @param mixed $value
      */
     public function addContentMeta($name, $value)
     {
@@ -784,16 +825,12 @@ class Page implements PageInterface
      *
      * @param string|null $name
      *
-     * @return string
+     * @return mixed|null
      */
     public function getContentMeta($name = null)
     {
         if ($name) {
-            if (isset($this->content_meta[$name])) {
+            return $this->content_meta[$name] ?? null;
-                return $this->content_meta[$name];
-            }
-
-            return null;
         }
 
         return $this->content_meta;
@@ -922,13 +959,16 @@ class Page implements PageInterface
             return $this->slug();
         }
         if ($name === 'name') {
+            $name = $this->name();
             $language = $this->language() ? '.' . $this->language() : '';
-            $name_val = str_replace($language . '.md', '', $this->name());
+            $pattern = '%(' . preg_quote($language, '%') . ')?\.md$%';
+            $name = preg_replace($pattern, '', $name);
+
             if ($this->modular()) {
-                return 'modular/' . $name_val;
+                return 'modular/' . $name;
             }
 
-            return $name_val;
+            return $name;
         }
         if ($name === 'media') {
             return $this->media()->all();
@@ -1205,93 +1245,12 @@ class Page implements PageInterface
         return $this->id();
     }
 
-    /**
-     * Returns normalized list of name => form pairs.
-     *
-     * @return array
-     */
-    public function forms()
-    {
-        if (null === $this->forms) {
-            $header = $this->header();
-
-            // Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
-            $grav = Grav::instance();
-            $grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
-
-            $rules = $header->rules ?? null;
-            if (!\is_array($rules)) {
-                $rules = [];
-            }
-
-            $forms = [];
-
-            // First grab page.header.form
-            $form = $this->normalizeForm($header->form ?? null, null, $rules);
-            if ($form) {
-                $forms[$form['name']] = $form;
-            }
-
-            // Append page.header.forms (override singular form if it clashes)
-            $headerForms = $header->forms ?? null;
-            if (\is_array($headerForms)) {
-                foreach ($headerForms as $name => $form) {
-                    $form = $this->normalizeForm($form, $name, $rules);
-                    if ($form) {
-                        $forms[$form['name']] = $form;
-                    }
-                }
-            }
-
-            $this->forms = $forms;
-        }
-
-        return $this->forms;
-    }
-
-    /**
-     * @param array $new
-     */
-    public function addForms(array $new)
-    {
-        // Initialize forms.
-        $this->forms();
-
-        foreach ($new as $form) {
-            $form = $this->normalizeForm($form);
-            if ($form) {
-                $this->forms[$form['name']] = $form;
-            }
-        }
-    }
-
-    protected function normalizeForm($form, $name = null, array $rules = [])
-    {
-        if (!\is_array($form)) {
-            return null;
-        }
-
-        // Ignore numeric indexes on name.
-        if (!$name || (string)(int)$name === (string)$name) {
-            $name = null;
-        }
-
-        $name = $name ?? $form['name'] ?? $this->slug();
-
-        $formRules = $form['rules'] ?? null;
-        if (!\is_array($formRules)) {
-            $formRules = [];
-        }
-
-        return ['name' => $name, 'rules' => $rules + $formRules] + $form;
-    }
-
     /**
      * Gets and sets the associated media as found in the page folder.
      *
      * @param  Media $var Representation of associated media.
      *
-     * @return Media      Representation of associated media.
+     * @return MediaCollectionInterface|Media      Representation of associated media.
      */
     public function media($var = null)
     {
@@ -1371,67 +1330,32 @@ class Page implements PageInterface
     }
 
     /**
-     * Allows a page to override the output render format, usually the extension provided
+     * Allows a page to override the output render format, usually the extension provided in the URL.
-     * in the URL. (e.g. `html`, `json`, `xml`, etc).
+     * (e.g. `html`, `json`, `xml`, etc).
      *
-     * @param null $var
+     * @param string|null $var
      *
-     * @return null
+     * @return string
      */
     public function templateFormat($var = null)
     {
-        if ($var !== null) {
+        if (null !== $var) {
-            $this->template_format = $var;
+            $this->template_format = is_string($var) ? $var : null;
-            return $this->template_format;
         }
 
-        if (isset($this->template_format)) {
+        if (!isset($this->template_format)) {
-            return $this->template_format;
+            $this->template_format = ltrim($this->header->append_url_extension ?? Utils::getPageFormat(), '.');
         }
 
-        // Set from URL extension set on page
-        $page_extension = trim($this->header->append_url_extension ?? '' , '.');
-        if (!empty($page_extension)) {
-            $this->template_format = $page_extension;
-
-            return $this->template_format;
-        }
-
-        // Set from uri extension
-        $uri_extension = Grav::instance()['uri']->extension();
-        if (is_string($uri_extension)) {
-            $this->template_format = $uri_extension;
-
-            return $this->template_format;
-        }
-
-        // Use content negotiation via the `accept:` header
-        $http_accept = $_SERVER['HTTP_ACCEPT'] ?? null;
-        if (is_string($http_accept)) {
-            $negotiator = new Negotiator();
-
-            $supported_types = Utils::getSupportPageTypes(['html', 'json']);
-            $priorities = Utils::getMimeTypes($supported_types);
-
-            $media_type = $negotiator->getBest($http_accept, $priorities);
-            $mimetype = $media_type instanceof Accept ? $media_type->getValue() : '';
-
-            $this->template_format = Utils::getExtensionByMime($mimetype);
-
-            return $this->template_format;
-        }
-
-        // Last chance set a default type
-        $this->template_format = 'html';
         return $this->template_format;
     }
 
     /**
      * Gets and sets the extension field.
      *
-     * @param null $var
+     * @param string|null $var
      *
-     * @return null|string
+     * @return string
      */
     public function extension($var = null)
     {
@@ -1660,7 +1584,7 @@ class Page implements PageInterface
     }
 
     /**
-     * Returns the state of the debugger override etting for this page
+     * Returns the state of the debugger override setting for this page
      *
      * @return mixed
      */
@@ -1689,9 +1613,10 @@ class Page implements PageInterface
 
             $this->metadata = [];
 
-            $metadata = [];
             // Set the Generator tag
-            $metadata['generator'] = 'GravCMS';
+            $metadata = [
+                'generator' => 'GravCMS'
+            ];
 
             // Get initial metadata for the page
             $metadata = array_merge($metadata, Grav::instance()['config']->get('site.metadata'));
@@ -1784,7 +1709,7 @@ class Page implements PageInterface
      *
      * @param int $var
      *
-     * @return int|bool
+     * @return string|bool
      */
     public function order($var = null)
     {
@@ -2040,7 +1965,7 @@ class Page implements PageInterface
      *
      * @param  string $var redirect url
      *
-     * @return string
+     * @return string|null
      */
     public function redirect($var = null)
     {
@@ -2048,7 +1973,7 @@ class Page implements PageInterface
             $this->redirect = $var;
         }
 
-        return $this->redirect;
+        return $this->redirect ?: null;
     }
 
     /**
@@ -2671,321 +2596,45 @@ class Page implements PageInterface
     public function collection($params = 'content', $pagination = true)
     {
         if (is_string($params)) {
+            // Look into a page header field.
             $params = (array)$this->value('header.' . $params);
         } elseif (!is_array($params)) {
             throw new \InvalidArgumentException('Argument should be either header variable name or array of parameters');
         }
 
-        if (!isset($params['items'])) {
+        $context = [
-            return new Collection();
+            'pagination' => $pagination,
-        }
+            'self' => $this
+        ];
 
-        // See if require published filter is set and use that, if assume published=true
+        /** @var Pages $pages */
-        $only_published = true;
+        $pages = Grav::instance()['pages'];
-        if (isset($params['filter']['published']) && $params['filter']['published']) {
-            $only_published = false;
-        } elseif (isset($params['filter']['non-published']) && $params['filter']['non-published']) {
-            $only_published = false;
-        }
 
-        $collection = $this->evaluate($params['items'], $only_published);
+        return $pages->getCollection($params, $context);
-        if (!$collection instanceof Collection) {
-            $collection = new Collection();
-        }
-        $collection->setParams($params);
-
-        /** @var Uri $uri */
-        $uri = Grav::instance()['uri'];
-        /** @var Config $config */
-        $config = Grav::instance()['config'];
-
-        $process_taxonomy = $params['url_taxonomy_filters'] ?? $config->get('system.pages.url_taxonomy_filters');
-
-        if ($process_taxonomy) {
-            foreach ((array)$config->get('site.taxonomies') as $taxonomy) {
-                if ($uri->param(rawurlencode($taxonomy))) {
-                    $items = explode(',', $uri->param($taxonomy));
-                    $collection->setParams(['taxonomies' => [$taxonomy => $items]]);
-
-                    foreach ($collection as $page) {
-                        // Don't filter modular pages
-                        if ($page->modular()) {
-                            continue;
-                        }
-                        foreach ($items as $item) {
-                            $item = rawurldecode($item);
-                            if (empty($page->taxonomy[$taxonomy]) || !\in_array(htmlspecialchars_decode($item, ENT_QUOTES), $page->taxonomy[$taxonomy], true)
-                            ) {
-                                $collection->remove($page->path());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // If  a filter or filters are set, filter the collection...
-        if (isset($params['filter'])) {
-
-            // remove any inclusive sets from filer:
-            $sets = ['published', 'visible', 'modular', 'routable'];
-            foreach ($sets as $type) {
-                $var = "non-{$type}";
-                if (isset($params['filter'][$type], $params['filter'][$var]) && $params['filter'][$type] && $params['filter'][$var]) {
-                    unset ($params['filter'][$type], $params['filter'][$var]);
-                }
-            }
-
-            foreach ((array)$params['filter'] as $type => $filter) {
-                switch ($type) {
-                    case 'published':
-                        if ((bool) $filter) {
-                            $collection->published();
-                        }
-                        break;
-                    case 'non-published':
-                        if ((bool) $filter) {
-                            $collection->nonPublished();
-                        }
-                        break;
-                    case 'visible':
-                        if ((bool) $filter) {
-                            $collection->visible();
-                        }
-                        break;
-                    case 'non-visible':
-                        if ((bool) $filter) {
-                            $collection->nonVisible();
-                        }
-                        break;
-                    case 'modular':
-                        if ((bool) $filter) {
-                            $collection->modular();
-                        }
-                        break;
-                    case 'non-modular':
-                        if ((bool) $filter) {
-                            $collection->nonModular();
-                        }
-                        break;
-                    case 'routable':
-                        if ((bool) $filter) {
-                            $collection->routable();
-                        }
-                        break;
-                    case 'non-routable':
-                        if ((bool) $filter) {
-                            $collection->nonRoutable();
-                        }
-                        break;
-                    case 'type':
-                        $collection->ofType($filter);
-                        break;
-                    case 'types':
-                        $collection->ofOneOfTheseTypes($filter);
-                        break;
-                    case 'access':
-                        $collection->ofOneOfTheseAccessLevels($filter);
-                        break;
-                }
-            }
-        }
-
-        if (isset($params['dateRange'])) {
-            $start = $params['dateRange']['start'] ?? 0;
-            $end = $params['dateRange']['end'] ?? false;
-            $field = $params['dateRange']['field'] ?? false;
-            $collection->dateRange($start, $end, $field);
-        }
-
-        if (isset($params['order'])) {
-            $by = $params['order']['by'] ?? 'default';
-            $dir = $params['order']['dir'] ?? 'asc';
-            $custom = $params['order']['custom'] ?? null;
-            $sort_flags = $params['order']['sort_flags'] ?? null;
-
-            if (is_array($sort_flags)) {
-                $sort_flags = array_map('constant', $sort_flags); //transform strings to constant value
-                $sort_flags = array_reduce($sort_flags, function ($a, $b) {
-                    return $a | $b;
-                }, 0); //merge constant values using bit or
-            }
-
-            $collection->order($by, $dir, $custom, $sort_flags);
-        }
-
-        /** @var Grav $grav */
-        $grav = Grav::instance();
-
-        // New Custom event to handle things like pagination.
-        $grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection]));
-
-        // Slice and dice the collection if pagination is required
-        if ($pagination) {
-            $params = $collection->params();
-
-            $limit = $params['limit'] ?? 0;
-            $start = !empty($params['pagination']) ? ($uri->currentPage() - 1) * $limit : 0;
-
-            if ($limit && $collection->count() > $limit) {
-                $collection->slice($start, $limit);
-            }
-        }
-
-        return $collection;
     }
 
     /**
      * @param string|array $value
      * @param bool $only_published
-     * @return mixed
+     * @return Collection
      */
     public function evaluate($value, $only_published = true)
     {
-        // Parse command.
+        $params = [
-        if (is_string($value)) {
+            'items' => $value,
-            // Format: @command.param
+            'published' => $only_published
-            $cmd = $value;
+        ];
-            $params = [];
+        $context = [
-        } elseif (is_array($value) && count($value) == 1 && !is_int(key($value))) {
+            'event' => false,
-            // Format: @command.param: { attr1: value1, attr2: value2 }
+            'pagination' => false,
-            $cmd = (string)key($value);
+            'url_taxonomy_filters' => false,
-            $params = (array)current($value);
+            'self' => $this
-        } else {
+        ];
-            $result = [];
-            foreach ((array)$value as $key => $val) {
-                if (is_int($key)) {
-                    $result = $result + $this->evaluate($val)->toArray();
-                } else {
-                    $result = $result + $this->evaluate([$key => $val])->toArray();
-                }
-
-            }
-
-            return new Collection($result);
-        }
 
         /** @var Pages $pages */
         $pages = Grav::instance()['pages'];
 
-        $parts = explode('.', $cmd);
+        return $pages->getCollection($params, $context);
-        $current = array_shift($parts);
-
-        /** @var Collection $results */
-        $results = new Collection();
-
-        switch ($current) {
-            case 'self@':
-            case '@self':
-                if (!empty($parts)) {
-                    switch ($parts[0]) {
-                        case 'modular':
-                            // @self.modular: false (alternative to @self.children)
-                            if (!empty($params) && $params[0] === false) {
-                                $results = $this->children()->nonModular();
-                                break;
-                            }
-                            $results = $this->children()->modular();
-                            break;
-                        case 'children':
-                            $results = $this->children()->nonModular();
-                            break;
-                        case 'all':
-                            $results = $this->children();
-                            break;
-                        case 'parent':
-                            $collection = new Collection();
-                            $results = $collection->addPage($this->parent());
-                            break;
-                        case 'siblings':
-                            if (!$this->parent()) {
-                                return new Collection();
-                            }
-                            $results = $this->parent()->children()->remove($this->path());
-                            break;
-                        case 'descendants':
-                            $results = $pages->all($this)->remove($this->path())->nonModular();
-                            break;
-                    }
-                }
-
-
-                break;
-
-            case 'page@':
-            case '@page':
-                $page = null;
-
-                if (!empty($params)) {
-                    $page = $this->find($params[0]);
-                }
-
-                // safety check in case page is not found
-                if (!isset($page)) {
-                    return $results;
-                }
-
-                // Handle a @page.descendants
-                if (!empty($parts)) {
-                    switch ($parts[0]) {
-                        case 'modular':
-                            $results = new Collection();
-                            foreach ($page->children() as $child) {
-                                $results = $results->addPage($child);
-                            }
-                            $results->modular();
-                            break;
-                        case 'page':
-                        case 'self':
-                            $results = new Collection();
-                            $results = $results->addPage($page);
-                            break;
-
-                        case 'descendants':
-                            $results = $pages->all($page)->remove($page->path())->nonModular();
-                            break;
-
-                        case 'children':
-                            $results = $page->children()->nonModular();
-                            break;
-                    }
-                } else {
-                    $results = $page->children()->nonModular();
-                }
-
-                break;
-
-            case 'root@':
-            case '@root':
-                if (!empty($parts) && $parts[0] === 'descendants') {
-                    $results = $pages->all($pages->root())->nonModular();
-                } else {
-                    $results = $pages->root()->children()->nonModular();
-                }
-                break;
-
-            case 'taxonomy@':
-            case '@taxonomy':
-                // Gets a collection of pages by using one of the following formats:
-                // @taxonomy.category: blog
-                // @taxonomy.category: [ blog, featured ]
-                // @taxonomy: { category: [ blog, featured ], level: 1 }
-
-                /** @var Taxonomy $taxonomy_map */
-                $taxonomy_map = Grav::instance()['taxonomy'];
-
-                if (!empty($parts)) {
-                    $params = [implode('.', $parts) => $params];
-                }
-                $results = $taxonomy_map->findTaxonomy($params);
-                break;
-        }
-
-        if ($only_published) {
-            $results = $results->published();
-        }
-
-        return $results;
     }
 
     /**
@@ -3170,7 +2819,7 @@ class Page implements PageInterface
     /**
      * Gets the action.
      *
-     * @return string The Action string.
+     * @return string|null The Action string.
      */
     public function getAction()
     {

system/src/Grav/Common/Page/Pages.php

@@ -13,13 +13,18 @@ use Grav\Common\Cache;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Blueprints;
+use Grav\Common\Debugger;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Language\Language;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Taxonomy;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Plugin\Admin;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@@ -28,64 +33,46 @@ use Collator;
 
 class Pages
 {
-    /**
+    /** @var Grav */
-     * @var Grav
-     */
     protected $grav;
 
-    /**
+    /** @var Flex */
-     * @var array|PageInterface[]
+    protected $flex;
-     */
+
+    /** @var array|PageInterface[] */
     protected $instances;
 
-    /**
+    /** @var array */
-     * @var array|string[]
-     */
     protected $children;
 
-    /**
+    /** @var string */
-     * @var string
-     */
     protected $base = '';
 
-    /**
+    /** @var string[] */
-     * @var array|string[]
-     */
     protected $baseRoute = [];
 
-    /**
+    /** @var string[] */
-     * @var array|string[]
-     */
     protected $routes = [];
 
-    /**
+    /** @var array */
-     * @var array
-     */
     protected $sort;
 
-    /**
+    /** @var Blueprints */
-     * @var Blueprints
-     */
     protected $blueprints;
 
-    /**
+    /** @var bool */
-     * @var int
+    protected $enable_pages = true;
-     */
+
+    /** @var int */
     protected $last_modified;
 
-    /**
+    /** @var string[] */
-     * @var array|string[]
-     */
     protected $ignore_files;
 
-    /**
+    /** @var string[] */
-     * @var array|string[]
-     */
     protected $ignore_folders;
 
-    /**
+    /** @var bool */
-     * @var bool
-     */
     protected $ignore_hidden;
 
     /** @var string */
@@ -93,16 +80,13 @@ class Pages
 
     protected $pages_cache_id;
 
+    /** @var bool */
     protected $initialized = false;
 
-    /**
+    /** @var Types */
-     * @var Types
-     */
     static protected $types;
 
-    /**
+    /** @var string|null */
-     * @var string
-     */
     static protected $home_route;
 
     /**
@@ -115,6 +99,26 @@ class Pages
         $this->grav = $c;
     }
 
+    /**
+     * Method used in admin to disable frontend pages from being initialized.
+     */
+    public function disablePages(): void
+    {
+        $this->enable_pages = false;
+    }
+
+    /**
+     * Method used in admin to later load frontend pages.
+     */
+    public function enablePages(): void
+    {
+        if (!$this->enable_pages) {
+            $this->enable_pages = true;
+
+            $this->buildPages();
+        }
+    }
+
     /**
      * Get or set base path for the pages.
      *
@@ -249,6 +253,9 @@ class Pages
         $this->ignore_files = $config->get('system.pages.ignore_files');
         $this->ignore_folders = $config->get('system.pages.ignore_folders');
         $this->ignore_hidden = $config->get('system.pages.ignore_hidden');
+        if ($config->get('system.pages.type') === 'flex') {
+            $this->flex = $this->grav['flex_objects'] ?? null;
+        }
 
         $this->instances = [];
         $this->children = [];
@@ -280,11 +287,23 @@ class Pages
     /**
      * Returns a list of all pages.
      *
-     * @return array|PageInterface[]
+     * @return PageInterface[]
      */
     public function instances()
     {
-        return $this->instances;
+        if (!$this->flex) {
+            return $this->instances;
+        }
+
+        $list = [];
+        foreach ($this->instances as $path => $instance) {
+            if (!$instance instanceof PageInterface) {
+                $instance = $this->flex->getObject($instance);
+            }
+            $list[$path] = $instance;
+        }
+
+        return $list;
     }
 
     /**
@@ -305,18 +324,301 @@ class Pages
      */
     public function addPage(PageInterface $page, $route = null)
     {
-        if (!isset($this->instances[$page->path()])) {
+        $path = $page->path() ?? '';
-            $this->instances[$page->path()] = $page;
+        if (!isset($this->instances[$path])) {
+            $this->instances[$path] = $page;
         }
         $route = $page->route($route);
         if ($page->parent()) {
-            $this->children[$page->parent()->path()][$page->path()] = ['slug' => $page->slug()];
+            $parentPath = $page->parent()->path() ?? '';
+            $this->children[$parentPath][$path] = ['slug' => $page->slug()];
         }
-        $this->routes[$route] = $page->path();
+        $this->routes[$route] = $path;
 
         $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
     }
 
+    /**
+     * Get a collection of pages in the given context.
+     *
+     * @param array $params
+     * @param array $context
+     * @return PageCollectionInterface|Collection
+     */
+    public function getCollection(array $params = [], array $context = [])
+    {
+        if (!isset($params['items'])) {
+            return new Collection();
+        }
+
+        /** @var Config $config */
+        $config = $this->grav['config'];
+
+        $context += [
+            'event' => true,
+            'pagination' => true,
+            'url_taxonomy_filters' => $config->get('system.pages.url_taxonomy_filters'),
+            'taxonomies' => (array)$config->get('site.taxonomies'),
+            'pagination_page' => 1,
+            'self' => null,
+        ];
+
+        // Include taxonomies from the URL if requested.
+        $process_taxonomy = $params['url_taxonomy_filters'] ?? $context['url_taxonomy_filters'];
+        if ($process_taxonomy) {
+            /** @var Uri $uri */
+            $uri = $this->grav['uri'];
+            foreach ($context['taxonomies'] as $taxonomy) {
+                $param = $uri->param(rawurlencode($taxonomy));
+                $items = $param ? explode(',', $param) : [];
+                foreach ($items as $item) {
+                    $params['taxonomies'][$taxonomy][] = htmlspecialchars_decode(rawurldecode($item), ENT_QUOTES);
+                }
+            }
+        }
+
+        $pagination = $params['pagination'] ?? $context['pagination'];
+        if ($pagination && !isset($params['page'])) {
+            /** @var Uri $uri */
+            $uri = $this->grav['uri'];
+            $context['pagination_page'] = $uri->currentPage();
+        }
+
+        $collection = $this->evaluate($params['items'], $context['self']);
+        $collection->setParams($params);
+
+        // Filter by taxonomies.
+        foreach ($params['taxonomies'] ?? [] as $taxonomy => $items) {
+            foreach ($collection as $page) {
+                // Don't filter modular pages
+                if ($page->modular()) {
+                    continue;
+                }
+
+                $test = $page->taxonomy()[$taxonomy] ?? [];
+                foreach ($items as $item) {
+                    if (!$test || !\in_array($item, $test, true)) {
+                        $collection->remove($page->path());
+                    }
+                }
+            }
+        }
+
+        // Remove any inclusive sets from filter.
+        $filters = $params['filter'] ?? [];
+
+        // Assume published=true if not set.
+        if (!isset($filters['published']) && !isset($filters['non-published'])) {
+            $filters['published'] = true;
+        }
+        foreach (['published', 'visible', 'modular', 'routable'] as $type) {
+            $var = "non-{$type}";
+            if (isset($filters[$type], $filters[$var]) && $filters[$type] && $filters[$var]) {
+                unset($filters[$type], $filters[$var]);
+            }
+        }
+
+        // Filter the collection
+        foreach ($filters as $type => $filter) {
+            switch ($type) {
+                case 'published':
+                    if ((bool)$filter) {
+                        $collection = $collection->published();
+                    }
+                    break;
+                case 'non-published':
+                    if ((bool)$filter) {
+                        $collection = $collection->nonPublished();
+                    }
+                    break;
+                case 'visible':
+                    if ((bool)$filter) {
+                        $collection = $collection->visible();
+                    }
+                    break;
+                case 'non-visible':
+                    if ((bool)$filter) {
+                        $collection = $collection->nonVisible();
+                    }
+                    break;
+                case 'modular':
+                    if ((bool)$filter) {
+                        $collection = $collection->modular();
+                    }
+                    break;
+                case 'non-modular':
+                    if ((bool)$filter) {
+                        $collection = $collection->nonModular();
+                    }
+                    break;
+                case 'routable':
+                    if ((bool)$filter) {
+                        $collection = $collection->routable();
+                    }
+                    break;
+                case 'non-routable':
+                    if ((bool)$filter) {
+                        $collection = $collection->nonRoutable();
+                    }
+                    break;
+                case 'type':
+                    $collection = $collection->ofType($filter);
+                    break;
+                case 'types':
+                    $collection = $collection->ofOneOfTheseTypes($filter);
+                    break;
+                case 'access':
+                    $collection = $collection->ofOneOfTheseAccessLevels($filter);
+                    break;
+            }
+        }
+
+        if (isset($params['dateRange'])) {
+            $start = $params['dateRange']['start'] ?? 0;
+            $end = $params['dateRange']['end'] ?? false;
+            $field = $params['dateRange']['field'] ?? false;
+            $collection = $collection->dateRange($start, $end, $field);
+        }
+
+        if (isset($params['order'])) {
+            $by = $params['order']['by'] ?? 'default';
+            $dir = $params['order']['dir'] ?? 'asc';
+            $custom = $params['order']['custom'] ?? null;
+            $sort_flags = $params['order']['sort_flags'] ?? null;
+
+            if (is_array($sort_flags)) {
+                $sort_flags = array_map('constant', $sort_flags); //transform strings to constant value
+                $sort_flags = array_reduce($sort_flags, function ($a, $b) {
+                    return $a | $b;
+                }, 0); //merge constant values using bit or
+            }
+
+            $collection = $collection->order($by, $dir, $custom, $sort_flags);
+        }
+
+        // New Custom event to handle things like pagination.
+        if ($context['event']) {
+            $this->grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection]));
+        }
+
+        // Slice and dice the collection if pagination is required
+        if ($pagination) {
+            $params = $collection->params();
+
+            $limit = $params['limit'] ?? 0;
+            $start = !empty($params['pagination']) ? (($params['page'] ?? $context['pagination_page']) - 1) * $limit : 0;
+
+            if ($limit && $collection->count() > $limit) {
+                $collection->slice($start, $limit);
+            }
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @param $value
+     * @param PageInterface|null $self
+     * @return Collection
+     */
+    protected function evaluate($value, PageInterface $self = null)
+    {
+        // Parse command.
+        if (is_string($value)) {
+            // Format: @command.param
+            $cmd = $value;
+            $params = [];
+        } elseif (is_array($value) && count($value) === 1 && !is_int(key($value))) {
+            // Format: @command.param: { attr1: value1, attr2: value2 }
+            $cmd = (string)key($value);
+            $params = (array)current($value);
+        } else {
+            $result = [];
+            foreach ((array)$value as $key => $val) {
+                if (is_int($key)) {
+                    $result = $result + $this->evaluate($val, $self)->toArray();
+                } else {
+                    $result = $result + $this->evaluate([$key => $val], $self)->toArray();
+                }
+
+            }
+
+            return new Collection($result);
+        }
+
+        $parts = explode('.', $cmd);
+        $scope = array_shift($parts);
+        $type = $parts[0] ?? null;
+
+        /** @var PageInterface|null $page */
+        $page = null;
+        switch ($scope) {
+            case 'self@':
+            case '@self':
+                $page = $self;
+                break;
+
+            case 'page@':
+            case '@page':
+                $page = isset($params[0]) ? $this->find($params[0]) : null;
+                break;
+
+            case 'root@':
+            case '@root':
+                $page = $this->root();
+                break;
+
+            case 'taxonomy@':
+            case '@taxonomy':
+                // Gets a collection of pages by using one of the following formats:
+                // @taxonomy.category: blog
+                // @taxonomy.category: [ blog, featured ]
+                // @taxonomy: { category: [ blog, featured ], level: 1 }
+
+                /** @var Taxonomy $taxonomy_map */
+                $taxonomy_map = Grav::instance()['taxonomy'];
+
+                if (!empty($parts)) {
+                    $params = [implode('.', $parts) => $params];
+                }
+
+                return $taxonomy_map->findTaxonomy($params);
+        }
+
+        if (!$page) {
+            return new Collection();
+        }
+
+        // Handle '@page', '@page.modular: false', '@self' and '@self.modular: false'.
+        if (null === $type || ($type === 'modular' && ($params[0] ?? null) === false)) {
+            $type = 'children';
+        }
+
+        switch ($type) {
+            case 'all':
+                return $page->children();
+            case 'modular':
+                return $page->children()->modular();
+            case 'children':
+                return $page->children()->nonModular();
+            case 'page':
+            case 'self':
+                return (new Collection())->addPage($page);
+            case 'parent':
+                $parent = $page->parent();
+                $collection = new Collection();
+                return $parent ? $collection->addPage($parent) : $collection;
+            case 'siblings':
+                $parent = $page->parent();
+                return $parent ? $parent->children()->remove($page->path()) : new Collection();
+            case 'descendants':
+                return $this->all($page)->remove($page->path())->nonModular();
+            default:
+                // Unknown type; return empty collection.
+                return new Collection();
+        }
+    }
+
     /**
      * Sort sub-pages in a page.
      *
@@ -397,7 +699,15 @@ class Pages
      */
     public function get($path)
     {
-        return $this->instances[(string)$path] ?? null;
+        $instance = $this->instances[(string)$path] ?? null;
+        if (\is_string($instance)) {
+            $instance = $this->flex ? $this->flex->getObject($instance) : null;
+        }
+        if ($instance && !$instance instanceof PageInterface) {
+            throw new \RuntimeException('Routing failed on unknown type', 500);
+        }
+
+        return $instance;
     }
 
     /**
@@ -575,7 +885,7 @@ class Pages
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
 
-        return $this->instances[rtrim($locator->findResource('page://'), DS)];
+        return $this->get(rtrim($locator->findResource('page://'), '/'));
     }
 
     /**
@@ -713,13 +1023,9 @@ class Pages
             } else {
                 $extra  = $showSlug ? '(' . $current->slug() . ') ' : '';
                 $option = str_repeat('—-', $level). '▸ ' . $extra . $current->title();
-
-
             }
 
             $list[$route] = $option;
-
-
         }
 
         if ($limitLevels === false || ($level+1 < $limitLevels)) {
@@ -824,20 +1130,23 @@ class Pages
      *
      * @return array
      */
-    public static function pageTypes()
+    public static function pageTypes($type = null)
     {
-        if (isset(Grav::instance()['admin'])) {
+        if (null === $type && isset(Grav::instance()['admin'])) {
             /** @var Admin $admin */
             $admin = Grav::instance()['admin'];
 
             /** @var PageInterface $page */
-            $page = $admin->getPage($admin->route);
+            $page = $admin->page();
 
-            if ($page && $page->modular()) {
+            $type = $page && $page->modular() ? 'modular' : 'standard';
+        }
+
+        switch ($type) {
+            case 'standard':
+                return static::types();
+            case 'modular':
                 return static::modularTypes();
-            }
-
-            return static::types();
         }
 
         return [];
@@ -943,26 +1252,152 @@ class Pages
      *
      * @internal
      */
-    protected function buildPages()
+    protected function buildPages(): void
     {
-        $this->sort = [];
+        if ($this->enable_pages === false) {
+            $page = $this->buildRootPage();
+            $this->instances[$page->path()] = $page;
 
+            return;
+        }
+
+        /** @var Debugger $debugger */
+        $debugger = $this->grav['debugger'];
+        $debugger->startTimer('build-pages', 'Init frontend routes');
+
+        $directory = $this->flex ? $this->flex->getDirectory('grav-pages') : null;
+
+        if ($directory) {
+            $this->buildFlexPages($directory);
+        } else {
+            $this->buildRegularPages();
+        }
+        $debugger->stopTimer('build-pages');
+    }
+
+    protected function buildFlexPages(FlexDirectory $directory)
+    {
         /** @var Config $config */
         $config = $this->grav['config'];
 
+        // TODO: right now we are just emulating normal pages, it is inefficient and bad... but works!
+        $collection = $directory->getIndex();
+        $cache = $directory->getCache('index');
+
         /** @var Language $language */
         $language = $this->grav['language'];
 
+        $this->pages_cache_id = 'pages-' . md5($collection->getCacheChecksum() . $language->getActive() . $config->checksum());
+
+        $cached = $cache->get($this->pages_cache_id);
+
+        if ($cached && $this->getVersion() === $cached[0]) {
+            [, $this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort] = $cached;
+
+            /** @var Taxonomy $taxonomy */
+            $taxonomy = $this->grav['taxonomy'];
+            $taxonomy->taxonomy($taxonomy_map);
+
+            return;
+        }
+
+        $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
+
+        $root = $this->buildRootPage();
+        $root_path = $root->path();
+        $instances = [$root_path => $root];
+
+        if ($config->get('system.pages.events.page')) {
+            $this->grav->fireEvent('onBuildPagesInitialized');
+        }
+
+
+        $children = [];
+        /**
+         * @var string $key
+         * @var PageInterface|FlexObjectInterface $page
+         */
+        foreach ($collection as $key => $page) {
+            if ($config->get('system.pages.events.page')) {
+                $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
+            }
+
+            $path = $page->path();
+            if ($path === $root_path) {
+                continue;
+            }
+            $parent = dirname($path);
+
+            $instances[$path] = $page->getFlexKey();
+            $children[$parent][$path] = ['slug' => $page->slug()];
+            if (!isset($children[$path])) {
+                $children[$path] = [];
+            }
+        }
+
+        foreach ($children as $path => $list) {
+            $page = $instances[$path] ?? null;
+            if (null === $page) {
+                continue;
+            }
+            if ($config->get('system.pages.events.page')) {
+                $this->grav->fireEvent('onFolderProcessed', new Event(['page' => $page]));
+            }
+        }
+
+        $this->instances = $instances;
+        $this->children = $children;
+        $this->sort = [];
+
+        $this->buildRoutes();
+
+        // cache if needed
+        if (isset($cache)) {
+            /** @var Taxonomy $taxonomy */
+            $taxonomy = $this->grav['taxonomy'];
+            $taxonomy_map = $taxonomy->taxonomy();
+
+            // save pages, routes, taxonomy, and sort to cache
+            $cache->set($this->pages_cache_id, [$this->getVersion(), $this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort]);
+        }
+    }
+
+
+    protected function buildRootPage()
+    {
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        $page = new Page();
+        $page->path($locator->findResource('page://'));
+        $page->orderDir($config->get('system.pages.order.dir'));
+        $page->orderBy($config->get('system.pages.order.by'));
+        $page->modified(0);
+        $page->routable(false);
+        $page->template('default');
+        $page->extension('.md');
+
+        return $page;
+    }
+
+    protected function buildRegularPages()
+    {
+        /** @var Config $config */
+        $config = $this->grav['config'];
+
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
 
         $pages_dir = $locator->findResource('page://');
 
         if ($config->get('system.cache.enabled')) {
-            /** @var Cache $cache */
+            /** @var Language $language */
-            $cache = $this->grav['cache'];
+            $language = $this->grav['language'];
-            /** @var Taxonomy $taxonomy */
-            $taxonomy = $this->grav['taxonomy'];
 
             // how should we check for last modified? Default is by file
             switch ($this->check_method) {
@@ -982,22 +1417,25 @@ class Pages
 
             $this->pages_cache_id = md5($pages_dir . $hash . $language->getActive() . $config->checksum());
 
-            list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($this->pages_cache_id);
+            /** @var Cache $cache */
-            if (!$this->instances) {
+            $cache = $this->grav['cache'];
-                $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
+            $cached = $cache->fetch($this->pages_cache_id);
+            if ($cached && $this->getVersion() === $cached[0]) {
+                [, $this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort] = $cached;
 
-                // recurse pages and cache result
+                /** @var Taxonomy $taxonomy */
-                $this->resetPages($pages_dir);
+                $taxonomy = $this->grav['taxonomy'];
-
-            } else {
-                // If pages was found in cache, set the taxonomy
-                $this->grav['debugger']->addMessage('Page cache hit.');
                 $taxonomy->taxonomy($taxonomy_map);
+
+                return;
             }
+
+            $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
         } else {
-            $this->recurse($pages_dir);
+            $this->grav['debugger']->addMessage('Page cache disabled, rebuilding pages..');
-            $this->buildRoutes();
         }
+
+        $this->resetPages($pages_dir);
     }
 
     /**
@@ -1007,6 +1445,7 @@ class Pages
      */
     public function resetPages($pages_dir)
     {
+        $this->sort = [];
         $this->recurse($pages_dir);
         $this->buildRoutes();
 
@@ -1018,7 +1457,7 @@ class Pages
             $taxonomy = $this->grav['taxonomy'];
 
             // save pages, routes, taxonomy, and sort to cache
-            $cache->save($this->pages_cache_id, [$this->instances, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort]);
+            $cache->save($this->pages_cache_id, [$this->getVersion(), $this->instances, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort]);
         }
     }
 
@@ -1063,7 +1502,7 @@ class Pages
             if ($parent && $page->path()) {
                 $this->children[$parent->path()][$page->path()] = ['slug' => $page->slug()];
             }
-        } else {
+        } elseif ($parent !== null) {
             throw new \RuntimeException('Fatal error when creating page instances.');
         }
 
@@ -1161,7 +1600,6 @@ class Pages
             }
         }
 
-
         if (!$content_exists) {
             // Set routability to false if no page found
             $page->routable(false);
@@ -1203,44 +1641,49 @@ class Pages
 
         // Get the home route
         $home = self::resetHomeRoute();
-
         // Build routes and taxonomy map.
         /** @var PageInterface $page */
-        foreach ($this->instances as $page) {
+        foreach ($this->instances as $path => $page) {
-            if (!$page->root()) {
+            if (\is_string($page)) {
-                // process taxonomy
+                $page = $this->get($path);
-                $taxonomy->addTaxonomy($page);
+            }
 
-                $route = $page->route();
+            if (!$page || $page->root()) {
-                $raw_route = $page->rawRoute();
+                continue;
-                $page_path = $page->path();
+            }
 
-                // add regular route
+            // process taxonomy
-                $this->routes[$route] = $page_path;
+            $taxonomy->addTaxonomy($page);
 
-                // add raw route
+            $route = $page->route();
-                if ($raw_route !== $route) {
+            $raw_route = $page->rawRoute();
-                    $this->routes[$raw_route] = $page_path;
+            $page_path = $page->path();
-                }
 
-                // add canonical route
+            // add regular route
-                $route_canonical = $page->routeCanonical();
+            $this->routes[$route] = $page_path;
-                if ($route_canonical && ($route !== $route_canonical)) {
-                    $this->routes[$route_canonical] = $page_path;
-                }
 
-                // add aliases to routes list if they are provided
+            // add raw route
-                $route_aliases = $page->routeAliases();
+            if ($raw_route !== $route) {
-                if ($route_aliases) {
+                $this->routes[$raw_route] = $page_path;
-                    foreach ($route_aliases as $alias) {
+            }
-                        $this->routes[$alias] = $page_path;
+
-                    }
+            // add canonical route
+            $route_canonical = $page->routeCanonical();
+            if ($route_canonical && ($route !== $route_canonical)) {
+                $this->routes[$route_canonical] = $page_path;
+            }
+
+            // add aliases to routes list if they are provided
+            $route_aliases = $page->routeAliases();
+            if ($route_aliases) {
+                foreach ($route_aliases as $alias) {
+                    $this->routes[$alias] = $page_path;
                 }
             }
         }
 
         // Alias and set default route to home page.
-        $homeRoute = '/' . $home;
+        $homeRoute = "/{$home}";
         if ($home && isset($this->routes[$homeRoute])) {
             $this->routes['/'] = $this->routes[$homeRoute];
             $this->get($this->routes[$homeRoute])->route('/');
@@ -1272,7 +1715,7 @@ class Pages
         }
 
         foreach ($pages as $key => $info) {
-            $child = $this->instances[$key] ?? null;
+            $child = $this->get($key);
             if (!$child) {
                 throw new \RuntimeException("Page does not exist: {$key}");
             }
@@ -1307,7 +1750,10 @@ class Pages
                     $list[$key] = $child->folder();
                     break;
                 case (is_string($header_query[0])):
-                    $child_header = new Header((array)$child->header());
+                    $child_header = $child->header();
+                    if (!$child_header instanceof Header) {
+                        $child_header = new Header((array)$child_header);
+                    }
                     $header_value = $child_header->get($header_query[0]);
                     if (is_array($header_value)) {
                         $list[$key] = implode(',',$header_value);
@@ -1408,6 +1854,11 @@ class Pages
         return $new;
     }
 
+    protected function getVersion()
+    {
+        return $this->flex ? 'flex' : 'page';
+    }
+
     /**
      * Get the Pages cache ID
      *

system/src/Grav/Common/Page/Traits/PageFormTrait.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace Grav\Common\Page\Traits;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
+trait PageFormTrait
+{
+    private $_forms;
+
+    /**
+     * Return all the forms which are associated to this page.
+     *
+     * Forms are returned as [name => blueprint, ...], where blueprint follows the regular form blueprint format.
+     *
+     * @return array
+     */
+    public function getForms(): array
+    {
+        if (null === $this->_forms) {
+            $header = $this->header();
+
+            // Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
+            $grav = Grav::instance();
+            $grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
+
+            $rules = $header->rules ?? null;
+            if (!\is_array($rules)) {
+                $rules = [];
+            }
+
+            $forms = [];
+
+            // First grab page.header.form
+            $form = $this->normalizeForm($header->form ?? null, null, $rules);
+            if ($form) {
+                $forms[$form['name']] = $form;
+            }
+
+            // Append page.header.forms (override singular form if it clashes)
+            $headerForms = $header->forms ?? null;
+            if (\is_array($headerForms)) {
+                foreach ($headerForms as $name => $form) {
+                    $form = $this->normalizeForm($form, $name, $rules);
+                    if ($form) {
+                        $forms[$form['name']] = $form;
+                    }
+                }
+            }
+
+            $this->_forms = $forms;
+        }
+
+        return $this->_forms;
+    }
+
+    /**
+     * Add forms to this page.
+     *
+     * @param array $new
+     * @param bool $override
+     * @return $this
+     */
+    public function addForms(array $new, $override = true)
+    {
+        // Initialize forms.
+        $this->forms();
+
+        foreach ($new as $name => $form) {
+            $form = $this->normalizeForm($form, $name);
+            $name = $form['name'] ?? null;
+            if ($name && ($override || !isset($this->_forms[$name]))) {
+                $this->_forms[$name] = $form;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Alias of $this->getForms();
+     *
+     * @return array
+     */
+    public function forms(): array
+    {
+        return $this->getForms();
+    }
+
+    /**
+     * @param array|null $form
+     * @param string|null $name
+     * @param array $rules
+     * @return array|null
+     */
+    protected function normalizeForm($form, $name = null, array $rules = []): ?array
+    {
+        if (!\is_array($form)) {
+            return null;
+        }
+
+        // Ignore numeric indexes on name.
+        if (!$name || (string)(int)$name === (string)$name) {
+            $name = null;
+        }
+
+        $name = $name ?? $form['name'] ?? $this->slug();
+
+        $formRules = $form['rules'] ?? null;
+        if (!\is_array($formRules)) {
+            $formRules = [];
+        }
+
+        return ['name' => $name, 'rules' => $rules + $formRules] + $form;
+    }
+
+    abstract public function header($var = null);
+    abstract public function slug($var = null);
+}

system/src/Grav/Common/Processors/AssetsProcessor.php

@@ -18,7 +18,7 @@ class AssetsProcessor extends ProcessorBase
     public $id = '_assets';
     public $title = 'Assets';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['assets']->init();

system/src/Grav/Common/Processors/BackupsProcessor.php

@@ -18,7 +18,7 @@ class BackupsProcessor extends ProcessorBase
     public $id = '_backups';
     public $title = 'Backups';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $backups = $this->container['backups'];

system/src/Grav/Common/Processors/ConfigurationProcessor.php

@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class ConfigurationProcessor extends ProcessorBase
-{
-    public $id = '_config';
-    public $title = 'Configuration';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['config']->init();
-        $this->container['plugins']->setup();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}

system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php

@@ -19,7 +19,7 @@ class DebuggerAssetsProcessor extends ProcessorBase
     public $id = 'debugger_assets';
     public $title = 'Debugger Assets';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['debugger']->addAssets();

system/src/Grav/Common/Processors/DebuggerProcessor.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class DebuggerProcessor extends ProcessorBase
-{
-    public $id = '_debugger';
-    public $title = 'Init Debugger';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['debugger']->init();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}

system/src/Grav/Common/Processors/ErrorsProcessor.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class ErrorsProcessor extends ProcessorBase
-{
-    public $id = '_errors';
-    public $title = 'Error Handlers Reset';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['errors']->resetHandlers();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}

system/src/Grav/Common/Processors/InitializeProcessor.php

@@ -10,25 +10,119 @@
 namespace Grav\Common\Processors;
 
 use Grav\Common\Config\Config;
+use Grav\Common\Debugger;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
+use Grav\Framework\Psr7\Response;
 use Grav\Framework\Session\Exceptions\SessionException;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\SyslogHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 class InitializeProcessor extends ProcessorBase
 {
-    public $id = 'init';
+    public $id = '_init';
     public $title = 'Initialize';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $this->startTimer();
+        $config = $this->initializeConfig();
+        $this->initializeLogger($config);
+        $this->initializeErrors();
 
+        $this->startTimer('_debugger', 'Init Debugger');
+        /** @var Debugger $debugger */
+        $debugger = $this->container['debugger']->init();
+        // Clockwork integration.
+        $clockwork = $debugger->getClockwork();
+        if ($clockwork) {
+            $server = $request->getServerParams();
+//            $baseUri = str_replace('\\', '/', dirname(parse_url($server['SCRIPT_NAME'], PHP_URL_PATH)));
+//            if ($baseUri === '/') {
+//                $baseUri = '';
+//            }
+            $requestTime = $server['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME;
+
+            $request = $request->withAttribute('request_time', $requestTime);
+
+            // Handle clockwork API calls.
+            $uri = $request->getUri();
+            if (Utils::contains($uri->getPath(), '/__clockwork/')) {
+                return $debugger->debuggerRequest($request);
+            }
+
+            $this->container['clockwork'] = $clockwork;
+        }
+        $this->stopTimer('_debugger');
+
+        $this->initialize($config);
+        $this->initializeSession($config);
+
+        // Wrap call to next handler so that debugger can profile it.
+        /** @var Response $response */
+        $response = $debugger->profile(function () use ($handler, $request) {
+            return $handler->handle($request);
+        });
+
+        // Log both request and response and return the response.
+        return $debugger->logRequest($request, $response);
+    }
+
+    protected function initializeConfig(): Config
+    {
+        $this->startTimer('_config', 'Configuration');
+
+        // Initialize Configuration
+        $grav = $this->container;
         /** @var Config $config */
-        $config = $this->container['config'];
+        $config = $grav['config'];
-        $config->debug();
+        $config->init();
+        $grav['plugins']->setup();
+
+        $this->stopTimer('_config');
+
+        return $config;
+    }
+
+    protected function initializeLogger(Config $config): void
+    {
+        $this->startTimer('_logger', 'Logger');
+
+        // Initialize Logging
+        $grav = $this->container;
+
+        switch ($config->get('system.log.handler', 'file')) {
+            case 'syslog':
+                $log = $grav['log'];
+                $log->popHandler();
+
+                $facility = $config->get('system.log.syslog.facility', 'local6');
+                $logHandler = new SyslogHandler('grav', $facility);
+                $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
+                $logHandler->setFormatter($formatter);
+
+                $log->pushHandler($logHandler);
+                break;
+        }
+
+        $this->stopTimer('_logger');
+    }
+
+    protected function initializeErrors(): void
+    {
+        $this->startTimer('_errors', 'Error Handlers Reset');
+
+        // Initialize Error Handlers
+        $this->container['errors']->resetHandlers();
+
+        $this->stopTimer('_errors');
+    }
+
+    protected function initialize(Config $config): void
+    {
+        $this->startTimer('_init', 'Initialize');
 
         // Use output buffering to prevent headers from being sent too early.
         ob_start();
@@ -43,21 +137,6 @@ class InitializeProcessor extends ProcessorBase
             date_default_timezone_set($timezone);
         }
 
-        // FIXME: Initialize session should happen later after plugins have been loaded. This is a workaround to fix session issues in AWS.
-        if (isset($this->container['session']) && $config->get('system.session.initialize', true)) {
-            // TODO: remove in 2.0.
-            $this->container['accounts'];
-
-            try {
-                $this->container['session']->init();
-            } catch (SessionException $e) {
-                $this->container['session']->init();
-                $message = 'Session corruption detected, restarting session...';
-                $this->addMessage($message);
-                $this->container['messages']->add($message, 'error');
-            }
-        }
-
         /** @var Uri $uri */
         $uri = $this->container['uri'];
         $uri->init();
@@ -73,8 +152,29 @@ class InitializeProcessor extends ProcessorBase
         }
 
         $this->container->setLocale();
-        $this->stopTimer();
 
-        return $handler->handle($request);
+        $this->stopTimer('_init');
+    }
+
+    protected function initializeSession(Config $config): void
+    {
+        // FIXME: Initialize session should happen later after plugins have been loaded. This is a workaround to fix session issues in AWS.
+        if (isset($this->container['session']) && $config->get('system.session.initialize', true)) {
+            $this->startTimer('_session', 'Start Session');
+
+            // TODO: remove in 2.0.
+            $this->container['accounts'];
+
+            try {
+                $this->container['session']->init();
+            } catch (SessionException $e) {
+                $this->container['session']->init();
+                $message = 'Session corruption detected, restarting session...';
+                $this->addMessage($message);
+                $this->container['messages']->add($message, 'error');
+            }
+
+            $this->stopTimer('_session');
+        }
     }
 }

system/src/Grav/Common/Processors/LoggerProcessor.php

@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Grav\Common\Config\Config;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\SyslogHandler;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class LoggerProcessor extends ProcessorBase
-{
-    public $id = '_logger';
-    public $title = 'Logger';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-
-        $grav = $this->container;
-
-        /** @var Config $config */
-        $config = $grav['config'];
-
-        switch ($config->get('system.log.handler', 'file')) {
-            case 'syslog':
-                $log = $grav['log'];
-                $log->popHandler();
-
-                $facility = $config->get('system.log.syslog.facility', 'local6');
-                $logHandler = new SyslogHandler('grav', $facility);
-                $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
-                $logHandler->setFormatter($formatter);
-
-                $log->pushHandler($logHandler);
-                break;
-        }
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}

system/src/Grav/Common/Processors/PagesProcessor.php

@@ -20,7 +20,7 @@ class PagesProcessor extends ProcessorBase
     public $id = 'pages';
     public $title = 'Pages';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 

system/src/Grav/Common/Processors/PluginsProcessor.php

@@ -18,7 +18,7 @@ class PluginsProcessor extends ProcessorBase
     public $id = 'plugins';
     public $title = 'Plugins';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         // TODO: remove in 2.0.

system/src/Grav/Common/Processors/ProcessorBase.php

@@ -25,21 +25,21 @@ abstract class ProcessorBase implements ProcessorInterface
         $this->container = $container;
     }
 
-    protected function startTimer($id = null, $title = null)
+    protected function startTimer($id = null, $title = null): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];
         $debugger->startTimer($id ?? $this->id, $title ?? $this->title);
     }
 
-    protected function stopTimer($id = null)
+    protected function stopTimer($id = null): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];
         $debugger->stopTimer($id ?? $this->id);
     }
 
-    protected function addMessage($message, $label = 'info', $isString = true)
+    protected function addMessage($message, $label = 'info', $isString = true): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];

system/src/Grav/Common/Processors/RenderProcessor.php

@@ -20,7 +20,7 @@ class RenderProcessor extends ProcessorBase
     public $id = 'render';
     public $title = 'Render';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 

system/src/Grav/Common/Processors/RequestProcessor.php

@@ -20,7 +20,7 @@ class RequestProcessor extends ProcessorBase
     public $id = 'request';
     public $title = 'Request';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 

system/src/Grav/Common/Processors/SchedulerProcessor.php

@@ -19,7 +19,7 @@ class SchedulerProcessor extends ProcessorBase
     public $id = '_scheduler';
     public $title = 'Scheduler';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $scheduler = $this->container['scheduler'];

system/src/Grav/Common/Processors/TasksProcessor.php

@@ -19,7 +19,7 @@ class TasksProcessor extends ProcessorBase
     public $id = 'tasks';
     public $title = 'Tasks';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 

system/src/Grav/Common/Processors/ThemesProcessor.php

@@ -18,7 +18,7 @@ class ThemesProcessor extends ProcessorBase
     public $id = 'themes';
     public $title = 'Themes';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['themes']->init();

system/src/Grav/Common/Processors/TwigProcessor.php

@@ -18,7 +18,7 @@ class TwigProcessor extends ProcessorBase
     public $id = 'twig';
     public $title = 'Twig';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['twig']->init();

system/src/Grav/Common/Scheduler/Scheduler.php

@@ -21,12 +21,20 @@ class Scheduler
     /**
      * The queued jobs.
      *
-     * @var array
+     * @var Job[]
      */
     private $jobs = [];
+
+    /** @var Job[] */
     private $saved_jobs = [];
+
+    /** @var Job[] */
     private $executed_jobs = [];
+
+    /** @var Job[] */
     private $failed_jobs = [];
+
+    /** @var Job[] */
     private $jobs_run = [];
     private $output_schedule = [];
     private $config;
@@ -49,6 +57,8 @@ class Scheduler
 
     /**
      * Load saved jobs from config/scheduler.yaml file
+     *
+     * @return $this
      */
     public function loadSavedJobs()
     {
@@ -65,7 +75,7 @@ class Scheduler
             }
 
             if (isset($j['output'])) {
-                $mode = isset($j['output_mode']) && $j['output_mode'] === 'append' ? true : false;
+                $mode = isset($j['output_mode']) && $j['output_mode'] === 'append';
                 $job->output($j['output'], $mode);
             }
 
@@ -106,7 +116,7 @@ class Scheduler
     /**
      * Get all jobs if they are disabled or not as one array
      *
-     * @return array
+     * @return Job[]
      */
     public function getAllJobs()
     {
@@ -184,6 +194,8 @@ class Scheduler
      * Reset all collected data of last run.
      *
      * Call before run() if you call run() multiple times.
+     *
+     * @return $this
      */
     public function resetRun()
     {
@@ -199,7 +211,7 @@ class Scheduler
      * Get the scheduler verbose output.
      *
      * @param  string  $type  Allowed: text, html, array
-     * @return mixed  The return depends on the requested $type
+     * @return string|array  The return depends on the requested $type
      */
     public function getVerboseOutput($type = 'text')
     {
@@ -217,6 +229,8 @@ class Scheduler
 
     /**
      * Remove all queued Jobs.
+     *
+     * @return $this
      */
     public function clearJobs()
     {
@@ -263,7 +277,7 @@ class Scheduler
     /**
      * Get the Job states file
      *
-     * @return \RocketTheme\Toolbox\File\FileInterface|YamlFile
+     * @return YamlFile
      */
     public function getJobStates()
     {
@@ -296,7 +310,6 @@ class Scheduler
      * Queue a job for execution in the correct queue.
      *
      * @param  Job  $job
-     * @return void
      */
     private function queueJob(Job $job)
     {
@@ -309,7 +322,6 @@ class Scheduler
      * Add an entry to the scheduler verbose output array.
      *
      * @param  string  $string
-     * @return void
      */
     private function addSchedulerVerboseOutput($string)
     {

system/src/Grav/Common/Service/AccountsServiceProvider.php

@@ -108,7 +108,8 @@ class AccountsServiceProvider implements ServiceProviderInterface
                 'options' => [
                     'formatter' => ['class' => YamlFormatter::class],
                     'folder' => 'account://',
-                    'pattern' => '{FOLDER}/{KEY:2}/{KEY}/user.yaml',
+                    'file' => 'user',
+                    'pattern' => '{FOLDER}/{KEY:2}/{KEY}/{FILE}{EXT}',
                     'key' => 'username',
                     'indexed' => true
                 ],
@@ -120,7 +121,7 @@ class AccountsServiceProvider implements ServiceProviderInterface
             'options' => [
                 'formatter' => ['class' => YamlFormatter::class],
                 'folder' => 'account://',
-                'pattern' => '{FOLDER}/{KEY}.yaml',
+                'pattern' => '{FOLDER}/{KEY}{EXT}',
                 'key' => 'storage_key',
                 'indexed' => true
             ],

system/src/Grav/Common/Theme.php

@@ -30,11 +30,11 @@ class Theme extends Plugin
     /**
      * Get configuration of the plugin.
      *
-     * @return Config
+     * @return array
      */
     public function config()
     {
-        return $this->config["themes.{$this->name}"];
+        return $this->config["themes.{$this->name}"] ?? [];
     }
 
     /**
@@ -42,7 +42,7 @@ class Theme extends Plugin
      *
      * @param string $theme_name The name of the theme whose config it should store.
      *
-     * @return true
+     * @return bool
      */
     public static function saveConfig($theme_name)
     {

system/src/Grav/Common/Themes.php

@@ -13,6 +13,7 @@ use Grav\Common\Config\Config;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
+use Grav\Framework\Psr7\Response;
 use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@@ -128,7 +129,7 @@ class Themes extends Iterator
      *
      * @param  string $name
      *
-     * @return Data
+     * @return Data|null
      * @throws \RuntimeException
      */
     public function get($name)
@@ -214,7 +215,9 @@ class Themes extends Iterator
                 }
             }
         } elseif (!$locator('theme://') && !defined('GRAV_CLI')) {
-            exit("Theme '$name' does not exist, unable to display page.");
+            $response = new Response(500, [], "Theme '$name' does not exist, unable to display page.");
+
+            $grav->close($response);
         }
 
         $this->config->set('theme', $config->get('themes.' . $name));

system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php

@@ -28,7 +28,7 @@ class TwigNodeMarkdown extends Node implements NodeOutputInterface
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      */
     public function compile(Compiler $compiler)
     {
@@ -41,6 +41,6 @@ class TwigNodeMarkdown extends Node implements NodeOutputInterface
             ->write('$lines = explode("\n", $content);' . PHP_EOL)
             ->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);' . PHP_EOL)
             ->write('$content = join("\n", $content);' . PHP_EOL)
-            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($content);' . PHP_EOL);
+            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($context, $content);' . PHP_EOL);
     }
 }

system/src/Grav/Common/Twig/Node/TwigNodeRender.php

@@ -33,12 +33,15 @@ class TwigNodeRender extends Node implements NodeCaptureInterface
         $tag = null
     )
     {
-        parent::__construct(['object' => $object, 'layout' => $layout, 'context' => $context], [], $lineno, $tag);
+        $nodes = ['object' => $object, 'layout' => $layout, 'context' => $context];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      * @throws \LogicException
      */
     public function compile(Compiler $compiler)
@@ -46,15 +49,15 @@ class TwigNodeRender extends Node implements NodeCaptureInterface
         $compiler->addDebugInfo($this);
         $compiler->write('$object = ')->subcompile($this->getNode('object'))->raw(';' . PHP_EOL);
 
-        $layout = $this->getNode('layout');
+        if ($this->hasNode('layout')) {
-        if ($layout) {
+            $layout = $this->getNode('layout');
             $compiler->write('$layout = ')->subcompile($layout)->raw(';' . PHP_EOL);
         } else {
             $compiler->write('$layout = null;' . PHP_EOL);
         }
 
-        $context = $this->getNode('context');
+        if ($this->hasNode('context')) {
-        if ($context) {
+            $context = $this->getNode('context');
             $compiler->write('$attributes = ')->subcompile($context)->raw(';' . PHP_EOL);
         } else {
             $compiler->write('$attributes = null;' . PHP_EOL);

system/src/Grav/Common/Twig/Node/TwigNodeScript.php

@@ -29,21 +29,24 @@ class TwigNodeScript extends Node implements NodeCaptureInterface
      * @param string|null $tag
      */
     public function __construct(
-        Node $body = null,
+        ?Node $body,
-        AbstractExpression $file = null,
+        ?AbstractExpression $file,
-        AbstractExpression $group = null,
+        ?AbstractExpression $group,
-        AbstractExpression $priority = null,
+        ?AbstractExpression $priority,
-        AbstractExpression $attributes = null,
+        ?AbstractExpression $attributes,
         $lineno = 0,
         $tag = null
     )
     {
-        parent::__construct(['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes], [], $lineno, $tag);
+        $nodes = ['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      * @throws \LogicException
      */
     public function compile(Compiler $compiler)
@@ -52,7 +55,7 @@ class TwigNodeScript extends Node implements NodeCaptureInterface
 
         $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];\n");
 
-        if ($this->getNode('attributes') !== null) {
+        if ($this->hasNode('attributes')) {
             $compiler
                 ->write('$attributes = ')
                 ->subcompile($this->getNode('attributes'))
@@ -66,7 +69,7 @@ class TwigNodeScript extends Node implements NodeCaptureInterface
             $compiler->write('$attributes = [];' . "\n");
         }
 
-         if ($this->getNode('group') !== null) {
+         if ($this->hasNode('group')) {
              $compiler
                  ->write("\$attributes['group'] = ")
                  ->subcompile($this->getNode('group'))
@@ -78,14 +81,14 @@ class TwigNodeScript extends Node implements NodeCaptureInterface
                  ->write("}\n");
          }
 
-        if ($this->getNode('priority') !== null) {
+        if ($this->hasNode('priority')) {
             $compiler
                 ->write("\$attributes['priority'] = (int)(")
                 ->subcompile($this->getNode('priority'))
                 ->raw(");\n");
         }
 
-        if ($this->getNode('file') !== null) {
+        if ($this->hasNode('file')) {
             $compiler
                 ->write('$assets->addJs(')
                 ->subcompile($this->getNode('file'))

system/src/Grav/Common/Twig/Node/TwigNodeStyle.php

@@ -29,21 +29,24 @@ class TwigNodeStyle extends Node implements NodeCaptureInterface
      * @param string|null $tag
      */
     public function __construct(
-        Node $body = null,
+        ?Node $body,
-        AbstractExpression $file = null,
+        ?AbstractExpression $file,
-        AbstractExpression $group = null,
+        ?AbstractExpression $group,
-        AbstractExpression $priority = null,
+        ?AbstractExpression $priority,
-        AbstractExpression $attributes = null,
+        ?AbstractExpression $attributes,
         $lineno = 0,
         $tag = null
     )
     {
-        parent::__construct(['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes], [], $lineno, $tag);
+        $nodes = ['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      * @throws \LogicException
      */
     public function compile(Compiler $compiler)
@@ -52,7 +55,7 @@ class TwigNodeStyle extends Node implements NodeCaptureInterface
 
         $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];\n");
 
-        if ($this->getNode('attributes') !== null) {
+        if ($this->hasNode('attributes')) {
             $compiler
                 ->write('$attributes = ')
                 ->subcompile($this->getNode('attributes'))
@@ -66,7 +69,7 @@ class TwigNodeStyle extends Node implements NodeCaptureInterface
             $compiler->write('$attributes = [];' . "\n");
         }
 
-        if ($this->getNode('group') !== null) {
+        if ($this->hasNode('group')) {
             $compiler
                 ->write("\$attributes['group'] = ")
                 ->subcompile($this->getNode('group'))
@@ -78,14 +81,14 @@ class TwigNodeStyle extends Node implements NodeCaptureInterface
                 ->write("}\n");
         }
 
-        if ($this->getNode('priority') !== null) {
+        if ($this->hasNode('priority')) {
             $compiler
                 ->write("\$attributes['priority'] = (int)(")
                 ->subcompile($this->getNode('priority'))
                 ->raw(");\n");
         }
 
-        if ($this->getNode('file') !== null) {
+        if ($this->hasNode('file')) {
             $compiler
                 ->write('$assets->addCss(')
                 ->subcompile($this->getNode('file'))

system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php

@@ -30,13 +30,16 @@ class TwigNodeSwitch extends Node
         $tag = null
     )
     {
-        parent::__construct(array('value' => $value, 'cases' => $cases, 'default' => $default), array(), $lineno, $tag);
+        $nodes = ['value' => $value, 'cases' => $cases, 'default' => $default];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
 
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      */
     public function compile(Compiler $compiler)
     {
@@ -68,7 +71,7 @@ class TwigNodeSwitch extends Node
                 ->write("}\n");
         }
 
-        if ($this->hasNode('default') && $this->getNode('default') !== null) {
+        if ($this->hasNode('default')) {
             $compiler
                 ->write("default:\n")
                 ->write("{\n")

system/src/Grav/Common/Twig/Node/TwigNodeThrow.php

@@ -34,7 +34,7 @@ class TwigNodeThrow extends Node
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      * @throws \LogicException
      */
     public function compile(Compiler $compiler)

system/src/Grav/Common/Twig/Node/TwigNodeTryCatch.php

@@ -28,13 +28,16 @@ class TwigNodeTryCatch extends Node
         $tag = null
     )
     {
-        parent::__construct(['try' => $try, 'catch' => $catch], [], $lineno, $tag);
+        $nodes = ['try' => $try, 'catch' => $catch];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
 
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
      * @throws \LogicException
      */
     public function compile(Compiler $compiler)
@@ -50,7 +53,7 @@ class TwigNodeTryCatch extends Node
             ->subcompile($this->getNode('try'))
         ;
 
-        if ($this->hasNode('catch') && null !== $this->getNode('catch')) {
+        if ($this->hasNode('catch')) {
             $compiler
                 ->outdent()
                 ->write('} catch (\Exception $e) {' . "\n")

system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php

@@ -24,9 +24,9 @@ class TwigTokenParserRender extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
+     * @param Token $token A Twig Token instance
      *
-     * @return Node A Twig_Node instance
+     * @return Node A Twig Node instance
      */
     public function parse(Token $token)
     {

system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php

@@ -29,9 +29,9 @@ class TwigTokenParserScript extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
+     * @param Token $token A Twig Token instance
      *
-     * @return Node A Twig_Node instance
+     * @return Node A Twig Node instance
      */
     public function parse(Token $token)
     {

system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php

@@ -28,9 +28,9 @@ class TwigTokenParserStyle extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
+     * @param Token $token A Twig Token instance
      *
-     * @return Node A Twig_Node instance
+     * @return Node A Twig Node instance
      */
     public function parse(Token $token)
     {

system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php

@@ -26,9 +26,9 @@ class TwigTokenParserThrow extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
+     * @param Token $token A Twig Token instance
      *
-     * @return Node A Twig_Node instance
+     * @return Node A Twig Node instance
      */
     public function parse(Token $token)
     {

system/src/Grav/Common/Twig/TokenParser/TwigTokenParserTryCatch.php

@@ -30,9 +30,9 @@ class TwigTokenParserTryCatch extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
+     * @param Token $token A Twig Token instance
      *
-     * @return Node A Twig_Node instance
+     * @return Node A Twig Node instance
      */
     public function parse(Token $token)
     {

system/src/Grav/Common/Twig/Twig.php

@@ -18,11 +18,21 @@ use Grav\Common\Page\Pages;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RocketTheme\Toolbox\Event\Event;
 use Phive\Twig\Extensions\Deferred\DeferredExtension;
+use Twig\Cache\FilesystemCache;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Extension\CoreExtension;
+use Twig\Extension\DebugExtension;
+use Twig\Loader\ArrayLoader;
+use Twig\Loader\ChainLoader;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
 class Twig
 {
     /**
-     * @var \Twig_Environment
+     * @var Environment
      */
     public $twig;
 
@@ -47,18 +57,20 @@ class Twig
     protected $grav;
 
     /**
-     * @var \Twig_Loader_Filesystem
+     * @var FilesystemLoader
      */
     protected $loader;
 
     /**
-     * @var \Twig_Loader_Array
+     * @var ArrayLoader
      */
     protected $loaderArray;
 
 
     protected $autoescape;
 
+    protected $profile;
+
     /**
      * Constructor
      *
@@ -102,7 +114,7 @@ class Twig
             $core_templates = array_merge($locator->findResources('system://templates'), $locator->findResources('system://templates/testing'));
             $this->twig_paths = array_merge($this->twig_paths, $core_templates);
 
-            $this->loader = new \Twig_Loader_Filesystem($this->twig_paths);
+            $this->loader = new FilesystemLoader($this->twig_paths);
 
             // Register all other prefixes as namespaces in twig
             foreach ($locator->getPaths('theme') as $prefix => $_) {
@@ -128,13 +140,13 @@ class Twig
 
             $this->grav->fireEvent('onTwigLoader');
 
-            $this->loaderArray = new \Twig_Loader_Array([]);
+            $this->loaderArray = new ArrayLoader([]);
-            $loader_chain = new \Twig_Loader_Chain([$this->loaderArray, $this->loader]);
+            $loader_chain = new ChainLoader([$this->loaderArray, $this->loader]);
 
             $params = $config->get('system.twig');
             if (!empty($params['cache'])) {
                 $cachePath = $locator->findResource('cache://twig', true, true);
-                $params['cache'] = new \Twig_Cache_Filesystem($cachePath, \Twig_Cache_Filesystem::FORCE_BYTECODE_INVALIDATION);
+                $params['cache'] = new FilesystemCache($cachePath, FilesystemCache::FORCE_BYTECODE_INVALIDATION);
             }
 
             if (!$config->get('system.strict_mode.twig_compat', true)) {
@@ -153,10 +165,10 @@ class Twig
             if ($config->get('system.twig.undefined_functions')) {
                 $this->twig->registerUndefinedFunctionCallback(function ($name) {
                     if (function_exists($name)) {
-                        return new \Twig_SimpleFunction($name, $name);
+                        return new TwigFunction($name, $name);
                     }
 
-                    return new \Twig_SimpleFunction($name, function () {
+                    return new TwigFunction($name, function () {
                     });
                 });
             }
@@ -164,10 +176,10 @@ class Twig
             if ($config->get('system.twig.undefined_filters')) {
                 $this->twig->registerUndefinedFilterCallback(function ($name) {
                     if (function_exists($name)) {
-                        return new \Twig_SimpleFilter($name, $name);
+                        return new TwigFilter($name, $name);
                     }
 
-                    return new \Twig_SimpleFilter($name, function () {
+                    return new TwigFilter($name, function () {
                     });
                 });
             }
@@ -176,17 +188,21 @@ class Twig
 
             // set default date format if set in config
             if ($config->get('system.pages.dateformat.long')) {
-                /** @var \Twig_Extension_Core $extension */
+                /** @var CoreExtension $extension */
-                $extension = $this->twig->getExtension('Twig_Extension_Core');
+                $extension = $this->twig->getExtension(CoreExtension::class);
                 $extension->setDateFormat($config->get('system.pages.dateformat.long'));
             }
             // enable the debug extension if required
             if ($config->get('system.twig.debug')) {
-                $this->twig->addExtension(new \Twig_Extension_Debug());
+                $this->twig->addExtension(new DebugExtension());
             }
             $this->twig->addExtension(new TwigExtension());
             $this->twig->addExtension(new DeferredExtension());
 
+            $this->profile = new \Twig\Profiler\Profile();
+            $this->twig->addExtension(new \Twig\Extension\ProfilerExtension($this->profile));
+
+
             $this->grav->fireEvent('onTwigExtensions');
 
             /** @var Pages $pages */
@@ -219,7 +235,7 @@ class Twig
     }
 
     /**
-     * @return \Twig_Environment
+     * @return Environment
      */
     public function twig()
     {
@@ -227,13 +243,19 @@ class Twig
     }
 
     /**
-     * @return \Twig_Loader_Filesystem
+     * @return FilesystemLoader
      */
     public function loader()
     {
         return $this->loader;
     }
 
+    public function profile()
+    {
+        return $this->profile;
+    }
+
+
     /**
      * Adds or overrides a template.
      *
@@ -254,7 +276,6 @@ class Twig
      * @param  string $content Optional content override
      *
      * @return string          The rendered output
-     * @throws \Twig_Error_Loader
      */
     public function processPage(PageInterface $item, $content = null)
     {
@@ -288,7 +309,7 @@ class Twig
                 $output = $local_twig->render($name, $twig_vars);
             }
 
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
             throw new \RuntimeException($e->getRawMessage(), 404, $e);
         }
 
@@ -312,7 +333,7 @@ class Twig
 
         try {
             $output = $this->twig->render($template, $vars);
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
             throw new \RuntimeException($e->getRawMessage(), 404, $e);
         }
 
@@ -341,7 +362,7 @@ class Twig
 
         try {
             $output = $this->twig->render($name, $vars);
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
             throw new \RuntimeException($e->getRawMessage(), 404, $e);
         }
 
@@ -386,14 +407,14 @@ class Twig
 
         try {
             $output = $this->twig->render($template, $vars + $twig_vars);
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
             $error_msg = $e->getMessage();
             // Try html version of this template if initial template was NOT html
             if ($ext !== '.html' . TWIG_EXT) {
                 try {
                     $page->templateFormat('html');
                     $output = $this->twig->render($page->template() . '.html' . TWIG_EXT, $vars + $twig_vars);
-                } catch (\Twig_Error_Loader $e) {
+                } catch (LoaderError $e) {
                     throw new \RuntimeException($error_msg, 400, $e);
                 }
             } else {
@@ -405,9 +426,10 @@ class Twig
     }
 
     /**
-     * Wraps the Twig_Loader_Filesystem addPath method (should be used only in `onTwigLoader()` event
+     * Wraps the FilesystemLoader addPath method (should be used only in `onTwigLoader()` event
      * @param string $template_path
      * @param string $namespace
+     * @throws LoaderError
      */
     public function addPath($template_path, $namespace = '__main__')
     {
@@ -415,9 +437,10 @@ class Twig
     }
 
     /**
-     * Wraps the Twig_Loader_Filesystem prependPath method (should be used only in `onTwigLoader()` event
+     * Wraps the FilesystemLoader prependPath method (should be used only in `onTwigLoader()` event
      * @param string $template_path
      * @param string $namespace
+     * @throws LoaderError
      */
     public function prependPath($template_path, $namespace = '__main__')
     {

system/src/Grav/Common/Twig/TwigClockworkDataSource.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig;
+
+use Clockwork\DataSource\DataSource;
+use Clockwork\Request\Request;
+use Clockwork\Request\Timeline;
+use Grav\Common\Grav;
+
+class TwigClockworkDataSource extends DataSource
+{
+    /**
+     * Views data structure
+     */
+    protected $views;
+
+    protected $root;
+
+    /**
+     * TwigClockworkDataSource constructor.
+     */
+    public function __construct()
+    {
+        $this->views = new Timeline();
+    }
+
+    /**
+     * Resolves and adds the Twig profiler data to the request
+     *
+     * @param Request $request
+     * @return Request
+     */
+    public function resolve(Request $request)
+    {
+        $profile = Grav::instance()['twig']->profile();
+
+        if ($profile) {
+            $processor = new TwigProfileProcessor();
+
+            $processor->process($profile, $this->views);
+            $request->viewsData    = $this->views->finalize();
+        }
+
+        return $request;
+    }
+}

system/src/Grav/Common/Twig/TwigEnvironment.php

@@ -9,7 +9,9 @@
 
 namespace Grav\Common\Twig;
 
-class TwigEnvironment extends \Twig_Environment
+use Twig\Environment;
+
+class TwigEnvironment extends Environment
 {
     use WriteCacheFileTrait;
 }

system/src/Grav/Common/Twig/TwigExtension.php

@@ -29,9 +29,16 @@ use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
 use Grav\Common\Yaml;
 use Grav\Common\Helpers\Base32;
+use Grav\Framework\Psr7\Response;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
-class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
+class TwigExtension extends AbstractExtension implements GlobalsInterface
 {
     /** @var Grav */
     protected $grav;
@@ -72,60 +79,60 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('*ize', [$this, 'inflectorFilter']),
+            new TwigFilter('*ize', [$this, 'inflectorFilter']),
-            new \Twig_SimpleFilter('absolute_url', [$this, 'absoluteUrlFilter']),
+            new TwigFilter('absolute_url', [$this, 'absoluteUrlFilter']),
-            new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
+            new TwigFilter('contains', [$this, 'containsFilter']),
-            new \Twig_SimpleFilter('chunk_split', [$this, 'chunkSplitFilter']),
+            new TwigFilter('chunk_split', [$this, 'chunkSplitFilter']),
-            new \Twig_SimpleFilter('nicenumber', [$this, 'niceNumberFunc']),
+            new TwigFilter('nicenumber', [$this, 'niceNumberFunc']),
-            new \Twig_SimpleFilter('nicefilesize', [$this, 'niceFilesizeFunc']),
+            new TwigFilter('nicefilesize', [$this, 'niceFilesizeFunc']),
-            new \Twig_SimpleFilter('nicetime', [$this, 'nicetimeFunc']),
+            new TwigFilter('nicetime', [$this, 'nicetimeFunc']),
-            new \Twig_SimpleFilter('defined', [$this, 'definedDefaultFilter']),
+            new TwigFilter('defined', [$this, 'definedDefaultFilter']),
-            new \Twig_SimpleFilter('ends_with', [$this, 'endsWithFilter']),
+            new TwigFilter('ends_with', [$this, 'endsWithFilter']),
-            new \Twig_SimpleFilter('fieldName', [$this, 'fieldNameFilter']),
+            new TwigFilter('fieldName', [$this, 'fieldNameFilter']),
-            new \Twig_SimpleFilter('ksort', [$this, 'ksortFilter']),
+            new TwigFilter('ksort', [$this, 'ksortFilter']),
-            new \Twig_SimpleFilter('ltrim', [$this, 'ltrimFilter']),
+            new TwigFilter('ltrim', [$this, 'ltrimFilter']),
-            new \Twig_SimpleFilter('markdown', [$this, 'markdownFunction'], ['needs_context' => true, 'is_safe' => ['html']]),
+            new TwigFilter('markdown', [$this, 'markdownFunction'], ['needs_context' => true, 'is_safe' => ['html']]),
-            new \Twig_SimpleFilter('md5', [$this, 'md5Filter']),
+            new TwigFilter('md5', [$this, 'md5Filter']),
-            new \Twig_SimpleFilter('base32_encode', [$this, 'base32EncodeFilter']),
+            new TwigFilter('base32_encode', [$this, 'base32EncodeFilter']),
-            new \Twig_SimpleFilter('base32_decode', [$this, 'base32DecodeFilter']),
+            new TwigFilter('base32_decode', [$this, 'base32DecodeFilter']),
-            new \Twig_SimpleFilter('base64_encode', [$this, 'base64EncodeFilter']),
+            new TwigFilter('base64_encode', [$this, 'base64EncodeFilter']),
-            new \Twig_SimpleFilter('base64_decode', [$this, 'base64DecodeFilter']),
+            new TwigFilter('base64_decode', [$this, 'base64DecodeFilter']),
-            new \Twig_SimpleFilter('randomize', [$this, 'randomizeFilter']),
+            new TwigFilter('randomize', [$this, 'randomizeFilter']),
-            new \Twig_SimpleFilter('modulus', [$this, 'modulusFilter']),
+            new TwigFilter('modulus', [$this, 'modulusFilter']),
-            new \Twig_SimpleFilter('rtrim', [$this, 'rtrimFilter']),
+            new TwigFilter('rtrim', [$this, 'rtrimFilter']),
-            new \Twig_SimpleFilter('pad', [$this, 'padFilter']),
+            new TwigFilter('pad', [$this, 'padFilter']),
-            new \Twig_SimpleFilter('regex_replace', [$this, 'regexReplace']),
+            new TwigFilter('regex_replace', [$this, 'regexReplace']),
-            new \Twig_SimpleFilter('safe_email', [$this, 'safeEmailFilter']),
+            new TwigFilter('safe_email', [$this, 'safeEmailFilter']),
-            new \Twig_SimpleFilter('safe_truncate', ['\Grav\Common\Utils', 'safeTruncate']),
+            new TwigFilter('safe_truncate', ['\Grav\Common\Utils', 'safeTruncate']),
-            new \Twig_SimpleFilter('safe_truncate_html', ['\Grav\Common\Utils', 'safeTruncateHTML']),
+            new TwigFilter('safe_truncate_html', ['\Grav\Common\Utils', 'safeTruncateHTML']),
-            new \Twig_SimpleFilter('sort_by_key', [$this, 'sortByKeyFilter']),
+            new TwigFilter('sort_by_key', [$this, 'sortByKeyFilter']),
-            new \Twig_SimpleFilter('starts_with', [$this, 'startsWithFilter']),
+            new TwigFilter('starts_with', [$this, 'startsWithFilter']),
-            new \Twig_SimpleFilter('truncate', ['\Grav\Common\Utils', 'truncate']),
+            new TwigFilter('truncate', ['\Grav\Common\Utils', 'truncate']),
-            new \Twig_SimpleFilter('truncate_html', ['\Grav\Common\Utils', 'truncateHTML']),
+            new TwigFilter('truncate_html', ['\Grav\Common\Utils', 'truncateHTML']),
-            new \Twig_SimpleFilter('json_decode', [$this, 'jsonDecodeFilter']),
+            new TwigFilter('json_decode', [$this, 'jsonDecodeFilter']),
-            new \Twig_SimpleFilter('array_unique', 'array_unique'),
+            new TwigFilter('array_unique', 'array_unique'),
-            new \Twig_SimpleFilter('basename', 'basename'),
+            new TwigFilter('basename', 'basename'),
-            new \Twig_SimpleFilter('dirname', 'dirname'),
+            new TwigFilter('dirname', 'dirname'),
-            new \Twig_SimpleFilter('print_r', 'print_r'),
+            new TwigFilter('print_r', 'print_r'),
-            new \Twig_SimpleFilter('yaml_encode', [$this, 'yamlEncodeFilter']),
+            new TwigFilter('yaml_encode', [$this, 'yamlEncodeFilter']),
-            new \Twig_SimpleFilter('yaml_decode', [$this, 'yamlDecodeFilter']),
+            new TwigFilter('yaml_decode', [$this, 'yamlDecodeFilter']),
-            new \Twig_SimpleFilter('nicecron', [$this, 'niceCronFilter']),
+            new TwigFilter('nicecron', [$this, 'niceCronFilter']),
 
             // Translations
-            new \Twig_SimpleFilter('t', [$this, 'translate'], ['needs_environment' => true]),
+            new TwigFilter('t', [$this, 'translate'], ['needs_environment' => true]),
-            new \Twig_SimpleFilter('tl', [$this, 'translateLanguage']),
+            new TwigFilter('tl', [$this, 'translateLanguage']),
-            new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
+            new TwigFilter('ta', [$this, 'translateArray']),
 
             // Casting values
-            new \Twig_SimpleFilter('string', [$this, 'stringFilter']),
+            new TwigFilter('string', [$this, 'stringFilter']),
-            new \Twig_SimpleFilter('int', [$this, 'intFilter'], ['is_safe' => ['all']]),
+            new TwigFilter('int', [$this, 'intFilter'], ['is_safe' => ['all']]),
-            new \Twig_SimpleFilter('bool', [$this, 'boolFilter']),
+            new TwigFilter('bool', [$this, 'boolFilter']),
-            new \Twig_SimpleFilter('float', [$this, 'floatFilter'], ['is_safe' => ['all']]),
+            new TwigFilter('float', [$this, 'floatFilter'], ['is_safe' => ['all']]),
-            new \Twig_SimpleFilter('array', [$this, 'arrayFilter']),
+            new TwigFilter('array', [$this, 'arrayFilter']),
 
             // Object Types
-            new \Twig_SimpleFilter('get_type', [$this, 'getTypeFunc']),
+            new TwigFilter('get_type', [$this, 'getTypeFunc']),
-            new \Twig_SimpleFilter('of_type', [$this, 'ofTypeFunc'])
+            new TwigFilter('of_type', [$this, 'ofTypeFunc'])
         ];
     }
 
@@ -137,54 +144,54 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('array', [$this, 'arrayFilter']),
+            new TwigFunction('array', [$this, 'arrayFilter']),
-            new \Twig_SimpleFunction('array_key_value', [$this, 'arrayKeyValueFunc']),
+            new TwigFunction('array_key_value', [$this, 'arrayKeyValueFunc']),
-            new \Twig_SimpleFunction('array_key_exists', 'array_key_exists'),
+            new TwigFunction('array_key_exists', 'array_key_exists'),
-            new \Twig_SimpleFunction('array_unique', 'array_unique'),
+            new TwigFunction('array_unique', 'array_unique'),
-            new \Twig_SimpleFunction('array_intersect', [$this, 'arrayIntersectFunc']),
+            new TwigFunction('array_intersect', [$this, 'arrayIntersectFunc']),
-            new \Twig_SimpleFunction('authorize', [$this, 'authorize']),
+            new TwigFunction('authorize', [$this, 'authorize']),
-            new \Twig_SimpleFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new TwigFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
-            new \Twig_SimpleFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new TwigFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
-            new \Twig_SimpleFunction('vardump', [$this, 'vardumpFunc']),
+            new TwigFunction('vardump', [$this, 'vardumpFunc']),
-            new \Twig_SimpleFunction('print_r', 'print_r'),
+            new TwigFunction('print_r', 'print_r'),
-            new \Twig_SimpleFunction('http_response_code', 'http_response_code'),
+            new TwigFunction('http_response_code', 'http_response_code'),
-            new \Twig_SimpleFunction('evaluate', [$this, 'evaluateStringFunc'], ['needs_context' => true]),
+            new TwigFunction('evaluate', [$this, 'evaluateStringFunc'], ['needs_context' => true]),
-            new \Twig_SimpleFunction('evaluate_twig', [$this, 'evaluateTwigFunc'], ['needs_context' => true]),
+            new TwigFunction('evaluate_twig', [$this, 'evaluateTwigFunc'], ['needs_context' => true]),
-            new \Twig_SimpleFunction('gist', [$this, 'gistFunc']),
+            new TwigFunction('gist', [$this, 'gistFunc']),
-            new \Twig_SimpleFunction('nonce_field', [$this, 'nonceFieldFunc']),
+            new TwigFunction('nonce_field', [$this, 'nonceFieldFunc']),
-            new \Twig_SimpleFunction('pathinfo', 'pathinfo'),
+            new TwigFunction('pathinfo', 'pathinfo'),
-            new \Twig_SimpleFunction('random_string', [$this, 'randomStringFunc']),
+            new TwigFunction('random_string', [$this, 'randomStringFunc']),
-            new \Twig_SimpleFunction('repeat', [$this, 'repeatFunc']),
+            new TwigFunction('repeat', [$this, 'repeatFunc']),
-            new \Twig_SimpleFunction('regex_replace', [$this, 'regexReplace']),
+            new TwigFunction('regex_replace', [$this, 'regexReplace']),
-            new \Twig_SimpleFunction('regex_filter', [$this, 'regexFilter']),
+            new TwigFunction('regex_filter', [$this, 'regexFilter']),
-            new \Twig_SimpleFunction('string', [$this, 'stringFunc']),
+            new TwigFunction('string', [$this, 'stringFunc']),
-            new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
+            new TwigFunction('url', [$this, 'urlFunc']),
-            new \Twig_SimpleFunction('json_decode', [$this, 'jsonDecodeFilter']),
+            new TwigFunction('json_decode', [$this, 'jsonDecodeFilter']),
-            new \Twig_SimpleFunction('get_cookie', [$this, 'getCookie']),
+            new TwigFunction('get_cookie', [$this, 'getCookie']),
-            new \Twig_SimpleFunction('redirect_me', [$this, 'redirectFunc']),
+            new TwigFunction('redirect_me', [$this, 'redirectFunc']),
-            new \Twig_SimpleFunction('range', [$this, 'rangeFunc']),
+            new TwigFunction('range', [$this, 'rangeFunc']),
-            new \Twig_SimpleFunction('isajaxrequest', [$this, 'isAjaxFunc']),
+            new TwigFunction('isajaxrequest', [$this, 'isAjaxFunc']),
-            new \Twig_SimpleFunction('exif', [$this, 'exifFunc']),
+            new TwigFunction('exif', [$this, 'exifFunc']),
-            new \Twig_SimpleFunction('media_directory', [$this, 'mediaDirFunc']),
+            new TwigFunction('media_directory', [$this, 'mediaDirFunc']),
-            new \Twig_SimpleFunction('body_class', [$this, 'bodyClassFunc']),
+            new TwigFunction('body_class', [$this, 'bodyClassFunc']),
-            new \Twig_SimpleFunction('theme_var', [$this, 'themeVarFunc']),
+            new TwigFunction('theme_var', [$this, 'themeVarFunc']),
-            new \Twig_SimpleFunction('header_var', [$this, 'pageHeaderVarFunc']),
+            new TwigFunction('header_var', [$this, 'pageHeaderVarFunc']),
-            new \Twig_SimpleFunction('read_file', [$this, 'readFileFunc']),
+            new TwigFunction('read_file', [$this, 'readFileFunc']),
-            new \Twig_SimpleFunction('nicenumber', [$this, 'niceNumberFunc']),
+            new TwigFunction('nicenumber', [$this, 'niceNumberFunc']),
-            new \Twig_SimpleFunction('nicefilesize', [$this, 'niceFilesizeFunc']),
+            new TwigFunction('nicefilesize', [$this, 'niceFilesizeFunc']),
-            new \Twig_SimpleFunction('nicetime', [$this, 'nicetimeFunc']),
+            new TwigFunction('nicetime', [$this, 'nicetimeFunc']),
-            new \Twig_SimpleFunction('cron', [$this, 'cronFunc']),
+            new TwigFunction('cron', [$this, 'cronFunc']),
-            new \Twig_SimpleFunction('xss', [$this, 'xssFunc']),
+            new TwigFunction('xss', [$this, 'xssFunc']),
 
 
             // Translations
-            new \Twig_SimpleFunction('t', [$this, 'translate'], ['needs_environment' => true]),
+            new TwigFunction('t', [$this, 'translate'], ['needs_environment' => true]),
-            new \Twig_SimpleFunction('tl', [$this, 'translateLanguage']),
+            new TwigFunction('tl', [$this, 'translateLanguage']),
-            new \Twig_SimpleFunction('ta', [$this, 'translateArray']),
+            new TwigFunction('ta', [$this, 'translateArray']),
 
             // Object Types
-            new \Twig_SimpleFunction('get_type', [$this, 'getTypeFunc']),
+            new TwigFunction('get_type', [$this, 'getTypeFunc']),
-            new \Twig_SimpleFunction('of_type', [$this, 'ofTypeFunc'])
+            new TwigFunction('of_type', [$this, 'ofTypeFunc'])
         ];
     }
 
@@ -457,7 +464,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     /**
      * Gets a human readable output for cron syntax
      *
-     * @param $at
+     * @param string $at
      * @return string
      */
     public function niceCronFilter($at)
@@ -484,7 +491,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
      * @param bool $long_strings
      *
      * @param bool $show_tense
-     * @return bool
+     * @return string
      */
     public function nicetimeFunc($date, $long_strings = true, $show_tense = true)
     {
@@ -613,10 +620,11 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     /**
      * @param string $string
      *
+     * @param array $context
      * @param bool $block  Block or Line processing
      * @return mixed|string
      */
-    public function markdownFunction($context = false, $string, $block = true)
+    public function markdownFunction($context, $string, $block = true)
     {
         $page = $context['page'] ?? null;
         return Utils::processMarkdown($string, $block, $page);
@@ -652,7 +660,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
      */
     public function definedDefaultFilter($value, $default = null)
     {
-        return null !== $value ? $value : $default;
+        return $value ?? $default;
         }
 
     /**
@@ -734,9 +742,10 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     }
 
     /**
+     * @param Environment $twig
      * @return string
      */
-    public function translate(\Twig_Environment $twig)
+    public function translate(Environment $twig)
     {
         // shift off the environment
         $args = func_get_args();
@@ -818,7 +827,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
     public function urlFunc($input, $domain = false)
     {
         return Utils::url($input, $domain);
-        }
+    }
 
     /**
      * This function will evaluate Twig $twig through the $environment, and return its results.
@@ -829,8 +838,8 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
      */
     public function evaluateTwigFunc($context, $twig ) {
 
-        $loader = new \Twig_Loader_Filesystem('.');
+        $loader = new FilesystemLoader('.');
-        $env = new \Twig_Environment($loader);
+        $env = new Environment($loader);
 
         $template = $env->createTemplate($twig);
 
@@ -849,15 +858,14 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
         return $this->evaluateTwigFunc($context, "{{ $string }}");
     }
 
-
     /**
-     * Based on Twig_Extension_Debug / twig_var_dump
+     * Based on Twig\Extension\Debug / twig_var_dump
      * (c) 2011 Fabien Potencier
      *
-     * @param \Twig_Environment $env
+     * @param Environment $env
-     * @param string $context
+     * @param array $context
      */
-    public function dump(\Twig_Environment $env, $context)
+    public function dump(Environment $env, $context)
     {
         if (!$env->isDebug() || !$this->debugger) {
             return;
@@ -880,7 +888,8 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
             $this->debugger->addMessage($data, 'debug');
         } else {
             for ($i = 2; $i < $count; $i++) {
-                $this->debugger->addMessage(func_get_arg($i), 'debug');
+                $var = func_get_arg($i);
+                $this->debugger->addMessage('Twig Dump', 'debug', $var);
             }
         }
     }
@@ -1105,8 +1114,9 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
      */
     public function redirectFunc($url, $statusCode = 303)
     {
-        header('Location: ' . $url, true, $statusCode);
+        $response = new Response($statusCode, ['location' => $url]);
-        exit();
+
+        $this->grav->close($response);
     }
 
     /**

system/src/Grav/Common/Twig/TwigProfileProcessor.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig;
+
+use Grav\Common\Utils;
+use Twig\Profiler\Profile;
+use Clockwork\Request\Timeline;
+
+class TwigProfileProcessor
+{
+    private $root;
+
+    public function process(Profile $profile, Timeline $views, $counter = 0, $prefix = '', $sibling = false)
+    {
+        if ($profile->isRoot()) {
+            $this->root = $profile->getDuration();
+            $name = $profile->getName();
+        } else {
+            if ($profile->isTemplate()) {
+                $name = $this->formatTemplate($profile, $prefix);
+            } else {
+                $name = $this->formatNonTemplate($profile, $prefix);
+            }
+            $prefix .= '⎯⎯';
+        }
+
+        $percent = $this->root ? $profile->getDuration() / $this->root * 100 : 0;
+
+        $data = [
+            'tm' => $this->formatTime($profile, $percent),
+            'mu' => Utils::prettySize($profile->getMemoryUsage())
+        ];
+
+        if ($profile->isRoot()) {
+            $data += ['pmu' => Utils::prettySize($profile->getPeakMemoryUsage())];
+        }
+
+
+        $views->addEvent(
+            $counter,
+            $profile->getTemplate(),
+            0,
+            $profile->getDuration(),
+            [ 'name' => $name, 'data' => $data ]
+        );
+
+        $nCount = count($profile->getProfiles());
+        foreach ($profile as $i => $p) {
+            $this->process($p, $views, ++$counter, $prefix, $i + 1 !== $nCount);
+        }
+    }
+
+    protected function formatTemplate(Profile $profile, $prefix)
+    {
+        return sprintf('%s⤍ %s', $prefix, $profile->getTemplate());
+    }
+
+    protected function formatNonTemplate(Profile $profile, $prefix)
+    {
+        return sprintf('%s⤍ %s::%s(%s)', $prefix, $profile->getTemplate(), $profile->getType(), $profile->getName());
+    }
+
+    protected function formatTime(Profile $profile, $percent)
+    {
+        return sprintf('%.2fms/%.0f%%', $profile->getDuration() * 1000, $percent);
+    }
+}

system/src/Grav/Common/Uri.php

@@ -300,16 +300,17 @@ class Uri
      * Get URI parameter.
      *
      * @param string $id
+     * @param bool $default
      *
      * @return bool|string
      */
-    public function param($id)
+    public function param($id, $default = false)
     {
         if (isset($this->params[$id])) {
             return html_entity_decode(rawurldecode($this->params[$id]));
         }
 
-        return false;
+        return $default;
     }
 
     /**
@@ -1340,7 +1341,7 @@ class Uri
     /**
      * Check if this is a valid Grav extension
      *
-     * @param $extension
+     * @param string $extension
      * @return bool
      */
     public function isValidExtension($extension)
@@ -1357,7 +1358,7 @@ class Uri
     /**
      * Allow overriding of any element (be careful!)
      *
-     * @param $data
+     * @param array $data
      * @return Uri
      */
     public function setUriProperties($data)

system/src/Grav/Common/User/FlexUser/User.php

@@ -382,31 +382,6 @@ class User extends FlexObject implements UserInterface, MediaManipulationInterfa
         return $this->getBlueprint()->extra($this->toArray());
     }
 
-    /**
-     * @param string $name
-     * @return Blueprint
-     */
-    public function getBlueprint(string $name = '')
-    {
-        $blueprint = clone parent::getBlueprint($name);
-
-        $blueprint->addDynamicHandler('flex', function (array &$field, $property, array &$call) {
-            $params = (array)$call['params'];
-            $method = array_shift($params);
-
-            if (method_exists($this, $method)) {
-                $value = $this->{$method}(...$params);
-                if (\is_array($value) && isset($field[$property]) && \is_array($field[$property])) {
-                    $field[$property] = array_merge_recursive($field[$property], $value);
-                } else {
-                    $field[$property] = $value;
-                }
-            }
-        });
-
-        return $blueprint->init();
-    }
-
     /**
      * Return unmodified data as raw string.
      *

system/src/Grav/Common/User/FlexUser/UserCollection.php

@@ -59,6 +59,7 @@ class UserCollection extends FlexCollection implements UserCollectionInterface
      */
     public function find($query, $fields = ['username', 'email']): UserInterface
     {
+        // FIXME: $fields is incompatible to parent class -- add support for finding value from multiple properties.
         foreach ((array)$fields as $field) {
             if ($field === 'key') {
                 $user = $this->get($query);

system/src/Grav/Common/Utils.php

@@ -14,6 +14,8 @@ use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
 use Grav\Common\Page\Markdown\Excerpts;
+use Negotiation\Accept;
+use Negotiation\Negotiator;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
@@ -663,6 +665,39 @@ abstract class Utils
         }
     }
 
+    /**
+     * Returns the output render format, usually the extension provided in the URL. (e.g. `html`, `json`, `xml`, etc).
+     *
+     * @return string
+     */
+    public static function getPageFormat(): string
+    {
+        /** @var Uri $uri */
+        $uri = Grav::instance()['uri'];
+
+        // Set from uri extension
+        $uri_extension = $uri->extension();
+        if (is_string($uri_extension)) {
+            return $uri_extension;
+        }
+
+        // Use content negotiation via the `accept:` header
+        $http_accept = $_SERVER['HTTP_ACCEPT'] ?? null;
+        if (is_string($http_accept)) {
+            $negotiator = new Negotiator();
+
+            $supported_types = Utils::getSupportPageTypes(['html', 'json']);
+            $priorities = Utils::getMimeTypes($supported_types);
+
+            $media_type = $negotiator->getBest($http_accept, $priorities);
+            $mimetype = $media_type instanceof Accept ? $media_type->getValue() : '';
+
+            return Utils::getExtensionByMime($mimetype);
+        }
+
+        return 'html';
+    }
+
     /**
      * Return the mimetype based on filename extension
      *
@@ -1321,7 +1356,7 @@ abstract class Utils
      */
     public static function sortArrayByArray(array $array, array $orderArray)
     {
-        $ordered = array();
+        $ordered = [];
         foreach ($orderArray as $key) {
             if (array_key_exists($key, $array)) {
                 $ordered[$key] = $array[$key];
@@ -1476,16 +1511,16 @@ abstract class Utils
     /**
      * Parse a readable file size and return a value in bytes
      *
-     * @param string|int $size
+     * @param string|int|float $size
      * @return int
      */
     public static function parseSize($size)
     {
         $unit = preg_replace('/[^bkmgtpezy]/i', '', $size);
-        $size = preg_replace('/[^0-9\.]/', '', $size);
+        $size = (float)preg_replace('/[^0-9\.]/', '', $size);
 
         if ($unit) {
-            $size = $size * pow(1024, stripos('bkmgtpezy', $unit[0]));
+            $size *= 1024 ** stripos('bkmgtpezy', $unit[0]);
         }
 
         return (int) abs(round($size));
@@ -1574,7 +1609,7 @@ abstract class Utils
         }
 
         // Packed representation of IP
-        $ip = inet_pton($ip);
+        $ip = (string)inet_pton($ip);
 
         // Maximum netmask length = same as packed address
         $len = 8*strlen($ip);

system/src/Grav/Console/Cli/SchedulerCommand.php

@@ -74,7 +74,7 @@ class SchedulerCommand extends ConsoleCommand
             // Show jobs list
 
             $jobs = $scheduler->getAllJobs();
-            $job_states = $scheduler->getJobStates()->content();
+            $job_states = (array)$scheduler->getJobStates()->content();
             $rows = [];
 
             $table = new Table($this->output);
@@ -113,7 +113,7 @@ class SchedulerCommand extends ConsoleCommand
             $io->newLine();
         } elseif ($this->input->getOption('details')) {
             $jobs = $scheduler->getAllJobs();
-            $job_states = $scheduler->getJobStates()->content();
+            $job_states = (array)$scheduler->getJobStates()->content();
 
             $io->title('Job Details');
 

system/src/Grav/Console/Cli/ServerCommand.php

@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * @package    Grav\Console\Cli
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Cli;
+
+use Grav\Common\Grav;
+use Grav\Common\Helpers\LogViewer;
+use Grav\Common\Helpers\YamlLinter;
+use Grav\Common\Utils;
+use Grav\Console\ConsoleCommand;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\PhpProcess;
+use Symfony\Component\Process\Process;
+
+class ServerCommand extends ConsoleCommand
+{
+    const SYMFONY_SERVER = 'Symfony Server';
+    const PHP_SERVER = 'Built-in PHP Server';
+
+    protected $ip;
+    protected $port;
+    protected $io;
+
+    protected function configure()
+    {
+        $this
+            ->setName('server')
+            ->addOption('port', 'p', InputOption::VALUE_OPTIONAL, 'Preferred HTTP port rather than auto-find (default is 8000-9000')
+            ->addOption('symfony', null, InputOption::VALUE_NONE, 'Force using Symfony server')
+            ->addOption('php', null, InputOption::VALUE_NONE, 'Force using built-in PHP server')
+            ->setDescription("Runs built-in web-server, Symfony first, then tries PHP's")
+            ->setHelp("Runs built-in web-server, Symfony first, then tries PHP's");
+    }
+
+    protected function serve()
+    {
+        $io = $this->io = new SymfonyStyle($this->input, $this->output);
+
+        $io->title('Grav Web Server');
+
+        // Ensure CLI colors are on
+        ini_set('cli_server.color', 'on');
+
+        // Options
+        $force_symfony = $this->input->getOption('symfony');
+        $force_php = $this->input->getOption('php');
+
+        // Find PHP
+        $executableFinder = new PhpExecutableFinder();
+        $php = $executableFinder->find(false);
+
+        $this->ip = '127.0.0.1';
+        $this->port = intval($this->input->getOption('port') ?? 8000);
+
+
+        // Get an open port
+        while (!$this->portAvailable($this->ip, $this->port)) {
+            $this->port += 1;
+        }
+
+        // Setup the commands
+        $symfony_cmd = ['symfony', 'server:start', '--ansi', '--port=' . $this->port ];
+        $php_cmd = [$php, '-S', $this->ip.':'.$this->port, 'system/router.php'];
+
+        $commands = [
+            self::SYMFONY_SERVER => $symfony_cmd,
+            self::PHP_SERVER => $php_cmd
+        ];
+
+        if ($force_symfony) {
+            unset($commands[self::PHP_SERVER]);
+        } elseif ($force_php) {
+            unset($commands[self::SYMFONY_SERVER]);
+        }
+
+        foreach($commands as $name => $command) {
+            $process = $this->runProcess($name, $command);
+
+            if (!$process) {
+                $io->note('Starting ' . $name . '...');
+            }
+
+            // Should only get here if there's an error running
+            if (!$process->isRunning() && (
+                ($name === self::SYMFONY_SERVER && $force_symfony) ||
+                ($name === self::PHP_SERVER)
+                )) {
+                $io->error('Could not start ' . $name);
+            }
+        }
+    }
+
+    protected function runProcess($name, $cmd)
+    {
+        $process = new Process($cmd);
+        $process->setTimeout(0);
+        $process->start();
+
+        if ($name === self::PHP_SERVER) {
+            $this->io->success('Built-in PHP web server listening on http://' . $this->ip . ':' . $this->port . ' (PHP v' . phpversion() . ')');
+        }
+
+        $process->wait(function ($type, $buffer) {
+            $this->output->write($buffer);
+        });
+
+        return $process;
+    }
+
+    /**
+     * Simple function test the port
+     *
+     * @param $ip
+     * @param $port
+     * @return bool
+     */
+    protected function portAvailable($ip, $port) {
+        $fp = @fsockopen($ip, $port, $errno, $errstr, 0.1);
+        if (!$fp) {
+            return true;
+        } else {
+            fclose($fp);
+            return false;
+        }
+    }
+
+}

system/src/Grav/Console/Cli/YamlLinterCommand.php

@@ -10,9 +10,7 @@
 namespace Grav\Console\Cli;
 
 use Grav\Common\Grav;
-use Grav\Common\Helpers\LogViewer;
 use Grav\Common\Helpers\YamlLinter;
-use Grav\Common\Utils;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -29,6 +27,18 @@ class YamlLinterCommand extends ConsoleCommand
                 InputOption::VALUE_OPTIONAL,
                 'The environment to trigger a specific configuration. For example: localhost, mysite.dev, www.mysite.com'
             )
+            ->addOption(
+               'all',
+               'a',
+                InputOption::VALUE_NONE,
+                'Go through the whole Grav installation'
+            )
+            ->addOption(
+                'folder',
+                'f',
+                InputOption::VALUE_OPTIONAL,
+                'Go through specific folder'
+            )
             ->setDescription('Checks various files for YAML errors')
             ->setHelp("Checks various files for YAML errors");
     }
@@ -42,41 +52,59 @@ class YamlLinterCommand extends ConsoleCommand
 
         $io->title('Yaml Linter');
 
-        $io->section('User Configuration');
+        if ($this->input->getOption('all')) {
-        $errors = YamlLinter::lintConfig();
+            $io->section('All');
+            $errors = YamlLinter::lint('');
 
-        if (empty($errors)) {
+            if (empty($errors)) {
-            $io->success('No YAML Linting issues with configuration');
+                $io->success('No YAML Linting issues found');
+            } else {
+                $this->displayErrors($errors, $io);
+            }
+        } elseif ($folder = $this->input->getOption('folder')) {
+            $io->section($folder);
+            $errors = YamlLinter::lint($folder);
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues found');
+            } else {
+                $this->displayErrors($errors, $io);
+            }
         } else {
-            $this->displayErrors($errors, $io);
+            $io->section('User Configuration');
+            $errors = YamlLinter::lintConfig();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with configuration');
+            } else {
+                $this->displayErrors($errors, $io);
+            }
+
+            $io->section('Pages Frontmatter');
+            $errors = YamlLinter::lintPages();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with pages');
+            } else {
+                $this->displayErrors($errors, $io);
+            }
+
+            $io->section('Page Blueprints');
+            $errors = YamlLinter::lintBlueprints();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with blueprints');
+            } else {
+                $this->displayErrors($errors, $io);
+            }
         }
-
-
-        $io->section('Pages Frontmatter');
-        $errors = YamlLinter::lintPages();
-
-        if (empty($errors)) {
-            $io->success('No YAML Linting issues with pages');
-        } else {
-            $this->displayErrors($errors, $io);
-        }
-
-        $io->section('Page Blueprints');
-        $errors = YamlLinter::lintBlueprints();
-
-        if (empty($errors)) {
-            $io->success('No YAML Linting issues with blueprints');
-        } else {
-            $this->displayErrors($errors, $io);
-        }
-
     }
 
-    protected function displayErrors($errors, $io)
+    protected function displayErrors($errors, SymfonyStyle $io)
     {
-        $io->error("YAML Linting issues found...");
+        $io->error('YAML Linting issues found...');
         foreach ($errors as $path => $error) {
-            $io->writeln("<yellow>$path</yellow> - $error");
+            $io->writeln("<yellow>{$path}</yellow> - {$error}");
         }
     }
 }

system/src/Grav/Console/Gpm/IndexCommand.php

@@ -19,7 +19,7 @@ use Symfony\Component\Console\Input\InputOption;
 
 class IndexCommand extends ConsoleCommand
 {
-    /** @var array */
+    /** @var Packages */
     protected $data;
 
     /** @var GPM */
@@ -188,9 +188,9 @@ class IndexCommand extends ConsoleCommand
     }
 
     /**
-     * @param array $data
+     * @param Packages $data
      *
-     * @return mixed
+     * @return Packages
      */
     public function filter($data)
     {
@@ -245,6 +245,7 @@ class IndexCommand extends ConsoleCommand
 
     /**
      * @param Packages $packages
+     * @return Packages
      */
     public function sort($packages)
     {

system/src/Grav/Console/Gpm/InstallCommand.php

@@ -551,10 +551,9 @@ class InstallCommand extends ConsoleCommand
 
     /**
      * @param Package $package
+     * @param string|null    $license
      *
-     * @param string    $license
+     * @return string|null
-     *
-     * @return string
      */
     private function downloadPackage($package, $license = null)
     {
@@ -586,7 +585,7 @@ class InstallCommand extends ConsoleCommand
             $this->output->writeln('  |- Downloading package...    <red>error</red>                             ');
             $this->output->writeln("  |  '- " . $error);
 
-            return false;
+            return null;
         }
 
         Folder::create($this->tmp);

system/src/Grav/Console/Gpm/SelfupgradeCommand.php

@@ -185,17 +185,17 @@ class SelfupgradeCommand extends ConsoleCommand
     {
         $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
         $this->tmp = $tmp_dir . '/Grav-' . uniqid('', false);
-        $output = Response::get($package['download'], [], [$this, 'progress']);
+        $output = Response::get($package->download, [], [$this, 'progress']);
 
         Folder::create($this->tmp);
 
         $this->output->write("\x0D");
-        $this->output->write("  |- Downloading upgrade [{$this->formatBytes($package['size'])}]...   100%");
+        $this->output->write("  |- Downloading upgrade [{$this->formatBytes($package->size)}]...   100%");
         $this->output->writeln('');
 
-        file_put_contents($this->tmp . DS . $package['name'], $output);
+        file_put_contents($this->tmp . DS . $package->name, $output);
 
-        return $this->tmp . DS . $package['name'];
+        return $this->tmp . DS . $package->name;
     }
 
     /**

system/src/Grav/Framework/Collection/AbstractIndexCollection.php

@@ -110,7 +110,7 @@ abstract class AbstractIndexCollection implements CollectionInterface
      */
     public function removeElement($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
         if (!$key || !isset($this->entries[$key])) {
             return false;
@@ -178,7 +178,7 @@ abstract class AbstractIndexCollection implements CollectionInterface
      */
     public function contains($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
         return $key && isset($this->entries[$key]);
     }
@@ -196,7 +196,7 @@ abstract class AbstractIndexCollection implements CollectionInterface
      */
     public function indexOf($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
         return $key && isset($this->entries[$key]) ? $key : null;
     }
@@ -246,10 +246,6 @@ abstract class AbstractIndexCollection implements CollectionInterface
             throw new \InvalidArgumentException('Invalid argument $value');
         }
 
-        if ($key !== $value->getKey()) {
-            $value->setKey($key);
-        }
-
         $this->entries[$key] = $this->getElementMeta($value);
     }
 
@@ -262,7 +258,7 @@ abstract class AbstractIndexCollection implements CollectionInterface
             throw new \InvalidArgumentException('Invalid argument $element');
         }
 
-        $this->entries[$element->getKey()] = $this->getElementMeta($element);
+        $this->entries[$this->getCurrentKey($element)] = $this->getElementMeta($element);
 
         return true;
     }
@@ -477,6 +473,11 @@ abstract class AbstractIndexCollection implements CollectionInterface
         $this->entries = $entries;
     }
 
+    protected function getCurrentKey($element)
+    {
+        return $element->getKey();
+    }
+
     /**
      * @param string $key
      * @param mixed $value

system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php

@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Controller
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace Grav\Framework\Controller\Traits;
+
+use Grav\Common\Config\Config;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Framework\Psr7\Response;
+use Grav\Framework\RequestHandler\Exception\RequestException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+trait ControllerResponseTrait
+{
+    /**
+     * Display the current page.
+     *
+     * @return Response
+     */
+    protected function createDisplayResponse(): ResponseInterface
+    {
+        return new Response(418);
+    }
+
+    /**
+     * @param string $content
+     * @param int $code
+     * @param array $headers
+     * @return Response
+     */
+    protected function createHtmlResponse(string $content, int $code = null, array $headers = null): ResponseInterface
+    {
+        $code = $code ?? 200;
+        if ($code < 100 || $code > 599) {
+            $code = 500;
+        }
+        $headers = $headers ?? [];
+
+        return new Response($code, $headers, $content);
+    }
+
+    /**
+     * @param array $content
+     * @param int $code
+     * @param array $headers
+     * @return Response
+     */
+    protected function createJsonResponse(array $content, int $code = null, array $headers = null): ResponseInterface
+    {
+        $code = $code ?? $content['code'];
+        if (null === $code || $code < 100 || $code > 599) {
+            $code = 200;
+        }
+        $headers = ($headers ?? []) + [
+            'Content-Type' => 'application/json',
+            'Cache-Control' => 'no-cache, no-store, must-revalidate'
+        ];
+
+        return new Response($code, $headers, json_encode($content));
+    }
+
+    /**
+     * @param string $url
+     * @param int $code
+     * @return Response
+     */
+    protected function createRedirectResponse(string $url, int $code = null): ResponseInterface
+    {
+        if (null === $code || $code < 301 || $code > 307) {
+            $code = $this->getConfig()->get('system.pages.redirect_default_code', 302);
+        }
+
+        $accept = $this->getAccept(['application/json', 'text/html']);
+
+        if ($accept === 'application/json') {
+            return $this->createJsonResponse(['code' => $code, 'status' => 'redirect', 'redirect' => $url]);
+        }
+
+        return new Response($code, ['Location' => $url]);
+    }
+
+    /**
+     * @param \Throwable $e
+     * @return \Throwable
+     */
+    protected function createErrorResponse(\Throwable $e): ResponseInterface
+    {
+        $validCodes = [
+            400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418,
+            422, 423, 424, 425, 426, 428, 429, 431, 451, 500, 501, 502, 503, 504, 505, 506, 507, 508, 511
+        ];
+
+        if ($e instanceof RequestException) {
+            $code = $e->getHttpCode();
+            $reason = $e->getHttpReason();
+        } else {
+            $code = $e->getCode();
+            $reason = null;
+        }
+
+        if (!in_array($code, $validCodes, true)) {
+            $code = 500;
+        }
+
+        $message = $e->getMessage();
+        $response = [
+            'code' => $code,
+            'status' => 'error',
+            'message' => $message,
+            'error' => [
+                'code' => $code,
+                'message' => $message
+            ]
+        ];
+
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+        if ($debugger->enabled()) {
+            $response['error'] += [
+                'type' => \get_class($e),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+                'trace' => explode("\n", $e->getTraceAsString())
+            ];
+        }
+
+        $accept = $this->getAccept(['application/json', 'text/html']);
+
+        if ($accept === 'text/html') {
+            $request = $this->getRequest();
+            $method = $request->getMethod();
+
+            // On POST etc, redirect back to the previous page.
+            if ($method !== 'GET' && $method !== 'HEAD') {
+                $this->setMessage($message, 'error');
+                $referer = $request->getHeaderLine('Referer');
+                return $this->createRedirectResponse($referer, 303);
+            }
+
+            // TODO: improve error page
+            return $this->createHtmlResponse($response['message'], $code);
+        }
+
+        return new Response($code, ['Content-Type' => 'application/json'], json_encode($response), '1.1', $reason);
+    }
+
+    protected function getAccept(array $compare)
+    {
+        $accepted = [];
+        foreach ($this->getRequest()->getHeader('Accept') as $accept) {
+            foreach (explode(',', $accept) as $item) {
+                if (!$item) {
+                    continue;
+                }
+
+                $split = explode(';q=', $item);
+                $mime = array_shift($split);
+                $priority = array_shift($split) ?? 1.0;
+
+                $accepted[$mime] = $priority;
+            }
+        }
+
+        arsort($accepted);
+
+        // TODO: add support for image/* etc
+        $list = array_intersect($compare, array_keys($accepted));
+        if (!$list && (isset($accepted['*/*']) || isset($accepted['*']))) {
+            return reset($compare);
+        }
+
+        return reset($list);
+    }
+
+    /**
+     * @return ServerRequestInterface
+     */
+    abstract protected function getRequest(): ServerRequestInterface;
+
+    /**
+     * @param string $message
+     * @param string $type
+     * @return $this
+     */
+    abstract protected function setMessage($message, $type = 'info');
+
+    /**
+     * @return Config
+     */
+    abstract protected function getConfig(): Config;
+}

system/src/Grav/Framework/Flex/Flex.php

@@ -262,7 +262,7 @@ class Flex implements \Countable
         if (null === $type && null === $keyField) {
             // Special handling for quick Flex key lookups.
             $keyField = 'storage_key';
-            [$type, $key] = $this->resolveKeyAndType($key, $type);
+            [$key, $type] = $this->resolveKeyAndType($key, $type);
         } else {
             $type = $this->resolveType($type);
         }

system/src/Grav/Framework/Flex/FlexCollection.php

@@ -13,12 +13,11 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Twig\Twig;
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Framework\Cache\CacheInterface;
-use Grav\Framework\ContentBlock\ContentBlockInterface;
 use Grav\Framework\ContentBlock\HtmlBlock;
-use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Framework\Object\ObjectCollection;
 use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
@@ -51,8 +50,10 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
             'getTypePrefix' => true,
             'getType' => true,
             'getFlexDirectory' => true,
+            'hasFlexFeature' => true,
+            'getFlexFeatures' => true,
             'getCacheKey' => true,
-            'getCacheChecksum' => true,
+            'getCacheChecksum' => false,
             'getTimestamp' => true,
             'hasProperty' => true,
             'getProperty' => true,
@@ -92,6 +93,31 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
         }
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        $implements = class_implements($this);
+        $list = [];
+        foreach ($implements as $interface) {
+            $feature = Inflector::hyphenize(preg_replace('/(.*\\\\)(.*?)Interface$/', '\\2', $interface));
+            $list[] = $feature;
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::search()
@@ -184,7 +210,16 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
      */
     public function getCacheChecksum(): string
     {
-        return sha1(json_encode($this->getTimestamps()));
+        /**
+         * @var string $key
+         * @var FlexObjectInterface $object
+         */
+        $list = [];
+        foreach ($this as $key => $object) {
+            $list[$key] = $object->getCacheChecksum();
+        }
+
+        return sha1(json_encode($list));
     }
 
     /**
@@ -258,6 +293,11 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
         return $this->getFlexDirectory()->getIndex($this->getKeys(), $this->getKeyField());
     }
 
+    public function getCollection()
+    {
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::render()
@@ -275,16 +315,19 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
         $debugger = $grav['debugger'];
         $debugger->startTimer('flex-collection-' . ($debugKey =  uniqid($type, false)), 'Render Collection ' . $type . ' (' . $layout . ')');
 
-        $cache = $key = null;
+        $key = null;
         foreach ($context as $value) {
             if (!\is_scalar($value)) {
                 $key = false;
+                break;
             }
         }
 
         if ($key !== false) {
             $key = md5($this->getCacheKey() . '.' . $layout . json_encode($context));
             $cache = $this->getCache('render');
+        } else {
+            $cache = null;
         }
 
         try {
@@ -305,9 +348,9 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
         }
 
         if (!$block) {
-            $block = HtmlBlock::create($key);
+            $block = HtmlBlock::create($key ?: null);
             $block->setChecksum($checksum);
-            if ($key === false) {
+            if (!$key) {
                 $block->disableCache();
             }
 

system/src/Grav/Framework/Flex/FlexDirectory.php

@@ -14,6 +14,7 @@ use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Utils;
 use Grav\Framework\Cache\Adapter\DoctrineCache;
 use Grav\Framework\Cache\Adapter\MemoryCache;
@@ -59,6 +60,8 @@ class FlexDirectory implements FlexAuthorizeInterface
     protected $storage;
     /** @var CacheInterface */
     protected $cache;
+    /** @var FlexObjectInterface[] */
+    protected $objects;
     /** @var string */
     protected $objectClassName;
     /** @var string */
@@ -79,6 +82,18 @@ class FlexDirectory implements FlexAuthorizeInterface
         $this->blueprint_file = $blueprint_file;
         $this->defaults = $defaults;
         $this->enabled = !empty($defaults['enabled']);
+        $this->objects = [];
+    }
+
+    public function isListed(): bool
+    {
+        $grav = Grav::instance();
+
+        /** @var Flex|null $flex */
+        $flex = $grav['flex_objects'] ?? null;
+        $directory = $flex ? $flex->getDirectory($this->type) : null;
+
+        return null !== $directory;
     }
 
     /**
@@ -222,7 +237,7 @@ class FlexDirectory implements FlexAuthorizeInterface
     }
 
     /**
-     * Returns an object if it exists.
+     * Returns an object if it exists. If no arguments are passed (or both of them are null), method creates a new empty object.
      *
      * Note: It is not safe to use the object without checking if the user can access it.
      *
@@ -230,8 +245,12 @@ class FlexDirectory implements FlexAuthorizeInterface
      * @param string|null $keyField  Field to be used as the key.
      * @return FlexObjectInterface|null
      */
-    public function getObject($key, string $keyField = null): ?FlexObjectInterface
+    public function getObject($key = null, string $keyField = null): ?FlexObjectInterface
     {
+        if (null === $key && null === $keyField) {
+            return $this->createObject([], '');
+        }
+
         return $this->getIndex(null, $keyField)->get($key);
     }
 
@@ -239,9 +258,12 @@ class FlexDirectory implements FlexAuthorizeInterface
      * @param array $data
      * @param string|null $key
      * @return FlexObjectInterface
+     * @deprecated 1.7 Use $object->update()->save() instead.
      */
     public function update(array $data, string $key = null): FlexObjectInterface
     {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() should not be used anymore: use $object->update()->save() instead.', E_USER_DEPRECATED);
+
         $object = null !== $key ? $this->getIndex()->get($key): null;
 
         $storage = $this->getStorage();
@@ -285,9 +307,12 @@ class FlexDirectory implements FlexAuthorizeInterface
     /**
      * @param string $key
      * @return FlexObjectInterface|null
+     * @deprecated 1.7 Use $object->delete() instead.
      */
     public function remove(string $key): ?FlexObjectInterface
     {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() should not be used anymore: use $object->delete() instead.', E_USER_DEPRECATED);
+
         $object = $this->getIndex()->get($key);
         if (!$object) {
             return null;
@@ -492,76 +517,127 @@ class FlexDirectory implements FlexAuthorizeInterface
     {
         /** @var Debugger $debugger */
         $debugger = Grav::instance()['debugger'];
-        $debugger->startTimer('flex-objects', sprintf('Flex: Initializing %d %s', \count($entries), $this->type));
 
-        $storage = $this->getStorage();
         $cache = $this->getCache('object');
 
-        // Get storage keys for the objects.
         $keys = [];
         $rows = [];
+        $fetch = [];
+
+        // Build lookup arrays with storage keys for the objects.
         foreach ($entries as $key => $value) {
-            $k = $value['storage_key'];
+            $k = $value['storage_key'] ?? '';
+            $v = $this->objects[$k] ?? null;
             $keys[$k] = $key;
-            $rows[$k] = null;
+            $rows[$k] = $v;
+            if (!$v) {
+                $fetch[] = $k;
+            }
         }
 
-        // Fetch rows from the cache.
+        $loading = \count($fetch);
-        try {
+
-            $rows = $cache->getMultiple(array_keys($rows));
+        // Attempt to fetch missing rows from the cache.
-        } catch (InvalidArgumentException $e) {
+        if ($fetch) {
-            $debugger->addException($e);
+            try {
+                $debugger->startTimer('flex-objects', sprintf('Flex: Loading %d %s', $loading, $this->type));
+
+                $fetched = (array)$cache->getMultiple($fetch);
+
+                // Make sure cached objects are up to date: compare against index checksum/timestamp.
+                foreach ($fetched as $key => $value) {
+                    if ($value instanceof FlexObjectInterface) {
+                        $objectMeta = $value->getMetaData();
+                    } else {
+                        $objectMeta = $value['__META'] ?? [];
+                    }
+                    $indexMeta = $this->index->getMetaData($key);
+
+                    $indexChecksum = $indexMeta['checksum'] ?? $indexMeta['storage_timestamp'] ?? null;
+                    $objectChecksum = $objectMeta['checksum'] ?? $objectMeta['storage_timestamp'] ?? null;
+                    if ($indexChecksum !== $objectChecksum) {
+                        unset($fetched[$key]);
+                    }
+                }
+
+                // Update cached rows.
+                $rows = array_replace($rows, $fetched);
+            } catch (InvalidArgumentException $e) {
+                $debugger->addException($e);
+            }
         }
 
         // Read missing rows from the storage.
+        $storage = $this->getStorage();
         $updated = [];
         $rows = $storage->readRows($rows, $updated);
 
+        // Create objects from the rows.
+        $isListed = $this->isListed();
+        $list = [];
+        foreach ($rows as $storageKey => $row) {
+            $usedKey = $keys[$storageKey];
+
+            if ($row instanceof FlexObjectInterface) {
+                $object = $row;
+            } else {
+                if ($row === null) {
+                    $debugger->addMessage(sprintf('Flex: Object %s was not found from %s storage', $storageKey, $this->type), 'debug');
+                    continue;
+                }
+
+                if (isset($row['__error'])) {
+                    $message = sprintf('Flex: Object %s is broken in %s storage: %s', $storageKey, $this->type, $row['__error']);
+                    $debugger->addException(new \RuntimeException($message));
+                    $debugger->addMessage($message, 'error');
+                    continue;
+                }
+
+                if (!isset($row['__META'])) {
+                    $row['__META'] = [
+                        'storage_key' => $storageKey,
+                        'storage_timestamp' => $entries[$usedKey]['storage_timestamp'] ?? 0,
+                    ];
+                }
+
+                $key = $row['__META']['key'] ?? $entries[$usedKey]['key'] ?? $usedKey;
+                $object = $this->createObject($row, $key, false);
+                $this->objects[$storageKey] = $object;
+                if ($isListed) {
+                    // If unserialize works for the object, serialize the object to speed up the loading.
+                    $updated[$storageKey] = $object;
+                }
+            }
+
+            $list[$usedKey] = $object;
+        }
+
         // Store updated rows to the cache.
         if ($updated) {
+            if (!$cache instanceof MemoryCache) {
+                /** @var Debugger $debugger */
+                $debugger = Grav::instance()['debugger'];
+                $debugger->addMessage(sprintf('Flex: Caching %d %s', \count($entries), $this->type), 'debug');
+            }
             try {
-                if (!$cache instanceof MemoryCache) {
-                    $debugger->addMessage(sprintf('Flex: Caching %d %s: %s', \count($updated), $this->type, implode(', ', array_keys($updated))), 'debug');
-                }
                 $cache->setMultiple($updated);
             } catch (InvalidArgumentException $e) {
                 $debugger->addException($e);
-
                 // TODO: log about the issue.
             }
         }
 
-        // Create objects from the rows.
+        $fetch && $debugger->stopTimer('flex-objects');
-        $list = [];
-        foreach ($rows as $storageKey => $row) {
-            if ($row === null) {
-                $debugger->addMessage(sprintf('Flex: Object %s was not found from %s storage', $storageKey, $this->type), 'debug');
-                continue;
-            }
-
-            if (isset($row['__error'])) {
-                $message = sprintf('Flex: Object %s is broken in %s storage: %s', $storageKey, $this->type, $row['__error']);
-                $debugger->addException(new \RuntimeException($message));
-                $debugger->addMessage($message, 'error');
-                continue;
-            }
-
-            $usedKey = $keys[$storageKey];
-            $row += [
-                'storage_key' => $storageKey,
-                'storage_timestamp' => $entries[$usedKey]['storage_timestamp'],
-            ];
-
-            $key = $entries[$usedKey]['key'] ?? $usedKey;
-            $object = $this->createObject($row, $key, false);
-            $list[$usedKey] = $object;
-        }
-
-        $debugger->stopTimer('flex-objects');
 
         return $list;
     }
 
+    public function reloadIndex(): void
+    {
+        $cache = $this->getCache('index');
+        $cache->delete('__keys');
+    }
+
     /**
      * @param string $type_view
      * @param string $context
@@ -579,6 +655,13 @@ class FlexDirectory implements FlexAuthorizeInterface
             $view = array_shift($parts) ?: '';
 
             $blueprint = new Blueprint($this->getBlueprintFile($view));
+            $blueprint->addDynamicHandler('data', function (array &$field, $property, array &$call) {
+                $this->dynamicDataField($field, $property, $call);
+            });
+            $blueprint->addDynamicHandler('flex', function (array &$field, $property, array &$call) {
+                $this->dynamicFlexField($field, $property, $call);
+            });
+
             if ($context) {
                 $blueprint->setContext($context);
             }
@@ -595,6 +678,72 @@ class FlexDirectory implements FlexAuthorizeInterface
         return $this->blueprints[$type_view];
     }
 
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicDataField(array &$field, $property, array &$call)
+    {
+        $params = $call['params'];
+        if (\is_array($params)) {
+            $function = array_shift($params);
+        } else {
+            $function = $params;
+            $params = [];
+        }
+
+        $object = $call['object'];
+        if ($function === '\Grav\Common\Page\Pages::pageTypes') {
+            $params = [$object instanceof PageInterface && $object->modular() ? 'modular' : 'standard'];
+        }
+
+        [$o, $f] = explode('::', $function, 2);
+
+        $data = null;
+        if (!$f) {
+            if (\function_exists($o)) {
+                $data = \call_user_func_array($o, $params);
+            }
+        } else {
+            if (method_exists($o, $f)) {
+                $data = \call_user_func_array([$o, $f], $params);
+            }
+        }
+
+        // If function returns a value,
+        if (null !== $data) {
+            if (\is_array($data) && isset($field[$property]) && \is_array($field[$property])) {
+                // Combine field and @data-field together.
+                $field[$property] += $data;
+            } else {
+                // Or create/replace field with @data-field.
+                $field[$property] = $data;
+            }
+        }
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicFlexField(array &$field, $property, array &$call)
+    {
+        $params = (array)$call['params'];
+        $object = $call['object'] ?? null;
+        $method = array_shift($params);
+
+        if ($object && method_exists($object, $method)) {
+            $value = $object->{$method}(...$params);
+            if (\is_array($value) && isset($field[$property]) && \is_array($field[$property])) {
+                $field[$property] = array_merge_recursive($field[$property], $value);
+            } else {
+                $field[$property] = $value;
+            }
+        }
+    }
+
     /**
      * @return FlexStorageInterface
      */

system/src/Grav/Framework/Flex/FlexForm.php

@@ -13,11 +13,11 @@ use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
 use Grav\Common\Grav;
 use Grav\Common\Twig\Twig;
-use Grav\Common\Utils;
 use Grav\Framework\Flex\Interfaces\FlexFormInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Framework\Form\Traits\FormTrait;
 use Grav\Framework\Route\Route;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
 use Twig\Template;
@@ -29,6 +29,10 @@ use Twig\TemplateWrapper;
  */
 class FlexForm implements FlexFormInterface
 {
+    use NestedArrayAccessWithGetters {
+        NestedArrayAccessWithGetters::get as private traitGet;
+        NestedArrayAccessWithGetters::set as private traitSet;
+    }
     use FormTrait {
         FormTrait::doSerialize as doTraitSerialize;
         FormTrait::doUnserialize as doTraitUnserialize;
@@ -40,23 +44,88 @@ class FlexForm implements FlexFormInterface
     /** @var FlexObjectInterface */
     private $object;
 
+    /** @var string */
+    private $flexName;
+
+    /**
+     * @param array $options    Options to initialize the form instance:
+     *                          (string) name: Form name, allows you to use custom form.
+     *                          (string) unique_id: Unique id for this form instance.
+     *                          (array) form: Custom form fields.
+     *                          (FlexObjectInterface) object: Object instance.
+     *                          (string) key: Object key, used only if object instance isn't given.
+     *                          (FlexDirectory) directory: Flex Directory, mandatory if object isn't given.
+     *
+     * @return FlexFormInterface
+     */
+    public static function instance(array $options = [])
+    {
+        if (isset($options['object'])) {
+            $object = $options['object'];
+            if (!$object instanceof FlexObjectInterface) {
+                throw new \RuntimeException(__METHOD__ . "(): 'object' should be instance of FlexObjectInterface", 400);
+            }
+        } elseif (isset($options['directory'])) {
+            $directory = $options['directory'];
+            if (!$directory instanceof FlexDirectory) {
+                throw new \RuntimeException(__METHOD__ . "(): 'directory' should be instance of FlexDirectory", 400);
+            }
+            $key = $options['key'] ?? '';
+            $object = $directory->getObject($key) ?? $directory->createObject([], $key);
+        } else {
+            throw new \RuntimeException(__METHOD__ . "(): You need to pass option 'directory' or 'object'", 400);
+        }
+
+        $name = $options['name'] ?? '';
+
+        // There is no reason to pass object and directory.
+        unset($options['object'], $options['directory']);
+
+        return $object->getForm($name, $options);
+    }
+
     /**
      * FlexForm constructor.
      * @param string $name
      * @param FlexObjectInterface $object
-     * @param array|null $form
+     * @param array $options
      */
-    public function __construct(string $name, FlexObjectInterface $object, array $form = null)
+    public function __construct(string $name, FlexObjectInterface $object, array $options = null)
     {
         $this->name = $name;
-        $this->form = $form;
-
-        $uniqueId = $object->exists() ? $object->getStorageKey() : "{$object->getFlexType()}:new";
         $this->setObject($object);
+        $this->setName($object->getFlexType(), $name);
         $this->setId($this->getName());
-        $this->setUniqueId(md5($uniqueId));
+
+        $uniqueId = $options['unique_id'] ?? null;
+        if (!$uniqueId) {
+            if ($object->exists()) {
+                $uniqueId = $object->getStorageKey();
+            } elseif ($object->hasKey()) {
+                $uniqueId = "{$object->getKey()}:new";
+            } else {
+                $uniqueId = "{$object->getFlexType()}:new";
+            }
+            $uniqueId = md5($uniqueId);
+        }
+        $this->setUniqueId($uniqueId);
+        $directory = $object->getFlexDirectory();
+        $this->setFlashLookupFolder($directory->getBlueprint()->get('form/flash_folder') ?? 'tmp://forms/[SESSIONID]');
+        $this->form = $options['form'] ?? null;
+
+        $this->initialize();
+    }
+
+    /**
+     * @return $this
+     */
+    public function initialize()
+    {
         $this->messages = [];
         $this->submitted = false;
+        $this->data = null;
+        $this->files = [];
+        $this->unsetFlash();
 
         $flash = $this->getFlash();
         if ($flash->exists()) {
@@ -65,10 +134,55 @@ class FlexForm implements FlexFormInterface
 
             $this->data = $data ? new Data($data, $this->getBlueprint()) : null;
             $this->files = $flash->getFilesByFields($includeOriginal);
-        } else {
-            $this->data = null;
-            $this->files = [];
         }
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $default
+     * @param string|null $separator
+     * @return mixed
+     */
+    public function get($name, $default = null, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+            case 'name':
+            case 'noncename':
+            case 'nonceaction':
+            case 'action':
+            case 'data':
+            case 'files':
+            case 'errors';
+            case 'fields':
+            case 'blueprint':
+            case 'page':
+                $method = 'get' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitGet($name, $default, $separator);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @param string|null $separator
+     * @return FlexForm
+     */
+    public function set($name, $value, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+                $method = 'set' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitSet($name, $value, $separator);
     }
 
     /**
@@ -76,10 +190,15 @@ class FlexForm implements FlexFormInterface
      */
     public function getName(): string
     {
-        $object = $this->getObject();
+        return $this->flexName;
-        $name = $this->name ?: 'object';
+    }
 
-        return "flex-{$object->getFlexType()}-{$name}";
+    protected function setName(string $type, string $name): void
+    {
+        // Make sure that both type and name do not have dash (convert dashes to underscores).
+        $type = str_replace('-', '_', $type);
+        $name = str_replace('-', '_', $name);
+        $this->flexName = $name ? "flex-{$type}-{$name}" : "flex-{$type}";
     }
 
     /**
@@ -127,6 +246,32 @@ class FlexForm implements FlexFormInterface
         return $this->object->getFlexType();
     }
 
+    /**
+     * Get form flash object.
+     *
+     * @return FlexFormFlash
+     */
+    public function getFlash()
+    {
+        if (null === $this->flash) {
+            $grav = Grav::instance();
+            $config = [
+                'session_id' => $this->getSessionId(),
+                'unique_id' => $this->getUniqueId(),
+                'form_name' => $this->getName(),
+                'folder' => $this->getFlashFolder(),
+                'object' => $this->getObject()
+            ];
+
+            $this->flash = new FlexFormFlash($config);
+            $this->flash
+                ->setUrl($grav['uri']->url)
+                ->setUser($grav['user'] ?? null);
+        }
+
+        return $this->flash;
+    }
+
     /**
      * @return FlexObjectInterface
      */
@@ -150,7 +295,7 @@ class FlexForm implements FlexFormInterface
     {
         if (null === $this->blueprint) {
             try {
-                $blueprint = $this->getObject()->getBlueprint(Utils::isAdminPlugin() ? '' : $this->name);
+                $blueprint = $this->getObject()->getBlueprint($this->name);
                 if ($this->form) {
                     // We have field overrides available.
                     $blueprint->extend(['form' => $this->form], true);
@@ -330,12 +475,12 @@ class FlexForm implements FlexFormInterface
         $this->object = $data['object'];
     }
 
-        /**
+    /**
      * Filter validated data.
      *
-     * @param \ArrayAccess $data
+     * @param \ArrayAccess|Data $data
      */
-    protected function filterData(\ArrayAccess $data): void
+    protected function filterData($data): void
     {
         if ($data instanceof Data) {
             $data->filter(true, true);

system/src/Grav/Framework/Flex/FlexFormFlash.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex;
+
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Form\FormFlash;
+
+class FlexFormFlash extends FormFlash
+{
+    /**
+     * @var FlexObjectInterface
+     */
+    protected $object;
+
+    public function setObject(FlexObjectInterface $object)
+    {
+        $this->object = $object;
+    }
+
+    public function getObject(): FlexObjectInterface
+    {
+        return $this->object;
+    }
+
+    public function jsonSerialize(): array
+    {
+        $serialized = parent::jsonSerialize();
+
+        $object = $this->getObject();
+        if ($object) {
+            $serialized['object'] = [
+                'type' => $object->getFlexType(),
+                'key' => $object->getKey() ?: null,
+                'storage_key' => $object->exists() ? $object->getStorageKey() : null,
+                'timestamp' => $object->getTimestamp(),
+                'serialized' => $object->jsonSerialize()
+            ];
+        }
+
+        return $serialized;
+    }
+
+    protected function init(?array $data, array $config): void
+    {
+        parent::init($data, $config);
+
+        $object = $config['object'];
+        if (isset($data['object']['serialized']) && !$object->exists()) {
+            $object->update($data['object']['serialized']);
+        }
+
+        $this->setObject($object);
+    }
+}

system/src/Grav/Framework/Flex/FlexIndex.php

@@ -12,6 +12,7 @@ namespace Grav\Framework\Flex;
 use Grav\Common\Debugger;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Session;
 use Grav\Framework\Cache\CacheInterface;
 use Grav\Framework\Collection\CollectionInterface;
@@ -27,6 +28,8 @@ use Psr\SimpleCache\InvalidArgumentException;
 
 class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexIndexInterface
 {
+    const VERSION = 1;
+
     /** @var FlexDirectory */
     private $_flexDirectory;
 
@@ -80,6 +83,31 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
         $this->setKeyField(null);
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        $implements = class_implements($this->getFlexDirectory()->getCollectionClass());
+        $list = [];
+        foreach ($implements as $interface) {
+            $feature = Inflector::hyphenize(preg_replace('/(.*\\\\)(.*?)Interface$/', '\\2', $interface));
+            $list[] = $feature;
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::search()
@@ -152,7 +180,12 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
      */
     public function getCacheChecksum(): string
     {
-        return sha1($this->getCacheKey() . json_encode($this->getTimestamps()));
+        $list = [];
+        foreach ($this->getEntries() as $key => $value) {
+            $list[$key] = $value['checksum'] ?? $value['storage_timestamp'];
+        }
+
+        return sha1(json_encode($list));
     }
 
     /**
@@ -227,6 +260,11 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
         return $this;
     }
 
+    public function getCollection()
+    {
+        return $this->loadCollection();
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::render()
@@ -328,7 +366,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
             }
 
             // Order by current field.
-            if ($ordering === 'DESC') {
+            if (strtoupper($ordering) === 'DESC') {
                 arsort($search, SORT_NATURAL);
             } else {
                 asort($search, SORT_NATURAL);
@@ -369,25 +407,27 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
                 $cacheKey = '';
             }
             $key = "{$flexType}.idx." . sha1($name . '.' . $cacheKey . json_encode($arguments) . $this->getCacheKey());
+            $checksum = $this->getCacheChecksum();
 
             $cache = $this->getCache('object');
 
             try {
-                $result = $cache->get($key);
+                $cached = $cache->get($key);
+                $test = $cached[0] ?? null;
+                $result = $test === $checksum ? ($cached[1] ?? null) : null;
 
                 // Make sure the keys aren't changed if the returned type is the same index type.
                 if ($result instanceof self && $flexType === $result->getFlexType()) {
                     $result = $result->withKeyField($this->getKeyField());
                 }
             } catch (InvalidArgumentException $e) {
-                /** @var Debugger $debugger */
-                $debugger = Grav::instance()['debugger'];
                 $debugger->addException($e);
             }
 
             if (!isset($result)) {
                 $collection = $this->loadCollection();
                 $result = $collection->{$name}(...$arguments);
+                $debugger->addMessage("Cache miss: '{$flexType}::{$name}()'", 'debug');
 
                 try {
                     // If flex collection is returned, convert it back to flex index.
@@ -397,7 +437,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
                         $cached = $result;
                     }
 
-                    $cache->set($key, $cached);
+                    $cache->set($key, [$checksum, $cached]);
                 } catch (InvalidArgumentException $e) {
                     $debugger->addException($e);
 
@@ -408,8 +448,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
             $collection = $this->loadCollection();
             $result = $collection->{$name}(...$arguments);
             if (!isset($cachedMethods[$name])) {
-                $class = \get_class($collection);
+                $debugger->addMessage("Call '{$flexType}:{$name}()' isn't cached", 'debug');
-                $debugger->addMessage("Call '{$class}:{$name}()' isn't cached", 'debug');
             }
         }
 
@@ -544,7 +583,23 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
      */
     protected function getElementMeta($object)
     {
-        return $object->getTimestamp();
+        return $object->getMetaData();
+    }
+
+    protected function getCurrentKey($element)
+    {
+        $keyField = $this->getKeyField();
+        if ($keyField === 'storage_key') {
+            return $element->getStorageKey();
+        }
+        if ($keyField === 'flex_key') {
+            return $element->getFlexKey();
+        }
+        if ($keyField === 'key') {
+            return $element->getKey();
+        }
+
+        return $element->getKey();
     }
 
     /**
@@ -553,7 +608,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
      * @param array $entries    Updated index
      * @return array            Compiled list of entries
      */
-    protected static function updateIndexFile(FlexStorageInterface $storage, array $index, array $entries): array
+    protected static function updateIndexFile(FlexStorageInterface $storage, array $index, array $entries, array $options = []): array
     {
         // Calculate removed objects.
         $removed = array_diff_key($index, $entries);
@@ -595,12 +650,12 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
         // Go through all the updated objects and refresh their index data.
         $updated = $added = [];
         foreach ($rows as $key => $row) {
-            if (null !== $row) {
+            if (null !== $row || !empty($options['include_missing'])) {
-                $entry = ['key' => $key] + $entries[$key];
+                $entry = $entries[$key] + ['key' => $key];
                 if ($keyField !== 'storage_key' && isset($row[$keyField])) {
                     $entry['key'] = $row[$keyField];
                 }
-                static::updateIndexData($entry, $row);
+                static::updateIndexData($entry, $row ?? []);
                 if (isset($row['__error'])) {
                     $entry['__error'] = true;
                     static::onException(new \RuntimeException(sprintf('Object failed to load: %s (%s)', $key, $row['__error'])));
@@ -627,7 +682,7 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
 
         static::onChanges($index, $added, $updated, $removed);
 
-        $indexFile->save(['count' => \count($index), 'index' => $index]);
+        $indexFile->save(['version' => static::VERSION, 'timestamp' => time(), 'count' => \count($index), 'index' => $index]);
         $indexFile->unlock();
 
         return $index;
@@ -637,19 +692,30 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
     {
     }
 
-    protected static function loadEntriesFromIndex(FlexStorageInterface $storage)
+    protected static function loadIndex(FlexStorageInterface $storage)
     {
         $indexFile = static::getIndexFile($storage);
 
         $data = [];
         try {
             $data = (array)$indexFile->content();
+            $version = $data['version'] ?? null;
+            if ($version !== static::VERSION) {
+                $data = [];
+            }
         } catch (\Exception $e) {
             $e = new \RuntimeException(sprintf('Index failed to load: %s', $e->getMessage()), $e->getCode(), $e);
 
             static::onException($e);
         }
 
+        return $data ?: ['version' => static::VERSION, 'timestamp' => 0, 'count' => 0, 'index' => []];
+    }
+
+    protected static function loadEntriesFromIndex(FlexStorageInterface $storage)
+    {
+        $data = static::loadIndex($storage);
+
         return $data['index'] ?? [];
     }
 
@@ -679,17 +745,19 @@ class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexInde
 
     protected static function onChanges(array $entries, array $added, array $updated, array $removed)
     {
-        $message = sprintf('Index updated, %d objects (%d added, %d updated, %d removed).', \count($entries), \count($added), \count($updated), \count($removed));
+        $addedCount = \count($added);
+        $updatedCount = \count($updated);
+        $removedCount = \count($removed);
 
-        $grav = Grav::instance();
+        if ($addedCount + $updatedCount + $removedCount) {
+            $message = sprintf('Index updated, %d objects (%d added, %d updated, %d removed).', \count($entries), $addedCount, $updatedCount, $removedCount);
 
-        /** @var Logger $logger */
+            $grav = Grav::instance();
-        $logger = $grav['log'];
-        $logger->addDebug($message);
 
-        /** @var Debugger $debugger */
+            /** @var Debugger $debugger */
-        $debugger = $grav['debugger'];
+            $debugger = $grav['debugger'];
-        $debugger->addMessage($message, 'debug');
+            $debugger->addMessage($message, 'debug');
+        }
     }
 
     public function __debugInfo()

system/src/Grav/Framework/Flex/FlexObject.php

@@ -12,6 +12,7 @@ namespace Grav\Framework\Flex;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Twig\Twig;
 use Grav\Common\Utils;
 use Grav\Framework\Cache\CacheInterface;
@@ -54,9 +55,13 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     /** @var FlexFormInterface[] */
     private $_forms = [];
     /** @var array */
-    private $_storage;
+    private $_meta;
     /** @var array */
     protected $_changes;
+    /** @var string */
+    protected $storage_key;
+    /** @var int */
+    protected $storage_timestamp;
 
     /**
      * @return array
@@ -68,8 +73,10 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
             'getType' => true,
             'getFlexType' => true,
             'getFlexDirectory' => true,
+            'hasFlexFeature' => true,
+            'getFlexFeatures' => true,
             'getCacheKey' => true,
-            'getCacheChecksum' => true,
+            'getCacheChecksum' => false,
             'getTimestamp' => true,
             'value' => true,
             'exists' => true,
@@ -97,6 +104,11 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     {
         $this->_flexDirectory = $directory;
 
+        if (isset($elements['__META'])) {
+            $this->setStorage($elements['__META']);
+            unset($elements['__META']);
+        }
+
         if ($validate) {
             $blueprint = $this->getFlexDirectory()->getBlueprint();
 
@@ -110,6 +122,31 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
         $this->objectConstruct($elements, $key);
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        $implements = class_implements($this);
+        $list = [];
+        foreach ($implements as $interface) {
+            $feature = Inflector::hyphenize(preg_replace('/(.*\\\\)(.*?)Interface$/', '\\2', $interface));
+            $list[] = $feature;
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::getFlexType()
@@ -134,7 +171,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getTimestamp(): int
     {
-        return $this->_storage['storage_timestamp'] ?? 0;
+        return $this->_meta['storage_timestamp'] ?? 0;
     }
 
     /**
@@ -143,7 +180,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getCacheKey(): string
     {
-        return $this->getTypePrefix() . $this->getFlexType() . '.' . $this->getStorageKey();
+        return $this->hasKey() ? $this->getTypePrefix() . $this->getFlexType() . '.' . $this->getKey() : '';
     }
 
     /**
@@ -152,7 +189,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getCacheChecksum(): string
     {
-        return (string)$this->getTimestamp();
+        return (string)($this->_meta['checksum'] ?? $this->getTimestamp());
     }
 
     /**
@@ -185,7 +222,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getKey()
     {
-        return $this->_key ?: $this->getFlexType() . '@@' . spl_object_hash($this);
+        return (string)$this->_key;
     }
 
     /**
@@ -194,7 +231,13 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getFlexKey(): string
     {
-        return $this->_storage['flex_key'] ?? $this->_flexDirectory->getFlexType() . '.obj:' . $this->getStorageKey();
+        $key = $this->_meta['flex_key'] ?? null;
+
+        if (!$key && $key = $this->getStorageKey()) {
+            $key = $this->_flexDirectory->getFlexType() . '.obj:' . $key;
+        }
+
+        return (string)$key;
     }
 
     /**
@@ -203,7 +246,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getStorageKey(): string
     {
-        return $this->_storage['storage_key'] ?? $this->getTypePrefix() . $this->getFlexType() . '@@' . spl_object_hash($this);
+        return (string)($this->storage_key ?? $this->_meta['storage_key'] ?? null);
     }
 
     /**
@@ -249,7 +292,11 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     public function searchNestedProperty(string $property, string $search, array $options = null): float
     {
         $options = $options ?? $this->getFlexDirectory()->getConfig('data.search.options', []);
-        $value = $this->getNestedProperty($property);
+        if ($property === 'key') {
+            $value = $this->getKey();
+        } else {
+            $value = $this->getNestedProperty($property);
+        }
 
         return $this->searchValue($property, $value, $search, $options);
     }
@@ -345,7 +392,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function setStorageKey($key = null)
     {
-        $this->_storage['storage_key'] = $key;
+        $this->storage_key = $key ?? '';
 
         return $this;
     }
@@ -356,7 +403,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function setTimestamp($timestamp = null)
     {
-        $this->_storage['storage_timestamp'] = $timestamp ?? time();
+        $this->storage_timestamp = $timestamp ?? time();
 
         return $this;
     }
@@ -379,20 +426,28 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
         $debugger = $grav['debugger'];
         $debugger->startTimer('flex-object-' . ($debugKey =  uniqid($type, false)), 'Render Object ' . $type . ' (' . $layout . ')');
 
-        $cache = $key = null;
+        $key = $this->getCacheKey();
-        foreach ($context as $value) {
+
-            if (!\is_scalar($value)) {
+        // Disable caching if context isn't all scalars.
-                $key = false;
+        if ($key) {
+            foreach ($context as $value) {
+                if (!\is_scalar($value)) {
+                    $key = '';
+                    break;
+                }
             }
         }
 
-        if ($key !== false) {
+        if ($key) {
-            $key = md5($this->getCacheKey() . '.' . $layout . json_encode($context));
+            // Create a new key which includes layout and context.
+            $key = md5($key . '.' . $layout . json_encode($context));
             $cache = $this->getCache('render');
+        } else {
+            $cache = null;
         }
 
         try {
-            $data = $cache && $key ? $cache->get($key) : null;
+            $data = $cache ? $cache->get($key) : null;
 
             $block = $data ? HtmlBlock::fromArray($data) : null;
         } catch (InvalidArgumentException $e) {
@@ -413,7 +468,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
         if (!$block) {
             $block = HtmlBlock::create($key ?: null);
             $block->setChecksum($checksum);
-            if ($key === false) {
+            if (!$cache) {
                 $block->disableCache();
             }
 
@@ -435,7 +490,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
             $block->setContent($output);
 
             try {
-                $cache && $key && $block->isCached() && $cache->set($key, $block->toArray());
+                $cache && $block->isCached() && $cache->set($key, $block->toArray());
             } catch (InvalidArgumentException $e) {
                 $debugger->addException($e);
             }
@@ -531,6 +586,24 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
         return $this->save();
     }
 
+    /**
+     * @param string|null $key
+     * @return FlexObject|FlexObjectInterface
+     */
+    public function createCopy(string $key = null)
+    {
+        $this->markAsCopy();
+
+        return $this->create($key);
+    }
+
+    protected function markAsCopy()
+    {
+        $meta = $this->getMetaData();
+        $meta['copy'] = true;
+        $this->_meta = $meta;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::save()
@@ -539,15 +612,33 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     {
         $this->triggerEvent('onBeforeSave');
 
-        $result = $this->getFlexDirectory()->getStorage()->replaceRows([$this->getStorageKey() => $this->prepareStorage()]);
+        $storage = $this->getFlexDirectory()->getStorage();
+
+        $key = $this->getStorageKey() ?:  '@@' . spl_object_hash($this);
+        $meta = $this->getMetaData();
+
+        /** @var string|null $origKey */
+        $origKey = $meta['storage_key'] ?? null;
+        if (null !== $origKey && $key !== $origKey) {
+            if (!empty($meta['copy'])) {
+                $storage->copyRow($origKey, $key);
+            } else {
+                $storage->renameRow($origKey, $key);
+            }
+        }
+
+        $result = $storage->replaceRows([$key => $this->prepareStorage()]);
 
         $value = reset($result);
-        $storageKey = (string)key($result);
+        $meta = $value['__META'] ?? null;
+        if ($meta) {
+            $this->_meta = $meta;
+        }
+
+        $storageKey = $meta['storage_key'] ?? (string)key($result);
         if ($value && $storageKey) {
             $this->setStorageKey($storageKey);
-            if (!$this->hasKey()) {
+            $this->setKey($meta['key'] ?? $storageKey);
-                $this->setKey($storageKey);
-            }
         }
 
         // FIXME: For some reason locator caching isn't cleared for the file, investigate!
@@ -564,7 +655,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
         }
 
         try {
-            $this->getFlexDirectory()->clearCache();
+            $this->getFlexDirectory()->reloadIndex();
             if (method_exists($this, 'clearMediaCache')) {
                 $this->clearMediaCache();
             }
@@ -587,12 +678,16 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function delete()
     {
+        if (!$this->exists()) {
+            return $this;
+        }
+
         $this->triggerEvent('onBeforeDelete');
 
         $this->getFlexDirectory()->getStorage()->deleteRows([$this->getStorageKey() => $this->prepareStorage()]);
 
         try {
-            $this->getFlexDirectory()->clearCache();
+            $this->getFlexDirectory()->reloadIndex();
             if (method_exists($this, 'clearMediaCache')) {
                 $this->clearMediaCache();
             }
@@ -615,17 +710,20 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     public function getBlueprint(string $name = '')
     {
-        return $this->_flexDirectory->getBlueprint($name ? '.' . $name : $name);
+        $blueprint = clone $this->_flexDirectory->getBlueprint($name ? '.' . $name : $name);
+        $blueprint->setObject($this);
+
+        return $blueprint->init();
     }
 
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::getForm()
      */
-    public function getForm(string $name = '', array $form = null)
+    public function getForm(string $name = '', array $options = null)
     {
         if (!isset($this->_forms[$name])) {
-            $this->_forms[$name] = $this->createFormObject($name, $form);
+            $this->_forms[$name] = $this->createFormObject($name, $options);
         }
 
         return $this->_forms[$name];
@@ -715,6 +813,8 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     {
         return [
             'type:private' => $this->getFlexType(),
+            'storage_key:protected' => $this->getStorageKey(),
+            'storage_timestamp:protected' => $this->getTimestamp(),
             'key:private' => $this->getKey(),
             'elements:private' => $this->getElements(),
             'storage:private' => $this->getStorage()
@@ -765,12 +865,13 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     {
         $this->_flexDirectory = $directory;
     }
+
     /**
      * @param array $storage
      */
     protected function setStorage(array $storage) : void
     {
-        $this->_storage = $storage;
+        $this->_meta = $storage;
     }
 
     /**
@@ -778,7 +879,7 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     protected function getStorage() : array
     {
-        return $this->_storage ?? [];
+        return $this->_meta ?? [];
     }
 
     /**
@@ -853,25 +954,25 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
      */
     protected function filterElements(array &$elements): void
     {
-        if (!empty($elements['storage_key'])) {
+        if (isset($elements['storage_key'])) {
-            $this->_storage['storage_key'] = trim($elements['storage_key']);
+            $elements['storage_key'] = trim($elements['storage_key']);
         }
-        if (!empty($elements['storage_timestamp'])) {
+        if (isset($elements['storage_timestamp'])) {
-            $this->_storage['storage_timestamp'] = (int)$elements['storage_timestamp'];
+            $elements['storage_timestamp'] = (int)$elements['storage_timestamp'];
         }
 
-        unset ($elements['storage_key'], $elements['storage_timestamp'], $elements['_post_entries_save']);
+        unset ($elements['_post_entries_save']);
     }
 
     /**
      * This methods allows you to override form objects in child classes.
      *
      * @param string $name Form name
-     * @param array|null $form Form fields
+     * @param array $options Form optiosn
      * @return FlexFormInterface
      */
-    protected function createFormObject(string $name, array $form = null)
+    protected function createFormObject(string $name, array $options = null)
     {
-        return new FlexForm($name, $this, $form);
+        return new FlexForm($name, $this, $options);
     }
 }

system/src/Grav/Framework/Flex/Interfaces/FlexCommonInterface.php

@@ -38,6 +38,21 @@ interface FlexCommonInterface extends RenderInterface
      */
     public function getFlexDirectory(): FlexDirectory;
 
+    /**
+     * Test whether the feature is implemented in the object / collection.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasFlexFeature(string $name): bool;
+
+    /**
+     * Get full list of features the object / collection implements.
+     *
+     * @return array
+     */
+    public function getFlexFeatures(): array;
+
     /**
      * Get last updated timestamp for the object / collection.
      *

system/src/Grav/Framework/Flex/Interfaces/FlexObjectInterface.php

@@ -165,12 +165,12 @@ interface FlexObjectInterface extends FlexCommonInterface, NestedObjectInterface
      * Returns a form instance for the object.
      *
      * @param string $name Name of the form. Can be used to create customized forms for different use cases.
-     * @param array|null $form  Can be used to further customize the form.
+     * @param array|null $options  Options can be used to further customize the form.
      *
      * @return FlexFormInterface Returns a Form.
      * @api
      */
-    public function getForm(string $name = '', array $form = null);
+    public function getForm(string $name = '', array $options = null);
 
     /**
      * Returns default value suitable to be used in a form for the given property.

system/src/Grav/Framework/Flex/Interfaces/FlexStorageInterface.php

@@ -29,6 +29,12 @@ interface FlexStorageInterface
      */
     public function getKeyField(): string;
 
+    /**
+     * @param string[] $keys
+     * @return array
+     */
+    public function getMetaData(array $keys): array;
+
     /**
      * Returns associated array of all existing storage keys with a timestamp.
      *
@@ -106,6 +112,14 @@ interface FlexStorageInterface
      */
     public function replaceRows(array $rows): array;
 
+    /**
+     * @param string $src
+     * @param string $dst
+     *
+     * @return bool
+     */
+    public function copyRow(string $src, string $dst): bool;
+
     /**
      * @param string $src
      * @param string $dst

system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php

@@ -149,6 +149,6 @@ abstract class AbstractFilesystemStorage implements FlexStorageInterface
      */
     protected function validateKey(string $key): bool
     {
-        return (bool) preg_match('/^[^\\/\\?\\*:;{}\\\\\\n]+$/u', $key);
+        return $key && (bool) preg_match('/^[^\\/\\?\\*:;{}\\\\\\n]+$/u', $key);
     }
 }

system/src/Grav/Framework/Flex/Storage/FileStorage.php

@@ -25,7 +25,7 @@ class FileStorage extends FolderStorage
      */
     public function __construct(array $options)
     {
-        $this->dataPattern = '{FOLDER}/{KEY}';
+        $this->dataPattern = '{FOLDER}/{KEY}{EXT}';
 
         if (!isset($options['formatter']) && isset($options['pattern'])) {
             $options['formatter'] = $this->detectDataFormatter($options['pattern']);
@@ -69,10 +69,7 @@ class FileStorage extends FolderStorage
                 continue;
             }
 
-            $list[$key] = [
+            $list[$key] = $this->getObjectMeta($key);
-                'storage_key' => $key,
-                'storage_timestamp' => $info->getMTime()
-            ];
         }
 
         ksort($list, SORT_NATURAL);

system/src/Grav/Framework/Flex/Storage/FolderStorage.php

@@ -24,14 +24,20 @@ use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
  */
 class FolderStorage extends AbstractFilesystemStorage
 {
-    /** @var string */
+    /** @var string Folder where all the data is stored. */
     protected $dataFolder;
-    /** @var string */
+    /** @var string Pattern to access an object. */
-    protected $dataPattern = '{FOLDER}/{KEY}/item';
+    protected $dataPattern = '{FOLDER}/{KEY}/{FILE}{EXT}';
+    /** @var string Filename for the object. */
+    protected $dataFile;
+    /** @var string File extension for the object. */
+    protected $dataExt;
     /** @var bool */
     protected $prefixed;
     /** @var bool */
     protected $indexed;
+    /** @var array */
+    protected $meta = [];
 
     /**
      * {@inheritdoc}
@@ -44,16 +50,20 @@ class FolderStorage extends AbstractFilesystemStorage
 
         $this->initDataFormatter($options['formatter'] ?? []);
         $this->initOptions($options);
+    }
 
-        // Make sure that the data folder exists.
+    /**
-        $folder = $this->resolvePath($this->dataFolder);
+     * @param string[] $keys
-        if (!file_exists($folder)) {
+     * @return array
-            try {
+     */
-                Folder::create($folder);
+    public function getMetaData(array $keys): array
-            } catch (\RuntimeException $e) {
+    {
-                throw new \RuntimeException(sprintf('Flex: %s', $e->getMessage()));
+        $list = [];
-            }
+        foreach ($keys as $key) {
+            $list[$key] = $this->getObjectMeta($key);
         }
+
+        return $list;
     }
 
     /**
@@ -87,6 +97,7 @@ class FolderStorage extends AbstractFilesystemStorage
             $path = $this->getPathFromKey($key);
             $file = $this->getFile($path);
             $list[$key] = $this->saveFile($file, $row);
+            $list[$key]['__META'] = $this->getObjectMeta($key, true);
         }
 
         return $list;
@@ -100,7 +111,7 @@ class FolderStorage extends AbstractFilesystemStorage
     {
         $list = [];
         foreach ($rows as $key => $row) {
-            if (null === $row || (!\is_object($row) && !\is_array($row))) {
+            if (null === $row || \is_scalar($row)) {
                 // Only load rows which haven't been loaded before.
                 $key = (string)$key;
                 if (!$this->hasKey($key)) {
@@ -109,6 +120,7 @@ class FolderStorage extends AbstractFilesystemStorage
                     $path = $this->getPathFromKey($key);
                     $file = $this->getFile($path);
                     $list[$key] = $this->loadFile($file);
+                    $list[$key]['__META'] = $this->getObjectMeta($key);
                 }
                 if (null !== $fetched) {
                     $fetched[$key] = $list[$key];
@@ -137,6 +149,7 @@ class FolderStorage extends AbstractFilesystemStorage
                 $path = $this->getPathFromKey($key);
                 $file = $this->getFile($path);
                 $list[$key] = $this->saveFile($file, $row);
+                $list[$key]['__META'] = $this->getObjectMeta($key, true);
             }
         }
 
@@ -150,6 +163,7 @@ class FolderStorage extends AbstractFilesystemStorage
     public function deleteRows(array $rows): array
     {
         $list = [];
+        $baseMediaPath = $this->getMediaPath();
         foreach ($rows as $key => $row) {
             $key = (string)$key;
             if (!$this->hasKey($key)) {
@@ -159,11 +173,15 @@ class FolderStorage extends AbstractFilesystemStorage
                 $file = $this->getFile($path);
                 $list[$key] = $this->deleteFile($file);
 
-                $storage = $this->getStoragePath($key);
+                $storagePath = $this->getStoragePath($key);
-                $media = $this->getMediaPath($key);
+                $mediaPath = $this->getMediaPath($key);
 
-                $this->deleteFolder($storage, true);
+                if ($storagePath) {
-                $media && $this->deleteFolder($media, true);
+                    $this->deleteFolder($storagePath, true);
+                }
+                if ($mediaPath && $mediaPath !== $storagePath && $mediaPath !== $baseMediaPath) {
+                    $this->deleteFolder($mediaPath, true);
+                }
             }
         }
 
@@ -179,17 +197,37 @@ class FolderStorage extends AbstractFilesystemStorage
         $list = [];
         foreach ($rows as $key => $row) {
             $key = (string)$key;
-            if (strpos($key, '@@')) {
+            if (strpos($key, '@@') !== false) {
                 $key = $this->getNewKey();
             }
             $path = $this->getPathFromKey($key);
             $file = $this->getFile($path);
             $list[$key] = $this->saveFile($file, $row);
+            $list[$key]['__META'] = $this->getObjectMeta($key, true);
         }
 
         return $list;
     }
 
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    public function copyRow(string $src, string $dst): bool
+    {
+        if ($this->hasKey($dst)) {
+            throw new \RuntimeException("Cannot copy object: key '{$dst}' is already taken");
+        }
+
+        if (!$this->hasKey($src)) {
+            return false;
+        }
+
+        return $this->copyFolder($this->getStoragePath($src), $this->getStoragePath($dst));
+    }
+
+
     /**
      * {@inheritdoc}
      * @see FlexStorageInterface::renameRow()
@@ -204,7 +242,7 @@ class FolderStorage extends AbstractFilesystemStorage
             return false;
         }
 
-        return $this->moveFolder($this->getMediaPath($src), $this->getMediaPath($dst));
+        return $this->moveFolder($this->getStoragePath($src), $this->getStoragePath($dst));
     }
 
     /**
@@ -213,10 +251,18 @@ class FolderStorage extends AbstractFilesystemStorage
      */
     public function getStoragePath(string $key = null): string
     {
-        if (null === $key) {
+        if (null === $key || $key === '') {
             $path = $this->dataFolder;
         } else {
-            $path = sprintf($this->dataPattern, $this->dataFolder, $key, substr($key, 0, 2));
+            $options = [
+                $this->dataFolder,
+                $key,
+                \mb_substr($key, 0, 2),
+                '***',
+                '***'
+            ];
+
+            $path = rtrim(explode('***', sprintf($this->dataPattern, ...$options))[0], '/');
         }
 
         return $path;
@@ -228,7 +274,7 @@ class FolderStorage extends AbstractFilesystemStorage
      */
     public function getMediaPath(string $key = null): string
     {
-        return null !== $key ? \dirname($this->getStoragePath($key)) : $this->getStoragePath();
+        return $this->getStoragePath($key);
     }
 
     /**
@@ -239,7 +285,26 @@ class FolderStorage extends AbstractFilesystemStorage
      */
     public function getPathFromKey(string $key): string
     {
-        return sprintf($this->dataPattern, $this->dataFolder, $key, substr($key, 0, 2));
+        $options = [
+            $this->dataFolder,
+            $key,
+            \mb_substr($key, 0, 2),
+            $this->dataFile,
+            $this->dataExt
+        ];
+
+        return sprintf($this->dataPattern, ...$options);
+    }
+
+    /**
+     * Get key from the filesystem path.
+     *
+     * @param  string $path
+     * @return string
+     */
+    protected function getKeyFromPath(string $path): string
+    {
+        return basename($path);
     }
 
     /**
@@ -272,6 +337,7 @@ class FolderStorage extends AbstractFilesystemStorage
     protected function saveFile(File $file, array $data): array
     {
         try {
+            unset($data['__META'], $data['__error']);
             $file->save($data);
 
             /** @var UniformResourceLocator $locator */
@@ -294,7 +360,9 @@ class FolderStorage extends AbstractFilesystemStorage
     {
         try {
             $data = $file->content();
-            $file->delete();
+            if ($file->exists()) {
+                $file->delete();
+            }
 
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
@@ -308,6 +376,28 @@ class FolderStorage extends AbstractFilesystemStorage
         return $data;
     }
 
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    protected function copyFolder(string $src, string $dst): bool
+    {
+        try {
+            Folder::copy($this->resolvePath($src), $this->resolvePath($dst));
+
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            if ($locator->isStream($src) || $locator->isStream($dst)) {
+                $locator->clearCache();
+            }
+        } catch (\RuntimeException $e) {
+            throw new \RuntimeException(sprintf('Flex copyFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
+        }
+
+        return true;
+    }
+
     /**
      * @param string $src
      * @param string $dst
@@ -352,17 +442,6 @@ class FolderStorage extends AbstractFilesystemStorage
         }
     }
 
-    /**
-     * Get key from the filesystem path.
-     *
-     * @param  string $path
-     * @return string
-     */
-    protected function getKeyFromPath(string $path): string
-    {
-        return basename($path);
-    }
-
     /**
      * Returns list of all stored keys in [key => timestamp] pairs.
      *
@@ -386,6 +465,31 @@ class FolderStorage extends AbstractFilesystemStorage
         return $list;
     }
 
+    /**
+     * @param string $key
+     * @param bool $reload
+     * @return array
+     */
+    protected function getObjectMeta(string $key, bool $reload = false): array
+    {
+        if (!$reload && isset($this->meta[$key])) {
+            return $this->meta[$key];
+        }
+
+        $filename = $this->getPathFromKey($key);
+        $modified = is_file($filename) ? filemtime($filename) : 0;
+
+        $meta = [
+            'storage_key' => $key,
+            'storage_timestamp' => $modified
+        ];
+
+        $this->meta[$key] = $meta;
+
+        return $meta;
+    }
+
+
     protected function buildIndexFromFilesystem($path)
     {
         $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
@@ -394,21 +498,15 @@ class FolderStorage extends AbstractFilesystemStorage
         $list = [];
         /** @var \SplFileInfo $info */
         foreach ($iterator as $filename => $info) {
-            if (!$info->isDir()) {
+            if (!$info->isDir() || strpos($info->getFilename(), '.') === 0) {
                 continue;
             }
 
             $key = $this->getKeyFromPath($filename);
-            $filename = $this->getPathFromKey($key);
+            $meta = $this->getObjectMeta($key);
-            $modified = is_file($filename) ? filemtime($filename) : null;
+            if ($meta['storage_timestamp']) {
-            if (null === $modified) {
+                $list[$key] = $meta;
-                continue;
             }
-
-            $list[$key] = [
-                'storage_key' => $key,
-                'storage_timestamp' => $modified
-            ];
         }
 
         return $list;
@@ -460,11 +558,26 @@ class FolderStorage extends AbstractFilesystemStorage
         $pattern = !empty($options['pattern']) ? $options['pattern'] : $this->dataPattern;
 
         $this->dataFolder = $options['folder'];
+        $this->dataFile = $options['file'] ?? 'item';
+        $this->dataExt = $extension;
+        if (\mb_strpos($pattern, '{FILE}') === false && \mb_strpos($pattern, '{EXT}') === false) {
+            if (isset($options['file'])) {
+                $pattern .= '/{FILE}{EXT}';
+            } else {
+                $this->dataFile = \basename($pattern, $extension);
+                $pattern = \dirname($pattern) . '/{FILE}{EXT}';
+            }
+        }
         $this->prefixed = (bool)($options['prefixed'] ?? strpos($pattern, '/{KEY:2}/'));
         $this->indexed = (bool)($options['indexed'] ?? false);
         $this->keyField = $options['key'] ?? 'storage_key';
 
-        $pattern = preg_replace(['/{FOLDER}/', '/{KEY}/', '/{KEY:2}/'], ['%1$s', '%2$s', '%3$s'], $pattern);
+        $pattern = preg_replace(
-        $this->dataPattern = \dirname($pattern) . '/' . basename($pattern, $extension) . $extension;
+            ['/{FOLDER}/', '/{KEY}/', '/{KEY:2}/', '/{FILE}/', '/{EXT}/'],
+            ['%1$s',       '%2$s',    '%3$s',      '%4$s',     '%5$s'],
+            $pattern
+        );
+
+        $this->dataPattern = $pattern;
     }
 }