prepare for beta.7 release

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

.editorconfig

@@ -13,6 +13,5 @@ indent_style = space
 indent_size = 4
 
 # 2 space indentation
-[*.yaml, *.yml]
-indent_style = space
+[*.{yaml,.yml}]
 indent_size = 2

.github/FUNDING.yml

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

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - '7.1'
   - '7.2'
+  - '7.3'
 branches:
   only:
     - develop
@@ -11,13 +12,6 @@ notifications:
   email:
     on_success: never
     on_failure: always
-  hipchat:
-  # hipchat_api@grav
-    rooms:
-      - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
-    template:
-      - '%{repository}#%{build_number} (%{branch}): Travis Job Finished [%{duration}] (<a href="%{build_url}">Details</a>)'
-    format: html
   slack:
     secure: dowksPsxxCxGKT6nis5hUgkp6+ZDAhoqzQHF9rJnx4hx0iEygPhVBs7pKl9yL2jubYJoLs+EXwE7z1dYgDAEJh4BnfrCokCMLpFGcxVxQC/HeAUdSQ2/RtdBYR5PRT75ScaFpqM/SfXXZVtnwVXAw9Z+JC6BjQ9vmn23m51Jw4k=
 env:

CHANGELOG.md

@@ -1,23 +1,308 @@
-# v1.6.0-rc.1
-## 01/30/2019
+# v1.7.0-beta.7
+## 08/30/2019
 
 1. [](#improved)
-    * Improved `$page->forms()` call, added `$page->addForms()`
-    * Made `FormFlashFile` more robust against deleted files
-    * Removed apc and xcache support, made apc alias of apcu
-    * Updated languages from crowdin
+    * Improved language support
 1. [](#bugfix)
-    * Fixed a bug in `FormFlashFile::moveTo()` not deleting the old file
-    * Fixed `FlexMediaTrait::getMedia()` trying to include uploaded but already moved media
-    * Fixed `ImageMedium` constructor warning when file does not exist
-    * Fixed bad host header in PSR-7 (if using 'php -S localhost:8000 system/router.php')
-    * Fixed Getters::count() method not returning anything
-    * Fixed non-namespaced exceptions in scheduler
-    
-# v1.6.0-beta.8
-## 01/25/2019
+    * `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/16/2019
+
+1. [](#bugfix)
+    * Regression fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627)
+
+# v1.6.12
+## 08/14/2019
+
+1. [](#new)
+    * Added support for custom `FormFlash` save locations
+    * Added a new `Utils::arrayLower()` method for lowercasing arrays
+    * Support new GRAV_BASEDIR environment variable [#2541](https://github.com/getgrav/grav/pull/2541)
+    * Allow users to override plugin handler priorities [#2165](https://github.com/getgrav/grav/pull/2165)
+1. [](#improved)
+    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)  
+    * Updated vendor libraries
+    * Markdown filter is now page-aware so that it works with modular references [admin#1731](https://github.com/getgrav/grav-plugin-admin/issues/1731)
+    * Check of `GRAV_USER_INSTANCE` constant is already defined [#2621](https://github.com/getgrav/grav/pull/2621)
+1. [](#bugfix)
+    * Fixed some potential issues when `$grav['user']` is not set
+    * Fixed error when calling `Media::add($name, null)`
+    * Fixed `url()` returning wrong path if using stream with grav root path in it, eg: `user-data://shop` when Grav is in `/shop`
+    * Fixed `url()` not returning a path to non-existing file (`user-data://shop` => `/user/data/shop`) if it is set to fail gracefully
+    * Fixed `url()` returning false on unknown streams, such as `ftp://domain.com`, they should be treated as external URL
+    * Fixed Flex User to have permissions to save and delete his own user
+    * Fixed new Flex User creation not being possible because of username could not be given
+    * Fixed fatal error 'Expiration date must be an integer, a DateInterval or null, "double" given' [#2529](https://github.com/getgrav/grav/issues/2529)
+    * Fixed non-existing Flex object having a bad media folder
+    * Fixed collections using `page@.self:` should allow modular pages if requested
+    * Fixed an error when trying to delete a file from non-existing Flex Object
+    * Fixed `FlexObject::exists()` failing sometimes just after the object has been saved
+    * Fixed CSV formatter not encoding strings with `"` and `,` properly
+    * Fixed var order in `Validation.php` [#2610](https://github.com/getgrav/grav/issues/2610)
+    
+# v1.6.11
+## 06/21/2019
+
+1. [](#new)
+    * Added `FormTrait::getAllFlashes()` method to get all the available form flash objects for the form
+    * Added creation and update timestamps to `FormFlash` objects
+1. [](#improved)
+    * Added `FormFlashInterface`, changed constructor to take `$config` array
+1. [](#bugfix)
+    * Fixed error in `ImageMedium::url()` if the image cache folder does not exist
+    * Fixed empty form flash name after file upload or form state update
+    * Fixed a bug in `Route::withParam()` method
+    * Fixed issue with `FormFlash` objects when there is no session initialized
+
+# v1.6.10
+## 06/14/2019
+
+1. [](#improved)
+    * Added **page blueprints** to `YamlLinter` CLI and Admin reports
+    * Removed `Gitter` and `Slack` [#2502](https://github.com/getgrav/grav/issues/2502)
+    * Optimizations for Plugin/Theme loading
+    * Generalized markdown classes so they can be used outside of `Page` scope with a custom `Excerpts` class instance
+    * Change minimal port number to 0 (unix socket) [#2452](https://github.com/getgrav/grav/issues/2452)
+1. [](#bugfix)
+    * Force question to install demo content in theme update [#2493](https://github.com/getgrav/grav/issues/2493)
+    * Fixed GPM errors from blueprints not being logged [#2505](https://github.com/getgrav/grav/issues/2505)
+    * Don't error when IP is invalid [#2507](https://github.com/getgrav/grav/issues/2507)
+    * Fixed regression with `bin/plugin` not listing the plugins available (1c725c0)
+    * Fixed bitwise operator in `TwigExtension::exifFunc()` [#2518](https://github.com/getgrav/grav/issues/2518)
+    * Fixed issue with lang prefix incorrectly identifying as admin [#2511](https://github.com/getgrav/grav/issues/2511)
+    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511) 
+    * Fixed regresssion issue of `Utils::Url()` not returning `false` on failure. Added new optional `fail_gracefully` 3rd attribute to return string that caused failure [#2524](https://github.com/getgrav/grav/issues/2524)
+
+# v1.6.9
+## 05/09/2019
+
+1. [](#new)
+    * Added `Route::withoutParams()` methods
+    * Added `Pages::setCheckMethod()` method to override page configuration in Admin Plugin
+    * Added `Cache::clearCache('invalidate')` parameter for just invalidating the cache without deleting any cached files
+    * Made `UserCollectionInderface` to extend `Countable` to get the count of existing users
+1. [](#improved)
+    * Flex admin: added default search options for flex objects
+    * Flex collection and object now fall back to the default template if template file doesn't exist
+    * Updated Vendor libraries including Twig 1.40.1
+    * Updated language files from `https://crowdin.com/project/grav-core`
+1. [](#bugfix)
+    * Fixed `$grav['route']` from being modified when the route instance gets modified
+    * Fixed Assets options array mixed with standalone priority [#2477](https://github.com/getgrav/grav/issues/2477)
+    * Fix for `avatar_url` provided by 3rd party providers
+    * Fixed non standard `lang` code lengths in `Utils` and `Session` detection
+    * Fixed saving a new object in Flex `SimpleStorage`
+    * Fixed exception in `Flex::getDirectories()` if the first parameter is set
+    * Output correct "Last Updated" in `bin/gpm info` command
+    * Checkbox getting interpreted as string, so created new `Validation::filterCheckbox()`
+    * Fixed backwards compatibility to `select` field with `selectize.create` set to true [git-sync#141](https://github.com/trilbymedia/grav-plugin-git-sync/issues/141)
+    * Fixed `YamlFormatter::decode()` to always return array [#2494](https://github.com/getgrav/grav/pull/2494)
+    * Fixed empty `$grav['request']->getAttribute('route')->getExtension()`
+
+# v1.6.8
+## 04/23/2019
+
+1. [](#new)
+    * Added `FlexCollection::filterBy()` method
+1. [](#bugfix)
+    * Revert `Use Null Coalesce Operator` [#2466](https://github.com/getgrav/grav/pull/2466)
+    * Fixed `FormTrait::render()` not providing config variable
+    * Updated `bin/grav clean` to clear `cache/compiled` and `user/config/security.yaml`
+
+# v1.6.7
+## 04/22/2019
+
+1. [](#new)
+    * Added a new `bin/grav yamllinter` CLI command to find YAML Linting issues [#2468](https://github.com/getgrav/grav/issues/2468#issuecomment-485151681)
+1. [](#improved)
+    * Improve `FormTrait` backwards compatibility with existing forms
+    * Added a new `Utils::getSubnet()` function for IPv4/IPv6 parsing [#2465](https://github.com/getgrav/grav/pull/2465)
+1. [](#bugfix)
+    * Remove disabled fields from the form schema
+    * Fix issue when excluding `inlineJs` and `inlineCss` from Assets pipeline [#2468](https://github.com/getgrav/grav/issues/2468)
+    * Fix for manually set position on external URLs [#2470](https://github.com/getgrav/grav/issues/2470)
+
+# v1.6.6
+## 04/17/2019
+
+1. [](#new)
+    * `FormInterface` now implements `RenderInterface`
+    * Added new `FormInterface::getTask()` method which reads the task from `form.task` in the blueprint
+1. [](#improved)
+    * Updated vendor libraries to latest
+1. [](#bugfix)
+    * Rollback `redirect_default_route` logic as it has issues with multi-lang [#2459](https://github.com/getgrav/grav/issues/2459)
+    * Fix potential issue with `|contains` Twig filter on PHP 7.3
+    * Fixed bug in text field filtering: return empty string if value isn't a string or number [#2460](https://github.com/getgrav/grav/issues/2460)
+    * Force Asset `priority` to be an integer and not throw error if invalid string passed [#2461](https://github.com/getgrav/grav/issues/2461)
+    * Fixed bug in text field filtering: return empty string if value isn't a string or number
+    * Fixed `FlexForm` missing getter methods for defining form variables
+
+# v1.6.5
+## 04/15/2019
+
+1. [](#bugfix)
+    * Backwards compatiblity with old `Uri::__toString()` output
+
+# v1.6.4
+## 04/15/2019
+
+1. [](#bugfix)
+    * Improved `redirect_default_route` logic as well as `Uri::toArray()` to take into account `root_path` and `extension`
+    * Rework logic to pull out excluded files from pipeline more reliably [#2445](https://github.com/getgrav/grav/issues/2445)
+    * Better logic in `Utils::normalizePath` to handle externals properly [#2216](https://github.com/getgrav/grav/issues/2216)
+    * Fixed to force all `Page::taxonomy` to be treated as strings [#2446](https://github.com/getgrav/grav/issues/2446)
+    * Fixed issue with `Grav['user']` not being available [form#332](https://github.com/getgrav/grav-plugin-form/issues/332)
+    * Updated rounding logic for `Utils::parseSize()` [#2394](https://github.com/getgrav/grav/issues/2394)
+    * Fixed Flex simple storage not being properly initialized if used with caching
+
+# v1.6.3
+## 04/12/2019
+
+1. [](#new)
+    * Added `Blueprint::addDynamicHandler()` method to allow custom dynamic handlers, for example `custom-options@: getCustomOptions`
+1. [](#bugfix)
+    * Missed a `CacheCommand` reference in `bin/grav` [#2442](https://github.com/getgrav/grav/issues/2442)
+    * Fixed issue with `Utils::normalizePath` messing with external URLs [#2216](https://github.com/getgrav/grav/issues/2216)
+    * Fix for `vUndefined` versions when upgrading
+
+# v1.6.2
+## 04/11/2019
+
+1. [](#bugfix)
+    * Revert renaming of `ClearCacheCommand` to ensure CLI GPM upgrades go smoothly
+
+# v1.6.1
+## 04/11/2019
+
+1. [](#improved)
+    * Improved CSS for the bottom filter bar of DebugBar
+1. [](#bugfix)
+    * Fixed issue with `@import` not being added to top of pipelined css [#2440](https://github.com/getgrav/grav/issues/2440)
+
+# v1.6.0
+## 04/11/2019
+
+1. [](#new)
+    * Set minimum requirements to [PHP 7.1.3](https://getgrav.org/blog/raising-php-requirements-2018)
+    * New `Scheduler` functionality for periodic jobs
+    * New `Backup` functionality with multiple backup profiles and scheduler integration
+    * Refactored `Assets Manager` to be more powerful and flexible
+    * Updated Doctrine Collections to 1.6
+    * Updated Doctrine Cache to 1.8
+    * Updated Symfony Components to 4.2
+    * Added new Cache purge functionality old cache manually via CLI/Admin as well as scheduler integration
+    * Added new `{% throw 404 'Not Found' %}` twig tag (with custom code/message)
+    * Added `Grav\Framework\File` classes for handling YAML, Markdown, JSON, INI and PHP serialized files
+    * Added `Grav\Framework\Collection\AbstractIndexCollection` class
+    * Added `Grav\Framework\Object\ObjectIndex` class
+    * Added `Grav\Framework\Flex` classes
+    * Added support for hiding form fields in blueprints by using dynamic property like `security@: admin.foobar`, `scope@: object` or `scope-ignore@: object` to any field
+    * New experimental **FlexObjects** powered `Users` for increased performance and capability (**disabled** by default)
+    * Added PSR-7 and PSR-15 classes
+    * Added `Grav\Framework\DI\Container` class
+    * Added `Grav\Framework\RequestHandler\RequestHandler` class
+    * Added `Page::httpResponseCode()` and `Page::httpHeaders()` methods
     * Added `Grav\Framework\Form\Interfaces\FormInterface`
     * Added `Grav\Framework\Form\Interfaces\FormFactoryInterface`
     * Added `Grav\Framework\Form\FormTrait`
@@ -29,25 +314,8 @@
     * Added form preview support for `FlexObject`, including a way to render newly uploaded files before saving them
     * Added `FlexObject::getChanges()` to determine what fields change during an update
     * Added `arrayDiffMultidimensional`, `arrayIsAssociative`, `arrayCombine` Util functions
-1. [](#improved)
-    * Added method argument `Data::filter($missingValuesAsNull)`, defaulting to `false`
-    * Improved `Grav\Common\User` class; added `$user->update()` method
-    * Added trim support for text input fields `validate: trim: true`
-1. [](#bugfix)
-    * Fixed environment getting port added [#2284](https://github.com/getgrav/grav/issues/2284)
-    * Fixed `FlexForm::updateObject()` to update array values when they are empty in the form
-    * Fixed some issues related to Medium objects losing query string attributes
-    * Broke out Medium timestamp so it's not cleared on `reset()s`
-    * Fixed issue with `redirect_trailing_slash` losing query string [#2269](https://github.com/getgrav/grav/issues/2269)
-    * Fixed failed login if user attempts to log in with upper case non-english letters
-    * Removed extra authenticated/authorized fields when saving existing user from a form
-    * Fixed `Grav\Framework\Route::__toString()` returning relative URL, not relative route
-    
-# v1.6.0-beta.7
-## 12/14/2018
-
-1. [](#new)
-    * Updated Symfony Components to 4.2
+    * New `$grav['users']` service to allow custom user classes implementing `UserInterface`
+    * Added `LogViewer` helper class and CLI command: `bin/grav logviewer`
     * Added `select()` and `unselect()` methods to `CollectionInterface` and its base classes
     * Added `orderBy()` and `limit()` methods to `ObjectCollectionInterface` and its base classes
     * Added `user-data://` which is a writable stream (`user://data` is not and should be avoided)
@@ -58,46 +326,64 @@
     * Added `Grav\Framework\Filesystem\Filesystem` class with methods to manipulate stream URLs
     * Added new `$grav['filesystem']` service using an instance of the new `Filesystem` object
     * Added `{% render object layout: 'default' with { variable: true } %}` for Flex objects and collections
-    * Grav 1.6: Flex: Added support for custom object index classes (API compatibility break)
-1. [](#improved)
-    * Improved `Grav\Framework\File\Formatter` classes to have abstract parent class and some useful methods
-    * Grav 1.6: Improved Flex storage classes
-    * Grav 1.6: Improved `Grav\Framework\File` classes to use better type hints and the new `Filesystem` class
-1. [](#bugfix)
-    * Fixed handling of `append_url_extension` inside of `Page::templateFormat()` [#2264](https://github.com/getgrav/grav/issues/2264) 
-    * Fixed a broken language string [#2261](https://github.com/getgrav/grav/issues/2261)
-    * Fixed clearing cache having no effect on Doctrine cache
-    * Fixed `Medium::relativePath()` for streams
-    * Fixed `Object` serialization breaking if overriding `jsonSerialize()` method
-    * Grav 1.6: Fixed `FlexObject::update()` call with partial object update
-    * Fixed `YamlFormatter::decode()` when calling `init_set()` with integer
-    * Fixed session throwing error in CLI if initialized
-
-# v1.6.0-beta.6
-## 11/12/2018
-
-1. [](#new)
     * Added `$grav->setup()` to simplify CLI and custom access points
-    * Grav 1.6: Added `CsvFormatter` and `CsvFile` classes
+    * Added `CsvFormatter` and `CsvFile` classes
+    * Added new system config option to `pages.hide_empty_folders` if a folder has no valid `.md` file available. Default behavior is `false` for compatibility.
+    * Added new system config option for `languages.pages_fallback_only` forcing only 'fallback' to find page content through supported languages, default behavior is to display any language found if active language is missing
+    * Added `Utils::arrayFlattenDotNotation()` and `Utils::arrayUnflattenDotNotation()` helper methods
 1. [](#improved)
+    * Add the page to onMarkdownInitialized event [#2412](https://github.com/getgrav/grav/issues/2412)
+    * Doctrine filecache is now namespaced with prefix to support purging
+    * Register all page types into `blueprint://pages` stream
+    * Removed `apc` and `xcache` support, made `apc` alias of `apcu`
+    * Support admin and regular translations via the `|t` twig filter and `t()` twig function
+    * Improved Grav Core installer/updater to run installer script
+    * Updated vendor libraries including Symfony `4.2.3`
+    * Renamed old `User` class to `Grav\Common\User\DataUser\User` with multiple improvements and small fixes
+    * `User` class now acts as a compatibility layer to older versions of Grav
+    * Deprecated `new User()`, `User::load()`, `User::find()` and `User::delete()` in favor of `$grav['users']` service
+    * `Media` constructor has now support to not to initialize the media objects
+    * Cleanly handle session corruption due to changing Flex object types
+    * Added `FlexObjectInterface::getDefaultValue()` and `FormInterface::getDefaultValue()`
+    * Added new `onPageContent()` event for every call to `Page::content()`
+    * Added phpstan: PHP Static Analysis Tool [#2393](https://github.com/getgrav/grav/pull/2393)
+    * Added `composer test-plugins` to test plugin issues with the current version of Grav
+    * Added `Flex::getObjects()` and `Flex::getMixedCollection()` methods for co-mingled collections
+    * Added support to use single Flex key parameter in `Flex::getObject()` method
+    * Added `FlexObjectInterface::search()` and `FlexCollectionInterface::search()` methods
+    * Override `system.media.upload_limit` with PHP's `post_max_size` or `upload_max_filesize`
+    * Class `Grav\Common\Page\Medium\AbstractMedia` now use array traits instead of extending `Grav\Common\Getters`
+    * Implemented `Grav\Framework\Psr7` classes as `Nyholm/psr7` decorators
+    * Added a new `cache-clear` scheduled job to go along with `cache-purge`
+    * Renamed `Grav\Framework\File\Formatter\FormatterInterface` to `Grav\Framework\File\Interfaces\FileFormatterInterface`
+    * Improved `File::save()` to use a temporary file if file isn't locked
+    * Improved `|t` filter to better support admin `|tu` style filter if in admin
+    * Update all classes to rely on `PageInterface` instead of `Page` class
+    * Better error checking in `bin/plugin` for existence and enabled
+    * Removed `media.upload_limit` references
+    * Twig `nicenumber`: do not use 0 + string casting hack
+    * Converted Twig tags to use namespaced Twig classes
+    * Site shows error on page rather than hard-crash when page has invalid frontmatter [#2343](https://github.com/getgrav/grav/issues/2343)
+    * Added `languages.default_lang` option to override the default lang (usually first supported language)
+    * Added `Content-Type: application/json` body support for PSR-7 `ServerRequest`
+    * Remove PHP time limit in `ZipArchive`
+    * DebugBar: Resolve twig templates in deprecated backtraces in order to help locating Twig issues
+    * Added `$grav['cache']->getSimpleCache()` method for getting PSR-16 compatible cache
+    * MediaTrait: Use PSR-16 cache
+    * Improved `Utils::normalizePath()` to support non-protocol URLs
+    * Added ability to reset `Page::metadata` to allow rebuilding from automatically generated values
+    * Added back missing `page.types` field in system content configuration [admin#1612](https://github.com/getgrav/grav-plugin-admin/issues/1612)
+    * Console commands: add method for invalidating cache
+    * Updated languages
+    * Improved `$page->forms()` call, added `$page->addForms()`
+    * Updated languages from crowdin
+    * Fixed `ImageMedium` constructor warning when file does not exist
+    * Improved `Grav\Common\User` class; added `$user->update()` method
+    * Added trim support for text input fields `validate: trim: true`
+    * Improved `Grav\Framework\File\Formatter` classes to have abstract parent class and some useful methods
     * Support negotiated content types set via the Request `Accept:` header
     * Support negotiated language types set via the Request `Accept-Language:` header
     * Cleaned up and sorted the Service `idMap`
-    * Grav 1.6: Allow custom Flex form views
-1. [](#bugfix)
-    * Fixed `Uri::hasStandardPort()` to support reverse proxy configurations [#1786](https://github.com/getgrav/grav/issues/1786)
-    * Use `append_url_extension` from page header to set template format if set [#2604](https://github.com/getgrav/grav/pull/2064)
-    * Fixed some bugs in Grav environment selection logic
-
-# v1.6.0-beta.5
-## 11/05/2018
-
-1. [](#new)
-    * Added PSR-7 and PSR-15 classes
-    * Added `Grav\Framework\DI\Container` class
-    * Added `Grav\Framework\RequestHandler\RequestHandler` class
-    * Added `Page::httpResponseCode()` and `Page::httpHeaders()` methods
-1. [](#improved)
     * Updated `Grav` container object to implement PSR-11 `ContainerInterface`
     * Updated Grav `Processor` classes to implement PSR-15 `MiddlewareInterface`
     * Make `Data` class to extend `JsonSerializable`
@@ -106,67 +392,75 @@
     * Set session name based on `security.salt` rather than `GRAV_ROOT` [#2242](https://github.com/getgrav/grav/issues/2242)
     * Added option to configure list of `xss_invalid_protocols` in `Security` config [#2250](https://github.com/getgrav/grav/issues/2250)
     * Smarter `security.salt` checking now we use `security.yaml` for other options
-    * Grav 1.6: Merged Grav 1.5.4 fixes in
-
-# v1.6.0-beta.4
-## 10/24/2018
-
-1. [](#new)
-    * Added new system config option to `pages.hide_empty_folders` if a folder has no valid `.md` file available. Default behavior is `false` for compatibility.
-    * Added new system config option for `languages.pages_fallback_only` forcing only 'fallback' to find page content through supported languages, default behavior is to display any language found if active language is missing
-    * Added `Utils::arrayFlattenDotNotation()` and `Utils::arrayUnflattenDotNotation()` helper methods
-1. [](#improved)
     * Added apcu autoloader optimization
     * Additional helper methods in `Language`, `Languages`, and `LanguageCodes` classes
-1. [](#bugfix)
-    * Use login provider User avatar if set
-    * Fixed `Folder::doDelete($folder, false)` removing symlink when it should not
-
-# v1.6.0-beta.3
-## 10/15/2018
-
-1. [](#improved)
     * Call `onFatalException` event also on internal PHP errors
     * Built-in PHP Webserver: log requests before handling them
-1. [](#bugfix)
-    * Grav 1.6: Scheduler Fallback for never runs and Windows support [#2202](https://github.com/getgrav/grav/pull/2202)
-
-# v1.6.0-beta.2
-## 10/09/2018
-
-1. [](#new)
-    * Grav 1.6: Added Flex support for custom media tasks
-1. [](#improved)
     * Added support for syslog and syslog facility logging (default: 'file')
     * Improved usability of `System` configuration blueprint with side-tabs
-1. [](#bugfix)
+ 1. [](#bugfix)
+    * Fixed issue with `Truncator::truncateWords` and `Truncator::truncateLetters` when string not wrapped in tags [#2432](https://github.com/getgrav/grav/issues/2432)
+    * Fixed `Undefined method closure::fields()` when getting avatar for user, thanks @Romarain [#2422](https://github.com/getgrav/grav/issues/2422)
+    * Fixed cached images not being updated when source image is modified
+    * Fixed deleting last list item in the form
+    * Fixed issue with `Utils::url()` method would append extra `base_url` if URL already included it
+    * Fixed `mkdir(...)` race condition
+    * Fixed `Obtaining write lock failed on file...`
+    * Fixed potential undefined property in `onPageNotFound` event handling
+    * Fixed some potential issues/bugs found by phpstan
+    * Fixed regression in GPM packages casted to Array (ref, getgrav/grav-plugin-admin@e3fc4ce)
+    * Fixed session_start(): Setting option 'session.name' failed [#2408](https://github.com/getgrav/grav/issues/2408)
+    * Fixed validation for select field type with selectize
+    * Fixed validation for boolean toggles
+    * Fixed non-namespaced exceptions in scheduler
+    * Fixed trailing slash redirect in multlang environment [#2350](https://github.com/getgrav/grav/issues/2350)
+    * Fixed some issues related to Medium objects losing query string attributes
+    * Broke out Medium timestamp so it's not cleared on `reset()`s
+    * Fixed issue with `redirect_trailing_slash` losing query string [#2269](https://github.com/getgrav/grav/issues/2269)
+    * Fixed failed login if user attempts to log in with upper case non-english letters
+    * Removed extra authenticated/authorized fields when saving existing user from a form
+    * Fixed `Grav\Framework\Route::__toString()` returning relative URL, not relative route
+    * Fixed handling of `append_url_extension` inside of `Page::templateFormat()` [#2264](https://github.com/getgrav/grav/issues/2264)
+    * Fixed a broken language string [#2261](https://github.com/getgrav/grav/issues/2261)
+    * Fixed clearing cache having no effect on Doctrine cache
+    * Fixed `Medium::relativePath()` for streams
+    * Fixed `Object` serialization breaking if overriding `jsonSerialize()` method
+    * Fixed `YamlFormatter::decode()` when calling `init_set()` with integer
+    * Fixed session throwing error in CLI if initialized
+    * Fixed `Uri::hasStandardPort()` to support reverse proxy configurations [#1786](https://github.com/getgrav/grav/issues/1786)
+    * Use `append_url_extension` from page header to set template format if set [#2604](https://github.com/getgrav/grav/pull/2064)
+    * Fixed some bugs in Grav environment selection logic
+    * Use login provider User avatar if set
+    * Fixed `Folder::doDelete($folder, false)` removing symlink when it should not
     * Fixed asset manager to not add empty assets when they don't exist in the filesystem
     * Update `script` and `style` Twig tags to use the new `Assets` classes
     * Fixed asset pipeline to rewrite remote URLs as well as local [#2216](https://github.com/getgrav/grav/issues/2216)
-    * Grav 1.6: Regression: Fixed asset manager methods with default legacy attributes
 
-# v1.6.0-beta.1
-## 10/01/2018
+# v1.5.10
+## 03/21/2019
 
 1. [](#new)
-    * Set minimum requirements to [PHP 7.1.3](https://getgrav.org/blog/raising-php-requirements-2018)
-    * New `Scheduler` functionality for periodic jobs
-    * New `Backup` functionality with multiple backup profiles and scheduler integration
-    * Refactored `Assets Manager` to be more powerful and flexible
-    * Updated Doctrine Collections to 1.5
-    * Updated Doctrine Cache to 1.8
-    * Updated Symfony Components to 4.1
-    * Added a new Deferred Twig extension to allow adding content to Twig blocks after render
-    * Added new Cache purge functionality old cache manually via CLI/Admin as well as scheduler integration
-    * Added new `{% throw 404 'Not Found' %}` twig tag (with custom code/message)
-    * Added `Grav\Framework\File` classes for handling YAML, Markdown, JSON, INI and PHP serialized files
-    * Added `Grav\Framework\Collection\AbstractIndexCollection` class
-    * Added `Grav\Framework\Object\ObjectIndex` class
-    * Added `Grav\Framework\Flex` classes
-    * Added support for hiding form fields in blueprints by using dynamic property like `security@: admin.foobar`, `scope@: object` or `scope-ignore@: object` to any field
+    * Added new `deferred` Twig extension
+
+# v1.5.9
+## 03/20/2019
+
+1. [](#new)
+    * Added new `onPageContent()` event for every call to `Page::content()`
 1. [](#improved)
-    * Doctrine filecache is now namespaced with prefix to support purging
-    * Register all page types into `blueprint://pages` stream
+    * Fixed phpdoc generation
+    * Updated vendor libraries
+    * Force Toolbox v1.4.2
+1. [](#bugfix)
+    * EXIF fix for streams
+    * Fix for User avatar not working due to uppercase or spaces in email [#2403](https://github.com/getgrav/grav/pull/2403)
+
+# v1.5.8
+## 02/07/2019
+
+1. [](#improved)
+    * Improved `User` unserialize to not to break the object if serialized data is not what expected
+    * Removed unused parameter [#2357](https://github.com/getgrav/grav/pull/2357)
 
 # v1.5.7
 ## 01/25/2019
@@ -179,7 +473,7 @@
     * Updated vendor libraries
 1. [](#bugfix)
     * Support spaces with filenames in responsive images [#2300](https://github.com/getgrav/grav/pull/2300)
-    
+
 # v1.5.6
 ## 12/14/2018
 

CONTRIBUTING.md

@@ -29,7 +29,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for support requests. Use
-  [the Forum](http://getgrav.org/forum) or [the Gitter chat](https://gitter.im/getgrav/grav).
+  [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/).
 
 
 <a name="bugs"></a>
@@ -110,7 +110,8 @@ Good pull requests - patches, improvements, new features - are a fantastic
 help. They should remain focused in scope and avoid containing unrelated
 commits.
 
-**Please ask first** in [Slack](https://getgrav.org/slack) or in the Forum before embarking on any significant pull request (e.g.
+**Please ask first** in [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/) 
+before embarking on any significant pull request (e.g.
 implementing features, refactoring code..),
 otherwise you risk spending a lot of time working on something that the
 project's developers might not want to merge into the project.

README.md

@@ -1,5 +1,6 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
+[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
 [![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://chat.getgrav.org)
  [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
@@ -8,14 +9,14 @@ Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  Ther
 
 The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
 
-* [Twig Templating](http://twig.sensiolabs.org/): for powerful control of the user interface
-* [Markdown](http://en.wikipedia.org/wiki/Markdown): for easy content creation
-* [YAML](http://yaml.org): for simple configuration
-* [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
-* [Doctrine Cache](http://doctrine-orm.readthedocs.io/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
-* [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
-* [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
-* [Symfony Console](http://symfony.com/doc/current/components/console/introduction.html): for CLI interface
+* [Twig Templating](https://twig.sensiolabs.org/): for powerful control of the user interface
+* [Markdown](https://en.wikipedia.org/wiki/Markdown): for easy content creation
+* [YAML](https://yaml.org): for simple configuration
+* [Parsedown](https://parsedown.org/): for fast Markdown and Markdown Extra support
+* [Doctrine Cache](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
+* [Pimple Dependency Injection Container](https://pimple.sensiolabs.org/): for extensibility and maintainability
+* [Symfony Event Dispatcher](https://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [Symfony Console](https://symfony.com/doc/current/components/console/introduction.html): for CLI interface
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
 # Requirements
@@ -105,6 +106,7 @@ If you discover a possible security issue related to Grav or one of its plugins,
 * Dive into more [advanced](https://learn.getgrav.org/advanced) functions
 * Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
 * Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
+* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
 
 # Backers
 Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]

bin/gpm

@@ -55,6 +55,7 @@ $grav->setup($environment);
 
 $grav['config']->init();
 $grav['uri']->init();
+$grav['users'];
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
 $app->addCommands(array(

bin/grav

@@ -3,6 +3,7 @@
 
 use Grav\Common\Composer;
 use Grav\Common\Grav;
+use League\CLImate\CLImate;
 use Symfony\Component\Console\Application;
 
 \define('GRAV_CLI', true);
@@ -24,7 +25,22 @@ if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
-Grav::instance(array('loader' => $autoload));
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+
+// Set up environment based on params.
+$environment = $climate->arguments->get('environment');
+
+$grav = Grav::instance(array('loader' => $autoload));
+$grav->setup($environment);
 
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
@@ -40,10 +56,13 @@ $app->addCommands(array(
     new \Grav\Console\Cli\ComposerCommand(),
     new \Grav\Console\Cli\SandboxCommand(),
     new \Grav\Console\Cli\CleanCommand(),
-    new \Grav\Console\Cli\CacheCommand(),
+    new \Grav\Console\Cli\ClearCacheCommand(),
     new \Grav\Console\Cli\BackupCommand(),
     new \Grav\Console\Cli\NewProjectCommand(),
     new \Grav\Console\Cli\SchedulerCommand(),
     new \Grav\Console\Cli\SecurityCommand(),
+    new \Grav\Console\Cli\LogViewerCommand(),
+    new \Grav\Console\Cli\YamlLinterCommand(),
+    new \Grav\Console\Cli\ServerCommand(),
 ));
 $app->run();

bin/plugin

@@ -54,10 +54,10 @@ $grav->setup($environment);
 
 $grav['config']->init();
 $grav['uri']->init();
+$grav['users'];
 $grav['plugins']->init();
 $grav['themes']->init();
 
-
 $app     = new Application('Grav Plugins Commands', GRAV_VERSION);
 $pattern = '([A-Z]\w+Command\.php)';
 
@@ -72,6 +72,7 @@ $argv = array_merge([$bin], $argv);
 
 $input = new ArgvInput($argv);
 
+/** @var \Grav\Common\Data\Data $plugin */
 $plugin = $grav['plugins']->get($name);
 
 $output = new ConsoleOutput();
@@ -109,6 +110,18 @@ if (!$name) {
     }
 
     exit;
+} else {
+    if (is_null($plugin)) {
+        $output->writeln('');
+        $output->writeln("<red>$name plugin not found</red>");
+        die;
+    }
+
+    if (!$plugin->enabled) {
+        $output->writeln('');
+        $output->writeln("<red>$name not enabled</red>");
+        die;
+    }
 }
 
 if ($plugin === null) {

composer.json

@@ -12,6 +12,7 @@
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
+        "ext-dom": "*",
         "symfony/polyfill-iconv": "^1.9",
         "symfony/polyfill-php72": "^1.9",
         "symfony/polyfill-php73": "^1.9",
@@ -23,14 +24,14 @@
         "kodus/psr7-server": "*",
         "nyholm/psr7": "^1.0",
 
-        "twig/twig": "~1.35",
+        "twig/twig": "~1.0",
         "erusev/parsedown": "1.6.4",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~4.2",
-        "symfony/console": "~4.2",
-        "symfony/event-dispatcher": "~4.2",
-        "symfony/var-dumper": "~4.2",
-        "symfony/process": "~4.2",
+        "symfony/console": "~4.2.0",
+        "symfony/event-dispatcher": "~4.2.0",
+        "symfony/var-dumper": "~4.2.0",
+        "symfony/process": "~4.2.0",
         "doctrine/cache": "^1.8",
         "doctrine/collections": "^1.5",
         "guzzlehttp/psr7": "^1.4",
@@ -49,14 +50,24 @@
         "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",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-deprecation-rules": "^0.11.0",
         "phpunit/php-code-coverage": "~6.0",
         "fzaninotto/faker": "^1.8",
         "victorjonsson/markdowndocs": "dev-master"
     },
+    "suggest": {
+        "ext-zend-opcache": "Recommended for better performance",
+        "ext-intl": "Recommended for multi-language sites",
+        "ext-memcache": "Needed to support Memcache servers",
+        "ext-memcached": "Needed to support Memcached servers",
+        "ext-redis": "Needed to support Redis servers"
+    },
     "config": {
         "apcu-autoloader": true,
         "platform": {
@@ -67,6 +78,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/itsgoingd/clockwork"
         }
     ],
     "autoload": {
@@ -79,7 +94,12 @@
         "exclude": ["VERSION"]
     },
     "scripts": {
+        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
+        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
         "post-create-project-cmd": "bin/grav install",
+        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
+        "test-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },

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'])) {
-    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+if (PHP_SAPI === 'cli-server') {
+    $symfony_server = 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

now.json

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

robots.txt

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

system/assets/debugger.css

@@ -1,54 +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 {
-    padding-left: 5px;
-}
-
-.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/config/backups.yaml

@@ -19,22 +19,22 @@ form:
 
         purge.trigger:
             type: select
-            label: Backup Storage Purge Trigger
+            label: PLUGIN_ADMIN.BACKUPS_STORAGE_PURGE_TRIGGER
             size: medium
             default: space
             options:
                 space: Maximum Backup Space
                 number: Maximum Number of Backups
-                time: maximum Rention Time
+                time: maximum Retention Time
             validate:
                 required: true
 
         purge.max_backups_count:
             type: number
-            label: Maximum Number of Backups
+            label: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
             default: 25
             size: x-small
-            help: "0 is unlimited"
+            help: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
             validate:
                 min: 0
                 type: number
@@ -43,7 +43,7 @@ form:
 
         purge.max_backups_space:
             type: number
-            label: Maximum Backups Space
+            label: PLUGIN_ADMIN.BACKUPS_MAX_SPACE
             append: in GB
             size: x-small
             default: 5
@@ -55,8 +55,8 @@ form:
 
         purge.max_backups_time:
             type: number
-            label: Maximum Rention Time
-            append: in Days
+            label: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME
+            append: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME_APPEND
             size: x-small
             default: 365
             validate:
@@ -80,35 +80,35 @@ form:
           fields:
             .name:
               type: text
-              label: Name
-              placeholder: 'Clear Backup Name'
+              label: PLUGIN_ADMIN.NAME
+              placeholder: PLUGIN_ADMIN.BACKUPS_PROFILE_NAME
               validate:
                   max: 20
                   message: 'Name must be less than 20 characters'
                   required: true
             .root:
               type: text
-              label: Root Folder
-              help: Can be an absolute path or a stream
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER_HELP
               placeholder: '/'
               default: '/'
               validate:
                   required: true
             .exclude_paths:
               type: textarea
-              label: Exclude Paths
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS
               rows: 5
               placeholder: "/backup\r/cache\r/images\r/logs\r/tmp"
-              help: Absolute paths to exclude, one per line
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS_HELP
             .exclude_files:
                 type: textarea
-                label: Exclude Files
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES
                 rows: 5
                 placeholder: ".DS_Store\r.git\r.svn\r.hg\r.idea\r.vscode\rnode_modules"
-                help: Specfic Files or Folders to exclude, one per line
+                help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES_HELP
             .schedule:
                 type: toggle
-                label: Enable Scheduled Job
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE
                 highlight: 1
                 default: 1
                 options:
@@ -118,7 +118,7 @@ form:
                     type: bool
             .schedule_at:
                 type: cron
-                label: Run Scheduled Job
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE_AT
                 default: '* 3 * * *'
                 validate:
                     required: true

system/blueprints/config/scheduler.yaml

@@ -38,37 +38,37 @@ form:
                   message: 'ID must be lowercase with dashes/underscores only and less than 20 characters'
             .command:
               type: text
-              label: Command
+              label: PLUGIN_ADMIN.COMMAND
               placeholder: 'cd ~;ls -lah;'
               validate:
                   required: true
             .args:
               type: text
-              label: Extra Arguments
+              label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
             .at:
               type: cron
-              label: Run At
-              help: 'Cron formatted "at" syntax'
+              label: PLUGIN_ADMIN.SCHEDULER_RUNAT
+              help: PLUGIN_ADMIN.SCHEDULER_RUNAT_HELP
               placeholder: '* * * * *'
               validate:
                   required: true
             .output:
               type: text
-              label: Output File
-              help: 'The path/filename of the output file (from the root of the Grav installation)'
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_HELP
               placeholder: 'logs/ls-cron.out'
             .output_mode:
               type: select
-              label: Output Type
-              help: 'Either append to the same file each run, or overwrite the file with each run'
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE_HELP
               default: append
               options:
                   append: Append
                   overwrite: Overwrite
             .email:
                 type: text
-                label: Email
-                help: 'Email to send output to. NOTE: requires output file to be set'
+                label: PLUGIN_ADMIN.SCHEDULER_EMAIL
+                help: PLUGIN_ADMIN.SCHEDULER_EMAIL_HELP
                 placeholder: 'notifications@yoursite.com'
 
 

system/blueprints/config/site.yaml

@@ -65,7 +65,7 @@ form:
 
                 summary.size:
                     type: text
-                    size: x-small
+                    size: small
                     append: PLUGIN_ADMIN.CHARACTERS
                     label: PLUGIN_ADMIN.SUMMARY_SIZE
                     help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP

system/blueprints/user/account.yaml

@@ -4,122 +4,124 @@ form:
 
     fields:
 
-            info:
-                type: userinfo
-                size: large
+        info:
+            type: userinfo
+            size: large
 
-            avatar:
-                type: file
-                size: large
-                destination: 'user://accounts/avatars'
-                multiple: false
-                random_name: true
+        avatar:
+            type: file
+            size: large
+            destination: 'user://accounts/avatars'
+            multiple: false
+            random_name: true
 
-            content:
-                type: section
-                title: PLUGIN_ADMIN.ACCOUNT
-                underline: true
+        content:
+            type: section
+            title: PLUGIN_ADMIN.ACCOUNT
+            underline: true
 
-            username:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.USERNAME
-                disabled: true
-                readonly: true
+        username:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.USERNAME
+            disabled: true
+            readonly: true
 
-            email:
-                type: email
-                size: large
-                label: PLUGIN_ADMIN.EMAIL
-                validate:
-                  type: email
-                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                  required: true
+        email:
+            type: email
+            size: large
+            label: PLUGIN_ADMIN.EMAIL
+            validate:
+              type: email
+              message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+              required: true
 
-            password:
-                type: password
-                size: large
-                label: PLUGIN_ADMIN.PASSWORD
-                autocomplete: new-password
-                validate:
-                  required: false
-                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                  config-pattern@: system.pwd_regex
+        password:
+            type: password
+            size: large
+            label: PLUGIN_ADMIN.PASSWORD
+            autocomplete: new-password
+            validate:
+              required: false
+              message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+              config-pattern@: system.pwd_regex
 
-            fullname:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.FULL_NAME
-                validate:
-                  required: true
+        fullname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.FULL_NAME
+            validate:
+              required: true
 
-            title:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.TITLE
+        title:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.TITLE
 
-            language:
-                type: select
-                label: PLUGIN_ADMIN.LANGUAGE
-                size: medium
-                classes: fancy
-                data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
-                default: 'en'
-                help: PLUGIN_ADMIN.LANGUAGE_HELP
+        language:
+            type: select
+            label: PLUGIN_ADMIN.LANGUAGE
+            size: medium
+            classes: fancy
+            data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
+            default: 'en'
+            help: PLUGIN_ADMIN.LANGUAGE_HELP
 
-            twofa_check:
-                type: conditional
-                condition: config.plugins.admin.twofa_enabled
+        twofa_check:
+            type: conditional
+            condition: config.plugins.admin.twofa_enabled
 
-                fields:
+            fields:
 
-                    twofa:
-                        title: PLUGIN_ADMIN.2FA_TITLE
-                        type: section
-                        underline: true
+                twofa:
+                    title: PLUGIN_ADMIN.2FA_TITLE
+                    type: section
+                    underline: true
 
-                    twofa_enabled:
-                        type: toggle
-                        label: PLUGIN_ADMIN.2FA_ENABLED
-                        classes: twofa-toggle
-                        highlight: 1
-                        default: 0
-                        options:
-                          1: PLUGIN_ADMIN.YES
-                          0: PLUGIN_ADMIN.NO
-                        validate:
-                          type: bool
+                twofa_enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.2FA_ENABLED
+                    classes: twofa-toggle
+                    highlight: 1
+                    default: 0
+                    options:
+                      1: PLUGIN_ADMIN.YES
+                      0: PLUGIN_ADMIN.NO
+                    validate:
+                      type: bool
 
 
-                    twofa_secret:
-                        type: 2fa_secret
-                        outerclasses: 'twofa-secret'
-                        markdown: true
-                        label: PLUGIN_ADMIN.2FA_SECRET
-                        sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
+                twofa_secret:
+                    type: 2fa_secret
+                    outerclasses: 'twofa-secret'
+                    markdown: true
+                    label: PLUGIN_ADMIN.2FA_SECRET
+                    sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
 
-            security:
-                title: PLUGIN_ADMIN.ACCESS_LEVELS
-                type: section
-                security: admin.super
-                underline: true
+        security:
+            security@: admin.super
+            title: PLUGIN_ADMIN.ACCESS_LEVELS
+            type: section
+            underline: true
 
-                fields:
-                    groups:
-                        type: select
-                        multiple: true
-                        size: large
-                        label: PLUGIN_ADMIN.GROUPS
-                        data-options@: '\Grav\Common\User\Group::groupNames'
-                        classes: fancy
-                        help: PLUGIN_ADMIN.GROUPS_HELP
-                        validate:
-                            type: commalist
+            fields:
+                groups:
+                    security@: admin.super
+                    type: select
+                    multiple: true
+                    size: large
+                    label: PLUGIN_ADMIN.GROUPS
+                    data-options@: '\Grav\Common\User\Group::groupNames'
+                    classes: fancy
+                    help: PLUGIN_ADMIN.GROUPS_HELP
+                    validate:
+                        type: commalist
 
-                    access:
-                        type: permissions
-                        label: PLUGIN_ADMIN.PERMISSIONS
-                        ignore_empty: true
-                        validate:
-                            type: array
+                access:
+                    security@: admin.super
+                    type: permissions
+                    label: PLUGIN_ADMIN.PERMISSIONS
+                    ignore_empty: true
+                    validate:
+                        type: array

system/blueprints/user/account_new.yaml

@@ -12,5 +12,7 @@ form:
       type: text
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
+      unset-disabled@: true
+      unset-readonly@: true
       validate:
         required: true

system/blueprints/user/accounts.yaml

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

system/config/site.yaml

@@ -17,17 +17,17 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-#  '/redirect-test': '/'                         # Redirect test goes to home page
-#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
+#  '/redirect-test': '/'                    # Redirect test goes to home page
+#  '/old/(.*)': '/new/$1'                   # Would redirect /old/my-page to /new/my-page
 
 routes:
-#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
-#  '/new/(.*)': '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/something/else': '/blog/sample-3'      # Alias for /blog/sample-3
+#  '/new/(.*)': '/blog/$1'                  # Regex any /new/my-page URL to /blog/my-page Route
 
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)
 
-#menu:                                      # Sample Menu Example
+#menu:                                      # Menu Example
 #    - text: Source
 #      icon: github
 #      url: https://github.com/getgrav/grav

system/config/system.yaml

@@ -13,6 +13,7 @@ intl_enabled: true                               # Special logic for PHP Interna
 
 languages:
   supported: []                                  # List of languages supported. eg: [en, fr, de]
+  default_lang:                                  # Default is the first supported language. Must be one of the supported languages
   include_default_lang: true                     # Include the default lang prefix in all URLs
   pages_fallback_only: false                     # Only fallback to find page content through supported languages
   translations: true                             # Enable translations by default
@@ -26,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"
@@ -53,7 +55,7 @@ pages:
     special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [html,htm,json,xml,txt,rss,atom]        # list of valid page types
+  types: [html,htm,xml,txt,json,rss,atom]        # list of valid page types
   append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
   expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
@@ -76,9 +78,11 @@ cache:
   enabled: true                                  # Set to true to enable caching
   check:
     method: file                                 # Method to check for updates in pages: file|folder|hash|none
-  driver: auto                                   # One of: auto|file|apc|xcache|memcache|wincache
+  driver: auto                                   # One of: auto|file|apcu|memcache|wincache
   prefix: 'g'                                    # Cache prefix string (prevents cache conflicts)
-  purge_at: '0 4 * * *'                          # How often to purge old cache (using new scheduler)
+  purge_at: '0 4 * * *'                          # How often to purge old file cache (using new scheduler)
+  clear_at: '0 3 * * *'                           # How often to clear cache (using new scheduler)
+  clear_job_type: 'standard'                     # Type to clear when processing the scheduled clear job `standard`|`all`
   clear_images_by_default: true                  # By default grav will include processed images in cache clear, this can be disabled
   cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
   lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
@@ -122,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
 
@@ -131,6 +137,7 @@ images:
   cache_perms: '0755'                            # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                                   # Show an overlay over images indicating the pixel depth of the image when working with retina for example
   auto_fix_orientation: false                    # Automatically fix the image orientation based on the Exif data
+  seofriendly: false                             # SEO-friendly processed image names
 
 media:
   enable_media_timestamp: false                  # Enable media timestamps
@@ -150,12 +157,16 @@ 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                                     # EXPERIMENTAL: Account type: data or flex
+  storage: file                                  # EXPERIMENTAL: Flex storage type: file or folder
+
 strict_mode:
   yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
   twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)

system/defines.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * @package    Grav.Core
+ * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.0-rc.1');
+define('GRAV_VERSION', '1.7.0-beta.7');
 define('GRAV_TESTING', true);
 define('DS', '/');
 

system/install.php

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

system/languages/en.yaml

@@ -99,6 +99,8 @@ GRAV:
         MISSING_REQUIRED_FIELD: Missing required field:
     MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
     DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
+    YES: "Yes"
+    NO: "No"
     CRON:
         EVERY: every
         EVERY_HOUR: every hour

system/languages/es.yaml

@@ -23,7 +23,7 @@ GRAV:
     BAD_DATE: Fecha errónea
     AGO: antes
     FROM_NOW: desde ahora
-    JUST_NOW: justo ahora
+    JUST_NOW: hace un momento
     SECOND: segundo
     MINUTE: minuto
     HOUR: hora

system/languages/et.yaml

@@ -1,11 +1,30 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'informatsioon'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'kala'
+    - 'lammas'
+  INFLECTOR_IRREGULAR:
+    'person': 'inimesed'
+    'man': 'mees'
+    'child': 'lapsed'
+  INFLECTOR_ORDINALS:
+    'default': '.'
+    'first': '.'
+    'second': '.'
+    'third': '.'
   NICETIME:
     NO_DATE_PROVIDED: Kuupäev määramata
     BAD_DATE: Vigane kuupäev
     AGO: tagasi
     FROM_NOW: praegusest
+    JUST_NOW: just nüüd
     SECOND: sekund
     MINUTE: minut
     HOUR: tundi
@@ -60,3 +79,7 @@ GRAV:
     - 'reede'
     - 'laupäev'
     - 'pühapäev'
+  CRON:
+    EVERY: iga
+    EVERY_MONTH: iga kuu
+    TEXT_PERIOD: Iga <b />

system/languages/fr.yaml

@@ -14,6 +14,8 @@ GRAV:
     '/sis$/i': 'ses'
     '/([ti])um$/i': '\1a'
     '/(buffal|tomat)o$/i': '\1es'
+    '/(bu)s$/i': 'Bus'
+    '/(alias|status)/i': 'alias|status'
     '/(ax|test)is$/i': '\1s'
     '/s$/i': 's'
     '/$/': 's'

system/languages/id.yaml

@@ -15,6 +15,7 @@ GRAV:
     'man': 'laki-laki'
     'child': 'anak-anak'
     'sex': 'jenis kelamin'
+    'move': 'pindahkan'
   NICETIME:
     NO_DATE_PROVIDED: Tanggal tidak tersedia
     BAD_DATE: Format tanggal salah
@@ -77,6 +78,10 @@ GRAV:
     - 'Sabtu'
     - 'Minggu'
   CRON:
+    EVERY: Setiap
+    EVERY_HOUR: Setiap jam
+    EVERY_MINUTE: Setiap menit
+    EVERY_DAY_OF_WEEK: Setiap hari selama seminggu
     EVERY_DAY_OF_MONTH: pada tanggal setiap bulannya
     EVERY_MONTH: setiap bulan
     TEXT_PERIOD: Setiap <b />

system/languages/is.yaml

@@ -11,6 +11,8 @@ GRAV:
     - 'fish'
     - 'sheep'
   NICETIME:
+    NO_DATE_PROVIDED: Engin dagsetning gefin
+    BAD_DATE: Röng dagsetning
     AGO: síðan
     JUST_NOW: í þessu
     SECOND: sekúndu
@@ -45,6 +47,7 @@ GRAV:
     DEC_PLURAL: árat
   FORM:
     VALIDATION_FAIL: <b>Sannvottun mistókst:</b>
+    INVALID_INPUT: Ógilt inntak í
     MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:'
   MONTHS_OF_THE_YEAR:
     - 'janúar'
@@ -67,3 +70,11 @@ GRAV:
     - 'Föstudagur'
     - 'Laugardagur'
     - 'Sunnudagur'
+  CRON:
+    TEXT_TIME: ' á <b />:<b />'
+    TEXT_DOW: ' á <b />'
+    TEXT_MONTH: ' af <b />'
+    TEXT_DOM: ' á <b />'
+    ERROR1: Merkið %s er ekki stutt!
+    ERROR3: Það ætti að setja jquery_element inn í stillingar jqCron
+    ERROR4: Óþekkt segð

system/languages/it.yaml

@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+  INFLECTOR_UNCOUNTABLE:
+    - 'dotazione'
+    - 'informazione'
+    - 'riso'
+    - 'denaro'
+    - 'specie'
+    - 'serie'
+    - 'pesce'
+    - 'pecora'
+  INFLECTOR_IRREGULAR:
+    'person': 'persone'
+    'man': 'uomini'
+    'child': 'bambino'
+    'sex': 'sessi'
+    'move': 'sposta'
+  INFLECTOR_ORDINALS:
+    'default': '°'
+    'first': '°'
+    'second': 'o'
+    'third': 'o'
   NICETIME:
     NO_DATE_PROVIDED: Nessuna data fornita
     BAD_DATE: Data non valida
     AGO: fa
     FROM_NOW: da adesso
+    JUST_NOW: ora
     SECOND: secondo
     MINUTE: minuto
     HOUR: ora
@@ -14,6 +35,8 @@ GRAV:
     MONTH: mese
     YEAR: anno
     DECADE: decennio
+    SEC: sec
+    MIN: min
     HR: ora
     WK: settimana
     MO: mese
@@ -59,3 +82,20 @@ GRAV:
     - 'Venerdì'
     - 'Sabato'
     - 'Domenica'
+  CRON:
+    EVERY: ogni
+    EVERY_HOUR: ogni ora
+    EVERY_MINUTE: ogni minuto
+    EVERY_DAY_OF_WEEK: ogni giorno della settimana
+    EVERY_DAY_OF_MONTH: ogni giorno del mese
+    EVERY_MONTH: ogni mese
+    TEXT_PERIOD: Ogni <b />
+    TEXT_MINS: ' a <b /> minuto(i) dall''inizio dell''ora'
+    TEXT_TIME: ' alle <b />:<b />'
+    TEXT_DOW: ' su <b />'
+    TEXT_MONTH: ' di <b />'
+    TEXT_DOM: ' di <b />'
+    ERROR1: Il tag %s non è supportato!
+    ERROR2: Numero di elementi non valido
+    ERROR3: Il jquery_element deve essere impostato nelle impostazioni di jqCron
+    ERROR4: Espressione non riconosciuta

system/languages/nl.yaml

@@ -1,28 +1,90 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitel: %1$s\n---\n\n# Fout: ongeldige frontmatter\n\nPad: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'uitrusting'
+    - 'informatie'
+    - 'rijst'
+    - 'geld'
+    - 'soorten'
+    - 'reeks'
+    - 'vis'
+    - 'schaap'
   INFLECTOR_IRREGULAR:
     'person': 'personen'
     'man': 'mensen'
     'child': 'kinderen'
     'sex': 'geslacht'
     'move': 'verplaatsen'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
   NICETIME:
     NO_DATE_PROVIDED: geen datum opgegeven
     BAD_DATE: Datumformaat onjuist
     AGO: geleden
     FROM_NOW: vanaf nu
+    JUST_NOW: zojuist
     SECOND: seconde
     MINUTE: minuut
     HOUR: uur
     DAY: dag
+    WEEK: week
     MONTH: maand
     YEAR: jaar
     DECADE: decennium
     SEC: s
+    MIN: min
     HR: u
+    WK: week
     MO: ma
     YR: j
+    DEC: decennia
     SECOND_PLURAL: seconden
     MINUTE_PLURAL: minuten
     HOUR_PLURAL: uren
@@ -43,18 +105,18 @@ GRAV:
     INVALID_INPUT: Ongeldige invoer in
     MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:'
   MONTHS_OF_THE_YEAR:
-    - 'januari'
-    - 'februari'
-    - 'maart'
-    - 'april'
-    - 'mei'
-    - 'juni'
-    - 'juli'
-    - 'augustus'
-    - 'september'
-    - 'oktober'
-    - 'november'
-    - 'december'
+    - 'Januari'
+    - 'Februari'
+    - 'Maart'
+    - 'April'
+    - 'Mei'
+    - 'Juni'
+    - 'Juli'
+    - 'Augustus'
+    - 'September'
+    - 'Oktober'
+    - 'November'
+    - 'December'
   DAYS_OF_THE_WEEK:
     - 'Maandag'
     - 'Dinsdag'
@@ -63,3 +125,20 @@ GRAV:
     - 'Vrijdag'
     - 'Zaterdag'
     - 'Zondag'
+  CRON:
+    EVERY: elke
+    EVERY_HOUR: elk uur
+    EVERY_MINUTE: elke minuut
+    EVERY_DAY_OF_WEEK: elke dag van de week
+    EVERY_DAY_OF_MONTH: elke dag van de maand
+    EVERY_MONTH: elke maand
+    TEXT_PERIOD: Elke <b />
+    TEXT_MINS: ' <b /> minuten te laat'
+    TEXT_TIME: ' op <b />:<b />'
+    TEXT_DOW: ' op <b />'
+    TEXT_MONTH: ' van <b />'
+    TEXT_DOM: ' op <b />'
+    ERROR1: De tag %s wordt niet ondersteund!
+    ERROR2: Slecht aantal elementen
+    ERROR3: Het jquery_element moet ingesteld worden in de jqCron instellingen
+    ERROR4: Onbekende expressie

system/languages/pt.yaml

@@ -35,3 +35,12 @@ GRAV:
     - 'Outubro'
     - 'Novembro'
     - 'Dezembro'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'information'
+    - 'arroz'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'

system/languages/ru.yaml

@@ -1,6 +1,15 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Ошибка: недопустимое содержимое Frontmatter\n\nПуть: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'экипировка'
+    - 'информация'
+    - 'рис'
+    - 'деньги'
+    - 'виды'
+    - 'серии'
+    - 'рыба'
+    - 'овца'
   INFLECTOR_IRREGULAR:
     'person': 'люди'
     'man': 'человек'
@@ -8,7 +17,10 @@ GRAV:
     'sex': 'пол'
     'move': 'движется'
   INFLECTOR_ORDINALS:
+    'default': 'й'
     'first': 'й'
+    'second': 'й'
+    'third': 'й'
   NICETIME:
     NO_DATE_PROVIDED: Дата не указана
     BAD_DATE: Неверная дата
@@ -77,6 +89,12 @@ GRAV:
     EVERY_DAY_OF_WEEK: каждый день недели
     EVERY_DAY_OF_MONTH: каждый день недели
     EVERY_MONTH: раз в месяц
+    TEXT_PERIOD: Каждый <b />
+    TEXT_MINS: ' в <b /> минуте(ах) за час'
+    TEXT_TIME: ' в <b />:<b />'
+    TEXT_DOW: ' на <b />'
+    TEXT_MONTH: ' из <b />'
+    TEXT_DOM: ' на <b />'
     ERROR1: Тег %s не поддерживается!
     ERROR2: Неверное количество элементов
     ERROR3: jquery_element должен быть установлен в настройки jqCron

system/languages/sk.yaml

@@ -1,10 +1,75 @@
 ---
 GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Chyba: Chybný frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'vybavenie'
+    - 'informácie'
+    - 'ryža'
+    - 'peniaze'
+    - 'druhy'
+    - 'séria'
+    - 'ryba'
+    - 'ovce'
+  INFLECTOR_IRREGULAR:
+    'person': 'ľudia'
+    'man': 'muži'
+    'child': 'deti'
+    'sex': 'pohlavia'
+    'move': 'pohyby'
+  INFLECTOR_ORDINALS:
+    'default': '.'
+    'first': '.'
+    'second': '.'
+    'third': '.'
   NICETIME:
     NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
     BAD_DATE: Nesprávny dátum
     AGO: pred
     FROM_NOW: odteraz
+    JUST_NOW: práve teraz
     SECOND: sekunda
     MINUTE: minúta
     HOUR: hodina
@@ -14,10 +79,12 @@ GRAV:
     YEAR: rok
     DECADE: desaťročie
     SEC: sek
+    MIN: min
     HR: hod
     WK: t
     MO: m
     YR: r
+    DEC: dec
     SECOND_PLURAL: sekúnd
     MINUTE_PLURAL: minút
     HOUR_PLURAL: hodín
@@ -58,3 +125,20 @@ GRAV:
     - 'Piatok'
     - 'Sobota'
     - 'Nedeľa'
+  CRON:
+    EVERY: každý
+    EVERY_HOUR: každú hodinu
+    EVERY_MINUTE: každú minútu
+    EVERY_DAY_OF_WEEK: každý deň v týždni
+    EVERY_DAY_OF_MONTH: každý deň v mesiaci
+    EVERY_MONTH: každý mesiac
+    TEXT_PERIOD: Každý <b />
+    TEXT_MINS: ' at <b /> minute(s) past the hour'
+    TEXT_TIME: ' at <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: Tag %s nieje podporovaný!
+    ERROR2: Chybný počet položiek
+    ERROR3: jquery_element musí byť nastavený v nastaveniach pre jqCron
+    ERROR4: Neznámy výraz

system/languages/sv.yaml

@@ -1,6 +1,17 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'utrustning'
+    - 'information'
+    - 'ris'
+    - 'pengar'
+    - 'arter'
+    - 'serier'
+    - 'fisk'
+    - 'får'
+  INFLECTOR_IRREGULAR:
+    'person': 'personer'
   NICETIME:
     NO_DATE_PROVIDED: Inget datum har angivits
     BAD_DATE: Ogiltigt datum

system/languages/zh-tw.yaml

@@ -1,24 +1,44 @@
 ---
 GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# 錯誤： 不正確的 Frontmatter\n\n路徑： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
   NICETIME:
+    NO_DATE_PROVIDED: 沒有提供日期
+    BAD_DATE: 錯誤日期
+    AGO: 之前
+    FROM_NOW: 之後
+    JUST_NOW: 剛剛
     SECOND: 秒
     MINUTE: 分
     HOUR: 小時
+    DAY: 天
+    WEEK: 週
+    MONTH: 月
+    YEAR: 年
+    DECADE: 十年
+    SEC: 秒
+    MIN: 分
+    HR: 小時
+    WK: 週
+    MO: 月
+    YR: 年
+    DEC: 十年
     SECOND_PLURAL: 秒
     MINUTE_PLURAL: 分
-    HOUR_PLURAL: 時
-    DAY_PLURAL: 日
-    WEEK_PLURAL: 周
+    HOUR_PLURAL: 小時
+    DAY_PLURAL: 天
+    WEEK_PLURAL: 週
     MONTH_PLURAL: 月
     YEAR_PLURAL: 年
     DECADE_PLURAL: 十年
     SEC_PLURAL: 秒
     MIN_PLURAL: 分
     HR_PLURAL: 時
-    WK_PLURAL: 周
+    WK_PLURAL: 週
     MO_PLURAL: 月
     YR_PLURAL: 年
     DEC_PLURAL: 十年
+  FORM:
+    MISSING_REQUIRED_FIELD: 遺漏必填欄位：
   MONTHS_OF_THE_YEAR:
     - '一月'
     - '二月'

system/languages/zh.yaml

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

system/router.php

@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @package    Grav.Core
+ * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,11 +17,22 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N
     return false;
 }
 
+$grav_index = 'index.php';
+
+/* Check the GRAV_BASEDIR environment variable and use if set */
+
+$grav_basedir = getenv('GRAV_BASEDIR') ?: '';
+if ($grav_basedir) {
+    $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index;
+    $grav_basedir = DIRECTORY_SEPARATOR . trim($grav_basedir, DIRECTORY_SEPARATOR);
+    define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . $grav_basedir);
+}
+
 $_SERVER = array_merge($_SERVER, $_ENV);
-$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'index.php';
-$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR . 'index.php';
-$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . $grav_basedir .DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_NAME'] = $grav_basedir . DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['PHP_SELF'] = $grav_basedir . DIRECTORY_SEPARATOR . 'index.php';
 
 error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);
 
-require 'index.php';
+require $grav_index;

system/src/Grav/Common/Assets.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -36,12 +37,6 @@ class Assets extends PropertyObject
     /** @const Regex to match JavaScript files */
     const JS_REGEX = '/.\.js$/i';
 
-    /**
-     * @const Regex to match <script> or <style> tag when adding inline style/script. Note that this only supports a
-     * single tag, so the check is greedy to avoid issues in JS.
-     */
-    const HTML_TAG_REGEX = '#(<([A-Z][A-Z0-9]*)>)+(.*)(<\/\2>)#is';
-
     protected $assets_dir;
     protected $assets_url;
 
@@ -50,8 +45,10 @@ class Assets extends PropertyObject
 
     // Config Options
     protected $css_pipeline;
+    protected $css_pipeline_include_externals;
     protected $css_pipeline_before_excludes;
     protected $js_pipeline;
+    protected $js_pipeline_include_externals;
     protected $js_pipeline_before_excludes;
     protected $pipeline_options = [];
 
@@ -122,7 +119,7 @@ class Assets extends PropertyObject
      * It automatically detects the asset type (JavaScript, CSS or collection).
      * You may add more than one asset passing an array as argument.
      *
-     * @param $asset
+     * @param array|string $asset
      * @return $this
      */
     public function add($asset)
@@ -175,7 +172,8 @@ class Assets extends PropertyObject
         // If pipeline disabled, set to position if provided, else after
         if (isset($options['pipeline'])) {
             if ($options['pipeline'] === false) {
-                $excludes = strtolower($type . '_pipeline_before_excludes');
+                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS_TYPE : $this::CSS_TYPE;
+                $excludes = strtolower($exclude_type . '_pipeline_before_excludes');
                 if ($this->{$excludes}) {
                     $default = 'after';
                 } else {
@@ -269,6 +267,22 @@ class Assets extends PropertyObject
     protected function filterAssets($assets, $key, $value, $sort = false)
     {
         $results = array_filter($assets, function($asset) use ($key, $value) {
+
+            if ($key === 'position' && $value === 'pipeline') {
+
+                $type = $asset->getType();
+
+                if ($asset->getRemote() && $this->{$type . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline' ) {
+                    if ($this->{$type . '_pipeline_before_excludes'}) {
+                        $asset->setPosition('after');
+                    } else {
+                        $asset->setPosition('before');
+                    }
+                    return false;
+                }
+
+            }
+
             if ($asset[$key] === $value) return true;
             return false;
         });
@@ -297,11 +311,9 @@ class Assets extends PropertyObject
         $before_output = '';
         $pipeline_output = '';
         $after_output = '';
-        $no_pipeline = [];
 
         $assets = 'assets_' . $type;
         $pipeline_enabled = $type . '_pipeline';
-        $before_excludes = $type . '_pipeline_before_excludes';
         $render_pipeline = 'render' . ucfirst($type);
 
         $group_assets = $this->filterAssets($this->$assets, 'group', $group);
@@ -314,22 +326,13 @@ class Assets extends PropertyObject
             $options = array_merge($this->pipeline_options, ['timestamp' => $this->timestamp]);
 
             $pipeline = new Pipeline($options);
-            $pipeline_output = $pipeline->$render_pipeline($pipeline_assets, $group, $attributes, $no_pipeline);
+            $pipeline_output = $pipeline->$render_pipeline($pipeline_assets, $group, $attributes);
         } else {
             foreach ($pipeline_assets as $asset) {
                 $pipeline_output .= $asset->render();
             }
         }
 
-        // Handle stuff that couldn't be pipelined
-        if (!empty($no_pipeline)) {
-            if ($this->{$before_excludes}) {
-                $after_assets = array_merge($after_assets, $no_pipeline);
-            } else {
-                $before_assets = array_merge($before_assets, $no_pipeline);
-            }
-        }
-
         // Before Pipeline
         foreach ($before_assets as $asset) {
             $before_output .= $asset->render();

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,17 +14,16 @@ use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Framework\Object\PropertyObject;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 abstract class BaseAsset extends PropertyObject
 {
     use AssetUtilsTrait;
 
-    const CSS_ASSET = true;
-    const JS_ASSET = false;
+    protected const CSS_ASSET = true;
+    protected const JS_ASSET = false;
 
     /** @const Regex to match CSS import content */
-    const CSS_IMPORT_REGEX = '{@import(.*?);}';
+    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
 
     protected $asset;
 
@@ -78,10 +78,13 @@ abstract class BaseAsset extends PropertyObject
             }
         }
 
+        // Force priority to be an int
+        $this->priority = (int) $this->priority;
+
         // Do some special stuff for CSS/JS (not inline)
         if (!Utils::startsWith($this->getType(), 'inline')) {
             $this->base_url = rtrim($uri->rootUrl($config->get('system.absolute_urls')), '/') . '/';
-            $this->remote = $this->isRemoteLink($asset);
+            $this->remote = static::isRemoteLink($asset);
 
             // Move this to render?
             if (!$this->remote) {
@@ -129,6 +132,12 @@ abstract class BaseAsset extends PropertyObject
         return $this->remote;
     }
 
+    public function setPosition($position)
+    {
+        $this->position = $position;
+        return $this;
+    }
+
 
     /**
      *
@@ -153,7 +162,6 @@ abstract class BaseAsset extends PropertyObject
      * Build local links including grav asset shortcodes
      *
      * @param  string $asset    the asset string reference
-     * @param  bool   $absolute build absolute asset link
      *
      * @return string           the final link url to the asset
      */
@@ -175,4 +183,16 @@ abstract class BaseAsset extends PropertyObject
     {
         return ['type' => $this->getType(), 'elements' => $this->getElements()];
     }
+
+    /**
+     * Placeholder for AssetUtilsTrait method
+     *
+     * @param string $file
+     * @param string $dir
+     * @param bool $local
+     */
+    protected function cssRewrite($file, $dir, $local)
+    {
+        return;
+    }
 }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,7 +13,6 @@ use Grav\Common\Utils;
 
 class Css extends BaseAsset
 {
-
     public function __construct(array $elements = [], $key = null)
     {
         $base_options = [

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets
+ * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -20,17 +21,19 @@ class Pipeline extends PropertyObject
 {
     use AssetUtilsTrait;
 
-    const CSS_ASSET = true;
-    const JS_ASSET = false;
+    protected const CSS_ASSET = true;
+    protected const JS_ASSET = false;
 
     /** @const Regex to match CSS urls */
-    const CSS_URL_REGEX = '{url\(([\'\"]?)(.*?)\1\)}';
+    protected const CSS_URL_REGEX = '{url\(([\'\"]?)(.*?)\1\)}';
 
     /** @const Regex to match CSS sourcemap comments */
-    const CSS_SOURCEMAP_REGEX = '{\/\*# (.*?) \*\/}';
+    protected const CSS_SOURCEMAP_REGEX = '{\/\*# (.*?) \*\/}';
 
     /** @const Regex to match CSS import content */
-    const CSS_IMPORT_REGEX = '{@import(.*?);}';
+    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
+
+    protected const FIRST_FORWARDSLASH_REGEX = '{^\/{1}\w}';
 
     protected $css_minify;
     protected $css_minify_windows;
@@ -47,9 +50,6 @@ class Pipeline extends PropertyObject
     protected $query;
     protected $asset;
 
-    protected $css_pipeline_include_externals;
-    protected $js_pipeline_include_externals;
-
     /**
      * Closure used by the pipeline to fetch assets.
      *
@@ -88,11 +88,10 @@ class Pipeline extends PropertyObject
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     * @param array $no_pipeline
      *
      * @return bool|string     URL or generated content if available, else false
      */
-    public function renderCss($assets, $group, $attributes = [], &$no_pipeline = [])
+    public function renderCss($assets, $group, $attributes = [])
     {
         // temporary list of assets to pipeline
         $inline_group = false;
@@ -116,21 +115,13 @@ class Pipeline extends PropertyObject
         if (file_exists($this->assets_dir . $file)) {
             $buffer = file_get_contents($this->assets_dir . $file) . "\n";
         } else {
-
-            foreach ($assets as $id => $asset) {
-                if ($this->css_pipeline_include_externals === false && $asset->getRemote()) {
-                    $no_pipeline[$id] = $asset;
-                    unset($assets[$id]);
-                }
-            }
-
             //if nothing found get out of here!
-            if (empty($assets) && empty($no_pipeline)) {
+            if (empty($assets)) {
                 return false;
             }
 
             // Concatenate files
-            $buffer = $this->gatherLinks($assets, self::CSS_ASSET, $no_pipeline);
+            $buffer = $this->gatherLinks($assets, self::CSS_ASSET);
 
             // Minify if required
             if ($this->shouldMinify('css')) {
@@ -140,7 +131,7 @@ class Pipeline extends PropertyObject
             }
 
             // Write file
-            if (\strlen(trim($buffer)) > 0) {
+            if (trim($buffer) !== '') {
                 file_put_contents($this->assets_dir . $file, $buffer);
             }
         }
@@ -161,11 +152,10 @@ class Pipeline extends PropertyObject
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     * @param array $no_pipeline
      *
      * @return bool|string     URL or generated content if available, else false
      */
-    public function renderJs($assets, $group, $attributes = [], &$no_pipeline = [])
+    public function renderJs($assets, $group, $attributes = [])
     {
         // temporary list of assets to pipeline
         $inline_group = false;
@@ -189,21 +179,13 @@ class Pipeline extends PropertyObject
         if (file_exists($this->assets_dir . $file)) {
             $buffer = file_get_contents($this->assets_dir . $file) . "\n";
         } else {
-
-            foreach ($assets as $id => $asset) {
-                if ($this->js_pipeline_include_externals === false && $asset->getRemote()) {
-                    $no_pipeline[$id] = $asset;
-                    unset($assets[$id]);
-                }
-            }
-
             //if nothing found get out of here!
-            if (empty($assets) && empty($no_pipeline)) {
+            if (empty($assets)) {
                 return false;
             }
 
             // Concatenate files
-            $buffer = $this->gatherLinks($assets, self::JS_ASSET, $no_pipeline);
+            $buffer = $this->gatherLinks($assets, self::JS_ASSET);
 
             // Minify if required
             if ($this->shouldMinify('js')) {
@@ -213,16 +195,16 @@ class Pipeline extends PropertyObject
             }
 
             // Write file
-            if (\strlen(trim($buffer)) > 0) {
+            if (trim($buffer) !== '') {
                 file_put_contents($this->assets_dir . $file, $buffer);
             }
         }
 
         if ($inline_group) {
-            $output = "<script" . $this->renderAttributes(). ">\n" . $buffer . "\n</script>\n";
+            $output = '<script' . $this->renderAttributes(). ">\n" . $buffer . "\n</script>\n";
         } else {
             $this->asset = $relative_path;
-            $output = "<script src=\"" . $relative_path . $this->renderQueryString() . "\"" . $this->renderAttributes() . "></script>\n";
+            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
         }
 
         return $output;
@@ -234,7 +216,7 @@ class Pipeline extends PropertyObject
      *
      * @param string $file the css source file
      * @param string $dir , $local relative path to the css file
-     * @param boolean $local is this a local or remote asset
+     * @param bool $local is this a local or remote asset
      *
      * @return mixed
      */
@@ -249,14 +231,22 @@ class Pipeline extends PropertyObject
 
             $old_url = $matches[2];
 
-            // Ensure link is not rooted to webserver, a data URL, or to a remote host
-            if (Utils::startsWith($old_url, '/') || Utils::startsWith($old_url, 'data:') || $this->isRemoteLink($old_url)) {
+            // Ensure link is not rooted to web server, a data URL, or to a remote host
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url) || Utils::startsWith($old_url, 'data:') || $this->isRemoteLink($old_url)) {
                 return $matches[0];
             }
 
-            $new_url = ($local ? $this->base_url: '') . ltrim(Utils::normalizePath($dir . '/' . $old_url), '/');
+            // clean leading /
+            $old_url = Utils::normalizePath($dir . '/' . $old_url);
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url)) {
+                $old_url = ltrim($old_url, '/');
+            }
 
-            return str_replace($old_url, $new_url, $matches[0]);
+            $new_url = ($local ? $this->base_url: '') . $old_url;
+
+            $fixed = str_replace($matches[2], $new_url, $matches[0]);
+
+            return $fixed;
         }, $file);
 
         return $file;

system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets.Traits
+ * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -24,7 +25,7 @@ trait AssetUtilsTrait
     {
         $base = Grav::instance()['uri']->rootUrl(true);
 
-        // sanity check for local URLs with absolute URL's enabled
+        // Sanity check for local URLs with absolute URL's enabled
         if (Utils::startsWith($link, $base)) {
             return false;
         }
@@ -37,11 +38,10 @@ trait AssetUtilsTrait
      *
      * @param  array $assets
      * @param  bool $css
-     * @param array $no_pipeline
      *
      * @return string
      */
-    protected function gatherLinks(array $assets, $css = true, &$no_pipeline = [])
+    protected function gatherLinks(array $assets, $css = true)
     {
         $buffer = '';
 
@@ -52,12 +52,12 @@ trait AssetUtilsTrait
             $link = $asset->getAsset();
             $relative_path = $link;
 
-            if ($this->isRemoteLink($link)) {
+            if (static::isRemoteLink($link)) {
                 $local = false;
                 if (0 === strpos($link, '//')) {
                     $link = 'http:' . $link;
                 }
-                $relative_dir = dirname($relative_path);
+                $relative_dir = \dirname($relative_path);
             } else {
                 // Fix to remove relative dir if grav is in one
                 if (($this->base_url !== '/') && Utils::startsWith($relative_path, $this->base_url)) {
@@ -65,7 +65,7 @@ trait AssetUtilsTrait
                     $relative_path = ltrim(preg_replace($base_url, '/', $link, 1), '/');
                 }
 
-                $relative_dir = dirname($relative_path);
+                $relative_dir = \dirname($relative_path);
                 $link = ROOT_DIR . $relative_path;
             }
 
@@ -73,9 +73,6 @@ trait AssetUtilsTrait
 
             // No file found, skip it...
             if ($file === false) {
-                if (!$local) { // Assume we coudln't download this file for some reason assume it's not pipeline compatible
-                    $no_pipeline[$id] = $asset;
-                }
                 continue;
             }
 
@@ -112,7 +109,7 @@ trait AssetUtilsTrait
     {
         $imports = [];
 
-        $file = (string)preg_replace_callback(self::CSS_IMPORT_REGEX, function ($matches) {
+        $file = (string)preg_replace_callback(self::CSS_IMPORT_REGEX, function ($matches) use (&$imports) {
             $imports[] = $matches[0];
 
             return '';
@@ -125,8 +122,6 @@ trait AssetUtilsTrait
      *
      * Build an HTML attribute string from an array.
      *
-     * @param  array $attributes
-     *
      * @return string
      */
     protected function renderAttributes()
@@ -157,6 +152,7 @@ trait AssetUtilsTrait
     /**
      * Render Querystring
      *
+     * @param string $asset
      * @return string
      */
     protected function renderQueryString($asset = null)

system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets.Traits
+ * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,24 +14,31 @@ use Grav\Common\Assets;
 trait LegacyAssetsTrait
 {
 
+    /**
+     * @param array $args
+     * @param string $type
+     * @return array
+     */
     protected function unifyLegacyArguments($args, $type = Assets::CSS_TYPE)
     {
         // First argument is always the asset
         array_shift($args);
 
-        if (\count($args) === 0) {
+        if (count($args) === 0) {
             return [];
         }
-        if (\count($args) === 1 && \is_array($args[0])) {
+        // New options array format
+        if (count($args) === 1 && is_array($args[0])) {
             return $args[0];
         }
+        // Handle obscure case where options array is mixed with a priority
+        if (count($args) === 2 && is_array($args[0]) && is_int($args[1])) {
+            $arguments = $args[0];
+            $arguments['priority'] = $args[1];
+            return $arguments;
+        }
 
         switch ($type) {
-            case(Assets::INLINE_CSS_TYPE):
-                $defaults = ['priority' => null, 'group' => null];
-                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
-                break;
-
             case(Assets::JS_TYPE):
                 $defaults = ['priority' => null, 'pipeline' => true, 'loading' => null, 'group' => null];
                 $arguments = $this->createArgumentsFromLegacy($args, $defaults);
@@ -49,6 +57,11 @@ trait LegacyAssetsTrait
 
                 break;
 
+            case(Assets::INLINE_CSS_TYPE):
+                $defaults = ['priority' => null, 'group' => null];
+                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
+                break;
+
             default:
             case(Assets::CSS_TYPE):
                 $defaults = ['priority' => null, 'pipeline' => true, 'group' => null, 'loading' => null];
@@ -76,34 +89,36 @@ trait LegacyAssetsTrait
     /**
      * Convenience wrapper for async loading of JavaScript
      *
-     * @param        $asset
-     * @param int    $priority
-     * @param bool   $pipeline
-     * @param string $group name of the group
-     *
-     * @deprecated Please use dynamic method with ['loading' => 'async']
+     * @param string|array  $asset
+     * @param int           $priority
+     * @param bool          $pipeline
+     * @param string        $group name of the group
      *
      * @return \Grav\Common\Assets
+     * @deprecated Please use dynamic method with ['loading' => 'async'].
      */
     public function addAsyncJs($asset, $priority = 10, $pipeline = true, $group = 'head')
     {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use dynamic method with [\'loading\' => \'async\']', E_USER_DEPRECATED);
+
         return $this->addJs($asset, $priority, $pipeline, 'async', $group);
     }
 
     /**
      * Convenience wrapper for deferred loading of JavaScript
      *
-     * @param        $asset
-     * @param int    $priority
-     * @param bool   $pipeline
-     * @param string $group name of the group
-     *
-     * @deprecated Please use dynamic method with ['loading' => 'defer']
+     * @param string|array  $asset
+     * @param int           $priority
+     * @param bool          $pipeline
+     * @param string        $group name of the group
      *
      * @return \Grav\Common\Assets
+     * @deprecated Please use dynamic method with ['loading' => 'defer'].
      */
     public function addDeferJs($asset, $priority = 10, $pipeline = true, $group = 'head')
     {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use dynamic method with [\'loading\' => \'defer\']', E_USER_DEPRECATED);
+
         return $this->addJs($asset, $priority, $pipeline, 'defer', $group);
     }
 

system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Assets.Traits
+ * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,7 +16,7 @@ trait TestingAssetsTrait
     /**
      * Determines if an asset exists as a collection, CSS or JS reference
      *
-     * @param $asset
+     * @param string $asset
      *
      * @return bool
      */
@@ -37,13 +38,14 @@ trait TestingAssetsTrait
     /**
      * Set the array of collections explicitly
      *
-     * @param $collections
+     * @param array $collections
      *
      * @return $this
      */
     public function setCollection($collections)
     {
         $this->collections = $collections;
+
         return $this;
     }
 
@@ -88,7 +90,7 @@ trait TestingAssetsTrait
     /**
      * Set the whole array of CSS assets
      *
-     * @param $css
+     * @param array $css
      *
      * @return $this
      */
@@ -102,7 +104,7 @@ trait TestingAssetsTrait
     /**
      * Set the whole array of JS assets
      *
-     * @param $js
+     * @param array $js
      *
      * @return $this
      */
@@ -150,7 +152,7 @@ trait TestingAssetsTrait
     /**
      * Sets the state of CSS Pipeline
      *
-     * @param boolean $value
+     * @param bool $value
      *
      * @return $this
      */
@@ -164,7 +166,7 @@ trait TestingAssetsTrait
     /**
      * Sets the state of JS Pipeline
      *
-     * @param boolean $value
+     * @param bool $value
      *
      * @return $this
      */
@@ -217,7 +219,7 @@ trait TestingAssetsTrait
     /**
      * Explicitly set's a timestamp for assets
      *
-     * @param $value
+     * @param string|int $value
      */
     public function setTimestamp($value)
     {

system/src/Grav/Common/Backup/Backups.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Backup
+ * @package    Grav\Common\Backup
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,13 +18,14 @@ use Grav\Common\Utils;
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\Event\EventDispatcher;
+use RocketTheme\Toolbox\File\JsonFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class Backups
 {
-    const BACKUP_FILENAME_REGEXZ = "#(.*)--(\d*).zip#";
+    protected const BACKUP_FILENAME_REGEXZ = "#(.*)--(\d*).zip#";
 
-    const BACKUP_DATE_FORMAT = 'YmdHis';
+    protected const BACKUP_DATE_FORMAT = 'YmdHis';
 
     protected static $backup_dir;
 
@@ -39,7 +41,7 @@ class Backups
 
     public function setup()
     {
-        if (is_null(static::$backup_dir)) {
+        if (null === static::$backup_dir) {
             static::$backup_dir = Grav::instance()['locator']->findResource('backup://', true, true);
             Folder::create(static::$backup_dir);
         }
@@ -53,14 +55,15 @@ class Backups
         /** @var Inflector $inflector */
         $inflector = Grav::instance()['inflector'];
 
-        foreach ($this->getBackupProfiles() as $id => $profile) {
+        foreach (static::getBackupProfiles() as $id => $profile) {
             $at = $profile['schedule_at'];
-            $name = $inflector->hyphenize($profile['name']);
+            $name = $inflector::hyphenize($profile['name']);
             $logs = 'logs/backup-' . $name . '.out';
             /** @var Job $job */
             $job = $scheduler->addFunction('Grav\Common\Backup\Backups::backup', [$id], $name );
             $job->at($at);
             $job->output($logs);
+            $job->backlink('/tools/backups');
         }
     }
 
@@ -86,7 +89,7 @@ class Backups
 
     public function getBackupNames()
     {
-        return array_column($this->getBackupProfiles(), 'name');
+        return array_column(static::getBackupProfiles(), 'name');
     }
 
     public static function getTotalBackupsSize()
@@ -99,7 +102,7 @@ class Backups
 
     public static function getAvailableBackups($force = false)
     {
-        if ($force || is_null(static::$backups)) {
+        if ($force || null === static::$backups) {
             static::$backups = [];
             $backups_itr = new \GlobIterator(static::$backup_dir . '/*.zip', \FilesystemIterator::KEY_AS_FILENAME);
             $inflector = Grav::instance()['inflector'];
@@ -165,7 +168,7 @@ class Backups
         }
 
         if (!file_exists($backup_root)) {
-            throw new \RuntimeException("Backup location: " . $backup_root . ' does not exist...');
+            throw new \RuntimeException("Backup location: {$backup_root} does not exist...");
         }
 
         $options = [
@@ -192,7 +195,7 @@ class Backups
         }
 
         // Log the backup
-        Grav::instance()['log']->error('Backup Created: ' . $destination);
+        Grav::instance()['log']->notice('Backup Created: ' . $destination);
 
         // Fire Finished event
         Grav::instance()->fireEvent('onBackupFinished', new Event(['backup' => $destination]));
@@ -200,6 +203,14 @@ class Backups
         // Purge anything required
         static::purge();
 
+        // Log
+        $log = JsonFile::instance(Grav::instance()['locator']->findResource("log://backup.log", true, true));
+        $log->content([
+            'time'     => time(),
+            'location' => $destination
+        ]);
+        $log->save();
+
         return $destination;
     }
 
@@ -245,6 +256,6 @@ class Backups
     protected static function convertExclude($exclude)
     {
         $lines = preg_split("/[\s,]+/", $exclude);
-        return array_map('trim', $lines, array_fill(0,count($lines),'/'));
+        return array_map('trim', $lines, array_fill(0, \count($lines), '/'));
     }
 }

system/src/Grav/Common/Browser.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -113,7 +114,7 @@ class Browser
     {
         $version = explode('.', $this->getLongVersion());
 
-        return intval($version[0]);
+        return (int)$version[0];
     }
 
     /**
@@ -143,10 +144,6 @@ class Browser
      */
     public function isTrackable(): bool
     {
-        if (isset($_SERVER['HTTP_DNT']) && $_SERVER['HTTP_DNT'] === '1') {
-            return false;
-        }
-
-        return true;
+        return !(isset($_SERVER['HTTP_DNT']) && $_SERVER['HTTP_DNT'] === '1');
     }
 }

system/src/Grav/Common/Cache.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,15 +12,16 @@ namespace Grav\Common;
 use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Scheduler\Scheduler;
+use Psr\SimpleCache\CacheInterface;
 use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\Event\EventDispatcher;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
  * It uses DoctrineCache library and supports a variety of caching mechanisms. Those include:
  *
  * APCu
- * APC
- * XCache
  * RedisCache
  * MemCache
  * MemCacheD
@@ -43,6 +45,11 @@ class Cache extends Getters
      */
     protected $driver;
 
+    /**
+     * @var CacheInterface
+     */
+    protected $simpleCache;
+
     protected $driver_name;
 
     protected $driver_setting;
@@ -117,7 +124,7 @@ class Cache extends Getters
         $this->config = $grav['config'];
         $this->now = time();
 
-        if (is_null($this->enabled)) {
+        if (null === $this->enabled) {
             $this->enabled = (bool)$this->config->get('system.cache.enabled');
         }
 
@@ -139,6 +146,28 @@ class Cache extends Getters
         $dispatcher->addListener('onSchedulerInitialized', [$this, 'onSchedulerInitialized']);
     }
 
+    /**
+     * @return CacheInterface
+     */
+    public function getSimpleCache()
+    {
+        if (null === $this->simpleCache) {
+            $cache = new \Grav\Framework\Cache\Adapter\DoctrineCache($this->driver, '', $this->getLifetime());
+
+            // Disable cache key validation.
+            $cache->setValidation(false);
+
+            $this->simpleCache = $cache;
+        }
+
+        return $this->simpleCache;
+    }
+
+    /**
+     * Deletes the old out of date file-based caches
+     *
+     * @return int
+     */
     public function purgeOldCache()
     {
         $cache_dir = dirname($this->cache_dir);
@@ -147,7 +176,7 @@ class Cache extends Getters
 
         foreach (new \DirectoryIterator($cache_dir) as $file) {
             $dir = $file->getBasename();
-            if ($file->isDot() || $file->isFile() || $dir === $current) {
+            if ($dir === $current || $file->isDot() || $file->isFile()) {
                 continue;
             }
 
@@ -161,11 +190,11 @@ class Cache extends Getters
     /**
      * Public accessor to set the enabled state of the cache
      *
-     * @param $enabled
+     * @param bool|int $enabled
      */
     public function setEnabled($enabled)
     {
-        $this->enabled = (bool) $enabled;
+        $this->enabled = (bool)$enabled;
     }
 
     /**
@@ -202,19 +231,15 @@ class Cache extends Getters
 
         // CLI compatibility requires a non-volatile cache driver
         if ($this->config->get('system.cache.cli_compatibility') && (
-            $setting == 'auto' || $this->isVolatileDriver($setting))) {
+            $setting === 'auto' || $this->isVolatileDriver($setting))) {
             $setting = $driver_name;
         }
 
-        if (!$setting || $setting == 'auto') {
+        if (!$setting || $setting === 'auto') {
             if (extension_loaded('apcu')) {
                 $driver_name = 'apcu';
-            } elseif (extension_loaded('apc')) {
-                $driver_name = 'apc';
             } elseif (extension_loaded('wincache')) {
                 $driver_name = 'wincache';
-            } elseif (extension_loaded('xcache')) {
-                $driver_name = 'xcache';
             }
         } else {
             $driver_name = $setting;
@@ -224,9 +249,6 @@ class Cache extends Getters
 
         switch ($driver_name) {
             case 'apc':
-                $driver = new DoctrineCache\ApcCache();
-                break;
-
             case 'apcu':
                 $driver = new DoctrineCache\ApcuCache();
                 break;
@@ -235,45 +257,53 @@ class Cache extends Getters
                 $driver = new DoctrineCache\WinCacheCache();
                 break;
 
-            case 'xcache':
-                $driver = new DoctrineCache\XcacheCache();
-                break;
-
             case 'memcache':
-                $memcache = new \Memcache();
-                $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),
-                    $this->config->get('system.cache.memcache.port', 11211));
-                $driver = new DoctrineCache\MemcacheCache();
-                $driver->setMemcache($memcache);
+                if (extension_loaded('memcache')) {
+                    $memcache = new \Memcache();
+                    $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),
+                        $this->config->get('system.cache.memcache.port', 11211));
+                    $driver = new DoctrineCache\MemcacheCache();
+                    $driver->setMemcache($memcache);
+                } else {
+                    throw new \LogicException('Memcache PHP extension has not been installed');
+                }
                 break;
 
             case 'memcached':
-                $memcached = new \Memcached();
-                $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
-                    $this->config->get('system.cache.memcached.port', 11211));
-                $driver = new DoctrineCache\MemcachedCache();
-                $driver->setMemcached($memcached);
+                if (extension_loaded('memcached')) {
+                    $memcached = new \Memcached();
+                    $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
+                        $this->config->get('system.cache.memcached.port', 11211));
+                    $driver = new DoctrineCache\MemcachedCache();
+                    $driver->setMemcached($memcached);
+                } else {
+                    throw new \LogicException('Memcached PHP extension has not been installed');
+                }
                 break;
 
             case 'redis':
-                $redis = new \Redis();
-                $socket = $this->config->get('system.cache.redis.socket', false);
-                $password = $this->config->get('system.cache.redis.password', false);
+                if (extension_loaded('redis')) {
+                    $redis = new \Redis();
+                    $socket = $this->config->get('system.cache.redis.socket', false);
+                    $password = $this->config->get('system.cache.redis.password', false);
 
-                if ($socket) {
-                    $redis->connect($socket);
+                    if ($socket) {
+                        $redis->connect($socket);
+                    } else {
+                        $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
+                            $this->config->get('system.cache.redis.port', 6379));
+                    }
+
+                    // Authenticate with password if set
+                    if ($password && !$redis->auth($password)) {
+                        throw new \RedisException('Redis authentication failed');
+                    }
+
+                    $driver = new DoctrineCache\RedisCache();
+                    $driver->setRedis($redis);
                 } else {
-                    $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
-                    $this->config->get('system.cache.redis.port', 6379));
+                    throw new \LogicException('Redis PHP extension has not been installed');
                 }
-
-                // Authenticate with password if set
-                if ($password && !$redis->auth($password)) {
-                    throw new \RedisException('Redis authentication failed');
-                }
-
-                $driver = new DoctrineCache\RedisCache();
-                $driver->setRedis($redis);
                 break;
 
             default:
@@ -295,16 +325,16 @@ class Cache extends Getters
     {
         if ($this->enabled) {
             return $this->driver->fetch($id);
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
      * 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)
@@ -328,6 +358,7 @@ class Cache extends Getters
         if ($this->enabled) {
             return $this->driver->delete($id);
         }
+
         return false;
     }
 
@@ -341,6 +372,7 @@ class Cache extends Getters
         if ($this->enabled) {
             return $this->driver->deleteAll();
         }
+
         return false;
     }
 
@@ -355,6 +387,7 @@ class Cache extends Getters
         if ($this->enabled) {
             return $this->driver->contains(($id));
         }
+
         return false;
     }
 
@@ -404,6 +437,9 @@ class Cache extends Getters
             case 'tmp-only':
                 $remove_paths = self::$tmp_remove;
                 break;
+            case 'invalidate':
+                $remove_paths = [];
+                break;
             default:
                 if (Grav::instance()['config']->get('system.cache.clear_images_by_default')) {
                     $remove_paths = self::$standard_remove;
@@ -459,7 +495,7 @@ class Cache extends Getters
 
         $output[] = '';
 
-        if (($remove == 'all' || $remove == 'standard') && file_exists($user_config)) {
+        if (($remove === 'all' || $remove === 'standard') && file_exists($user_config)) {
             touch($user_config);
 
             $output[] = '<red>Touched: </red>' . $user_config;
@@ -477,6 +513,23 @@ class Cache extends Getters
         return $output;
     }
 
+    public static function invalidateCache()
+    {
+        $user_config = USER_DIR . 'config/system.yaml';
+
+        if (file_exists($user_config)) {
+            touch($user_config);
+        }
+
+        // Clear stat cache
+        @clearstatcache();
+
+        // Clear opcache
+        if (function_exists('opcache_reset')) {
+            @opcache_reset();
+        }
+
+    }
 
     /**
      * Set the cache lifetime programmatically
@@ -489,7 +542,7 @@ class Cache extends Getters
             return;
         }
 
-        $interval = $future - $this->now;
+        $interval = (int)($future - $this->now);
         if ($interval > 0 && $interval < $this->getLifetime()) {
             $this->lifetime = $interval;
         }
@@ -504,7 +557,7 @@ class Cache extends Getters
     public function getLifetime()
     {
         if ($this->lifetime === null) {
-            $this->lifetime = $this->config->get('system.cache.lifetime') ?: 604800; // 1 week default
+            $this->lifetime = (int)($this->config->get('system.cache.lifetime') ?: 604800); // 1 week default
         }
 
         return $this->lifetime;
@@ -533,24 +586,41 @@ class Cache extends Getters
     /**
      * is this driver a volatile driver in that it resides in PHP process memory
      *
-     * @param $setting
+     * @param string $setting
      * @return bool
      */
     public function isVolatileDriver($setting)
     {
         if (in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'])) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
+    /**
+     * Static function to call as a scheduled Job to purge old Doctrine files
+     */
     public static function purgeJob()
     {
+        /** @var Cache $cache */
         $cache = Grav::instance()['cache'];
         $deleted_folders = $cache->purgeOldCache();
-        $msg = 'Purged ' . $deleted_folders . ' old cache folders...';
-        return $msg;
+
+        echo 'Purged ' . $deleted_folders . ' old cache folders...';
+    }
+
+    /**
+     * Static function to call as a scheduled Job to clear Grav cache
+     *
+     * @param string $type
+     */
+    public static function clearJob($type)
+    {
+        $result = static::clearCache($type);
+        static::invalidateCache();
+
+        echo strip_tags(implode("\n", $result));
     }
 
     public function onSchedulerInitialized(Event $event)
@@ -559,13 +629,26 @@ class Cache extends Getters
         $scheduler = $event['scheduler'];
         $config = Grav::instance()['config'];
 
+        // File Cache Purge
         $at = $config->get('system.cache.purge_at');
         $name = 'cache-purge';
         $logs = 'logs/' . $name . '.out';
 
-        $job = $scheduler->addFunction('Grav\Common\Cache::purgeJob', null, $name );
+        $job = $scheduler->addFunction('Grav\Common\Cache::purgeJob', [], $name );
         $job->at($at);
         $job->output($logs);
+        $job->backlink('/config/system#caching');
+
+        // Cache Clear
+        $at = $config->get('system.cache.clear_at');
+        $clear_type = $config->get('system.cache.clear_job_type');
+        $name = 'cache-clear';
+        $logs = 'logs/' . $name . '.out';
+
+        $job = $scheduler->addFunction('Grav\Common\Cache::clearJob', [$clear_type], $name );
+        $job->at($at);
+        $job->output($logs);
+        $job->backlink('/config/system#caching');
 
     }
 

system/src/Grav/Common/Composer.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -46,7 +47,7 @@ class Composer
         $composer = static::getComposerLocation();
 
         if ($composer !== static::DEFAULT_PATH && is_executable($composer)) {
-            $file = fopen($composer, 'r');
+            $file = fopen($composer, 'rb');
             $firstLine = fgets($file);
             fclose($file);
 

system/src/Grav/Common/Config/CompiledBase.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -198,9 +199,7 @@ abstract class CompiledBase
         $cache = include $filename;
         if (
             !\is_array($cache)
-            || !isset($cache['checksum'])
-            || !isset($cache['data'])
-            || !isset($cache['@class'])
+            || !isset($cache['checksum'], $cache['data'], $cache['@class'])
             || $cache['@class'] !== \get_class($this)
         ) {
             return false;

system/src/Grav/Common/Config/CompiledBlueprints.php

@@ -1,27 +1,30 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\BlueprintSchema;
 use Grav\Common\Grav;
 
+/**
+ * Class CompiledBlueprints
+ * @package Grav\Common\Config
+ */
 class CompiledBlueprints extends CompiledBase
 {
-    /**
-     * @var int Version number for the compiled file.
-     */
-    public $version = 2;
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        parent::__construct($cacheFolder, $files, $path);
 
-    /**
-     * @var BlueprintSchema  Blueprints object.
-     */
-    protected $object;
+        $this->version = 2;
+    }
 
     /**
      * Returns checksum from the configuration files.

system/src/Grav/Common/Config/CompiledConfig.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,16 +13,6 @@ use Grav\Common\File\CompiledYamlFile;
 
 class CompiledConfig extends CompiledBase
 {
-    /**
-     * @var int Version number for the compiled file.
-     */
-    public $version = 1;
-
-    /**
-     * @var Config  Configuration object.
-     */
-    protected $object;
-
     /**
      * @var callable  Blueprints loader.
      */
@@ -32,6 +23,13 @@ class CompiledConfig extends CompiledBase
      */
     protected $withDefaults;
 
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        parent::__construct($cacheFolder, $files, $path);
+
+        $this->version = 1;
+    }
+
     /**
      * Set blueprints for the configuration.
      *

system/src/Grav/Common/Config/CompiledLanguages.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,15 +13,12 @@ use Grav\Common\File\CompiledYamlFile;
 
 class CompiledLanguages extends CompiledBase
 {
-    /**
-     * @var int Version number for the compiled file.
-     */
-    public $version = 1;
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        parent::__construct($cacheFolder, $files, $path);
 
-    /**
-     * @var Languages  Configuration object.
-     */
-    protected $object;
+        $this->version = 1;
+    }
 
     /**
      * Create configuration object.

system/src/Grav/Common/Config/Config.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -108,14 +109,13 @@ class Config extends Data
             }
         }
 
-        // Override the media.upload_limit based on PHP values
-        $upload_limit = Utils::getUploadLimit();
-        $this->items['system']['media']['upload_limit'] = $upload_limit > 0 ? $upload_limit : 1024*1024*1024;
+        // Legacy value - Override the media.upload_limit based on PHP values
+        $this->items['system']['media']['upload_limit'] = Utils::getUploadLimit();
     }
 
     /**
      * @return mixed
-     * @deprecated
+     * @deprecated 1.5 Use Grav::instance()['languages'] instead.
      */
     public function getLanguages()
     {

system/src/Grav/Common/Config/ConfigFileFinder.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Config/Languages.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,6 +14,22 @@ use Grav\Common\Utils;
 
 class Languages extends Data
 {
+    /**
+     * @var string|null
+     */
+    protected $checksum;
+
+    /**
+     * @var string|null
+     */
+    protected $modified;
+
+    /**
+     * @var string|null
+     */
+    protected $timestamp;
+
+
     public function checksum($checksum = null)
     {
         if ($checksum !== null) {

system/src/Grav/Common/Config/Setup.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +12,8 @@ namespace Grav\Common\Config;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
-use Grav\Framework\Psr7\ServerRequest;
 use Pimple\Container;
+use Psr\Http\Message\ServerRequestInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class Setup extends Data
@@ -157,7 +158,7 @@ class Setup extends Data
             if (\defined('GRAV_CLI')) {
                 static::$environment = 'cli';
             } else {
-                /** @var ServerRequest $request */
+                /** @var ServerRequestInterface $request */
                 $request = $container['request'];
                 $host = $request->getUri()->getHost();
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,7 +11,7 @@ namespace Grav\Common\Data;
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
-use Grav\Common\User\User;
+use Grav\Common\User\Interfaces\UserInterface;
 use RocketTheme\Toolbox\Blueprints\BlueprintForm;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
@@ -24,11 +25,31 @@ class Blueprint extends BlueprintForm
     /** @var BlueprintSchema */
     protected $blueprintSchema;
 
+    /** @var object */
+    protected $object;
+
+    /** @var array */
+    protected $defaults;
+
+    protected $handlers = [];
+
+    public function __clone()
+    {
+        if ($this->blueprintSchema) {
+            $this->blueprintSchema = clone $this->blueprintSchema;
+        }
+    }
+
     public function setScope($scope)
     {
         $this->scope = $scope;
     }
 
+    public function setObject($object)
+    {
+        $this->object = $object;
+    }
+
     /**
      * Set default values for field types.
      *
@@ -55,7 +76,61 @@ class Blueprint extends BlueprintForm
     {
         $this->initInternals();
 
-        return $this->blueprintSchema->getDefaults();
+        if (null === $this->defaults) {
+            $this->defaults = $this->blueprintSchema->getDefaults();
+        }
+
+        return $this->defaults;
+    }
+
+    /**
+     * Initialize blueprints with its dynamic fields.
+     *
+     * @return $this
+     */
+    public function init()
+    {
+        foreach ($this->dynamic as $key => $data) {
+            // Locate field.
+            $path = explode('/', $key);
+            $current = &$this->items;
+
+            foreach ($path as $field) {
+                if (\is_object($current)) {
+                    // Handle objects.
+                    if (!isset($current->{$field})) {
+                        $current->{$field} = [];
+                    }
+
+                    $current = &$current->{$field};
+                } else {
+                    // Handle arrays and scalars.
+                    if (!\is_array($current)) {
+                        $current = [$field => []];
+                    } elseif (!isset($current[$field])) {
+                        $current[$field] = [];
+                    }
+
+                    $current = &$current[$field];
+                }
+            }
+
+            // Set dynamic property.
+            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];
+                    $callable($current, $property, $call);
+                } elseif (method_exists($this, $method)) {
+                    $this->{$method}($current, $property, $call);
+                }
+            }
+        }
+
+        return $this;
     }
 
     /**
@@ -120,15 +195,31 @@ class Blueprint extends BlueprintForm
      *
      * @param  array $data
      * @param  bool $missingValuesAsNull
+     * @param  bool $keepEmptyValues
      * @return array
      */
-    public function filter(array $data, bool $missingValuesAsNull = false)
+    public function filter(array $data, bool $missingValuesAsNull = false, bool $keepEmptyValues = false)
     {
         $this->initInternals();
 
-        return $this->blueprintSchema->filter($data, $missingValuesAsNull);
+        return $this->blueprintSchema->filter($data, $missingValuesAsNull, $keepEmptyValues);
     }
 
+
+    /**
+     * Flatten data by using blueprints.
+     *
+     * @param  array $data
+     * @return array
+     */
+    public function flattenData(array $data)
+    {
+        $this->initInternals();
+
+        return $this->blueprintSchema->flattenData($data);
+    }
+
+
     /**
      * Return blueprint data schema.
      *
@@ -141,6 +232,11 @@ class Blueprint extends BlueprintForm
         return $this->blueprintSchema;
     }
 
+    public function addDynamicHandler(string $name, callable $callable): void
+    {
+        $this->handlers[$name] = $callable;
+    }
+
     /**
      * Initialize validator.
      */
@@ -157,6 +253,7 @@ class Blueprint extends BlueprintForm
 
             $this->blueprintSchema->embed('', $this->items);
             $this->blueprintSchema->init();
+            $this->defaults = null;
         }
     }
 
@@ -290,14 +387,12 @@ class Blueprint extends BlueprintForm
         $grav = Grav::instance();
         $actions = (array)$call['params'];
 
-        /** @var User $user */
-        if (isset($grav['user'])) {
-            $user = Grav::instance()['user'];
-            foreach ($actions as $action) {
-                if (!$user->authorize($action)) {
-                    $this->addPropertyRecursive($field, 'validate', ['ignore' => true]);
-                    return;
-                }
+        /** @var UserInterface|null $user */
+        $user = $grav['user'] ?? null;
+        foreach ($actions as $action) {
+            if (!$user || !$user->authorize($action)) {
+                $this->addPropertyRecursive($field, 'validate', ['ignore' => true]);
+                return;
             }
         }
     }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -78,11 +79,51 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
      *
      * @param  array $data                  Incoming data, for example from a form.
      * @param  bool  $missingValuesAsNull   Include missing values as nulls.
+     * @param bool   $keepEmptyValues       Include empty values.
      * @return array
      */
-    public function filter(array $data, $missingValuesAsNull = false)
+    public function filter(array $data, $missingValuesAsNull = false, $keepEmptyValues = false)
     {
-        return $this->filterArray($data, $this->nested, $missingValuesAsNull);
+        return $this->filterArray($data, $this->nested, $missingValuesAsNull, $keepEmptyValues);
+    }
+
+    /**
+     * Flatten data by using blueprints.
+     *
+     * @param  array $data                  Data to be flattened.
+     * @return array
+     */
+    public function flattenData(array $data)
+    {
+        return $this->flattenArray($data, $this->nested, '');
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @param string $prefix
+     * @return array
+     */
+    protected function flattenArray(array $data, array $rules, string $prefix)
+    {
+        $array = [];
+
+        foreach ($data as $key => $field) {
+            $val = $rules[$key] ?? $rules['*'] ?? null;
+            $rule = is_string($val) ? $this->items[$val] : null;
+
+            if ($rule || isset($val['*'])) {
+                // Item has been defined in blueprints.
+                $array[$prefix.$key] = $field;
+            } elseif (is_array($field) && is_array($val)) {
+                // Array has been defined in blueprints.
+                $array += $this->flattenArray($field, $val, $prefix . $key . '.');
+            } else {
+                // Undefined/extra item.
+                $array[$prefix.$key] = $field;
+            }
+        }
+        return $array;
     }
 
     /**
@@ -101,7 +142,7 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
 
             if ($rule) {
                 // Item has been defined in blueprints.
-                if (!empty($rule['validate']['ignore'])) {
+                if (!empty($rule['disabled']) || !empty($rule['validate']['ignore'])) {
                     // Skip validation in the ignored field.
                     continue;
                 }
@@ -123,9 +164,10 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
      * @param array $data
      * @param array $rules
      * @param bool  $missingValuesAsNull
+     * @param bool $keepEmptyValues
      * @return array
      */
-    protected function filterArray(array $data, array $rules, $missingValuesAsNull)
+    protected function filterArray(array $data, array $rules, $missingValuesAsNull, $keepEmptyValues)
     {
         $results = [];
 
@@ -136,8 +178,8 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
                     $val = $rules[$key] ?? $rules['*'] ?? null;
                     $rule = \is_string($val) ? $this->items[$val] : null;
 
-                    if (empty($rule['validate']['ignore'])) {
-                        $results[$key] = null;
+                    if (empty($rule['disabled']) && empty($rule['validate']['ignore'])) {
+                        continue;
                     }
                 }
             }
@@ -149,35 +191,37 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
 
             if ($rule) {
                 // Item has been defined in blueprints.
-                if (!empty($rule['validate']['ignore'])) {
+                if (!empty($rule['disabled']) || !empty($rule['validate']['ignore'])) {
                     // Skip any data in the ignored field.
+                    unset($results[$key]);
                     continue;
                 }
 
                 $field = Validation::filter($field, $rule);
             } elseif (\is_array($field) && \is_array($val)) {
                 // Array has been defined in blueprints.
-                $field = $this->filterArray($field, $val, $missingValuesAsNull);
+                $field = $this->filterArray($field, $val, $missingValuesAsNull, $keepEmptyValues);
+
             } elseif (isset($rules['validation']) && $rules['validation'] === 'strict') {
-                $field = null;
+                // Skip any extra data.
+                continue;
             }
 
-            if (null !== $field && (!\is_array($field) || !empty($field))) {
+            if ($keepEmptyValues || (null !== $field && (!\is_array($field) || !empty($field)))) {
                 $results[$key] = $field;
             }
         }
 
-        return $results;
+        return $results ?: null;
     }
 
-
     /**
-     * @param array $data
+     * @param array|null $data
      * @param array $toggles
      * @param array $nested
-     * @return array
+     * @return array|null
      */
-    protected function processFormRecursive(array $data, array $toggles, array $nested)
+    protected function processFormRecursive(?array $data, array $toggles, array $nested)
     {
         foreach ($nested as $key => $value) {
             if ($key === '') {
@@ -189,21 +233,19 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
             }
             if (is_array($value)) {
                 // Recursively fetch the items.
-                $array = $this->processFormRecursive($data[$key] ?? [], $toggles[$key] ?? [], $value);
-
-                if (!empty($array)) {
-                    $data[$key] = $array;
-                }
+                $data[$key] = $this->processFormRecursive($data[$key] ?? null, $toggles[$key] ?? [], $value);
             } else {
                 $field = $this->get($value);
                 // Do not add the field if:
                 if (
                     // Not an input field
                     !$field
+                    // Field has been disabled
+                    || !empty($field['disabled'])
                     // Field validation is set to be ignored
                     || !empty($field['validate']['ignore'])
-                    // Field is toggleable and the toggle is turned off
-                    || (!empty($field['toggleable']) && empty($toggles[$key]))
+                    // Field is overridable and the toggle is turned off
+                    || (!empty($field['overridable']) && empty($toggles[$key]))
                 ) {
                     continue;
                 }
@@ -233,7 +275,13 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
             $field = $this->items[$field];
 
             // Skip ignored field, it will not be required.
-            if (!empty($field['validate']['ignore'])) {
+            if (!empty($field['disabled']) || !empty($field['validate']['ignore'])) {
+                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;
             }
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -38,7 +39,8 @@ class Blueprints
     public function get($type)
     {
         if (!isset($this->instances[$type])) {
-            $this->instances[$type] = $this->loadFile($type);
+            $blueprint = $this->loadFile($type);
+            $this->instances[$type] = $blueprint;
         }
 
         return $this->instances[$type];
@@ -98,6 +100,15 @@ class Blueprints
             $blueprint->setContext($this->search);
         }
 
-        return $blueprint->load()->init();
+        try {
+            $blueprint->load()->init();
+        } catch (\RuntimeException $e) {
+            $log = Grav::instance()['log'];
+            $log->error(sprintf('Blueprint %s cannot be loaded: %s', $name, $e->getMessage()));
+
+            throw $e;
+        }
+
+        return $blueprint;
     }
 }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -25,7 +26,7 @@ class Data implements DataInterface, \ArrayAccess, \Countable, \JsonSerializable
     /** @var array */
     protected $items;
 
-    /** @var Blueprints */
+    /** @var Blueprint */
     protected $blueprints;
 
     /** @var File */
@@ -196,13 +197,15 @@ class Data implements DataInterface, \ArrayAccess, \Countable, \JsonSerializable
     }
 
     /**
-     * @param bool $missingValuesAsNull
      * @return $this
-     * Filter all items by using blueprints.
      */
-    public function filter(bool $missingValuesAsNull = false)
+    public function filter()
     {
-        $this->items = $this->blueprints()->filter($this->items, $missingValuesAsNull);
+        $args = func_get_args();
+        $missingValuesAsNull = (bool)(array_shift($args) ?: false);
+        $keepEmptyValues = (bool)(array_shift($args) ?: false);
+
+        $this->items = $this->blueprints()->filter($this->items, $missingValuesAsNull, $keepEmptyValues);
 
         return $this;
     }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,35 +12,32 @@ namespace Grav\Common\Data;
 use Grav\Common\Grav;
 use Grav\Common\Utils;
 use Grav\Common\Yaml;
-use RocketTheme\Toolbox\Compat\Yaml\Yaml as FallbackYaml;
 
 class Validation
 {
     /**
      * Validate value against a blueprint field definition.
      *
-     * @param $value
+     * @param mixed $value
      * @param array $field
      * @return array
      */
     public static function validate($value, array $field)
     {
-        $messages = [];
-
-        $validate = isset($field['validate']) ? (array) $field['validate'] : [];
-        // Validate type with fallback type text.
-        $type = (string) isset($validate['type']) ? $validate['type'] : $field['type'];
-        $method = 'type' . str_replace('-', '_', $type);
-
-        // If value isn't required, we will stop validation if empty value is given.
-        if ((empty($validate['required']) || (isset($validate['required']) && $validate['required'] !== true)) && ($value === null || $value === '' || (($field['type'] === 'checkbox' || $field['type'] === 'switch') && $value == false))) {
-            return $messages;
-        }
-
         if (!isset($field['type'])) {
             $field['type'] = 'text';
         }
 
+        $validate = (array)($field['validate'] ?? null);
+        $type = $validate['type'] ?? $field['type'];
+        $required = $validate['required'] ?? false;
+
+        // If value isn't required, we will stop validation if empty value is given.
+        if ($required !== true && ($value === null || $value === '' || (($field['type'] === 'checkbox' || $field['type'] === 'switch') && $value == false))
+        ) {
+            return [];
+        }
+
         // Get language class.
         $language = Grav::instance()['language'];
 
@@ -49,17 +47,17 @@ class Validation
             : $language->translate('GRAV.FORM.INVALID_INPUT', null, true) . ' "' . $language->translate($name) . '"';
 
 
+        // Validate type with fallback type text.
+        $method = 'type' . str_replace('-', '_', $type);
+
         // If this is a YAML field validate/filter as such
-        if ($type !== 'yaml' && isset($field['yaml']) && $field['yaml'] === true) {
+        if (isset($field['yaml']) && $field['yaml'] === true) {
             $method = 'typeYaml';
         }
 
-        if (method_exists(__CLASS__, $method)) {
-            $success = self::$method($value, $validate, $field);
-        } else {
-            $success = true;
-        }
+        $messages = [];
 
+        $success = method_exists(__CLASS__, $method) ? self::$method($value, $validate, $field) : true;
         if (!$success) {
             $messages[$field['name']][] = $message;
         }
@@ -89,7 +87,7 @@ class Validation
      */
     public static function filter($value, array $field)
     {
-        $validate = isset($field['validate']) ? (array) $field['validate'] : [];
+        $validate = (array)($field['filter'] ?? $field['validate'] ?? null);
 
         // If value isn't required, we will return null if empty value is given.
         if (($value === null || $value === '') && empty($validate['required'])) {
@@ -99,14 +97,12 @@ class Validation
         if (!isset($field['type'])) {
             $field['type'] = 'text';
         }
+        $type = $field['filter']['type'] ?? $field['validate']['type'] ?? $field['type'];
 
-
-        // Validate type with fallback type text.
-        $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
         $method = 'filter' . ucfirst(str_replace('-', '_', $type));
 
         // If this is a YAML field validate/filter as such
-        if ($type !== 'yaml' && isset($field['yaml']) && $field['yaml'] === true) {
+        if (isset($field['yaml']) && $field['yaml'] === true) {
             $method = 'filterYaml';
         }
 
@@ -159,6 +155,10 @@ class Validation
 
     protected static function filterText($value, array $params, array $field)
     {
+        if (!\is_string($value) && !is_numeric($value)) {
+            return '';
+        }
+
         if (!empty($params['trim'])) {
             $value = trim($value);
         }
@@ -166,6 +166,11 @@ class Validation
         return (string) $value;
     }
 
+    protected static function filterCheckbox($value, array $params, array $field)
+    {
+        return (bool) $value;
+    }
+
     protected static function filterCommaList($value, array $params, array $field)
     {
         return \is_array($value) ? $value : preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
@@ -261,8 +266,8 @@ class Validation
      */
     public static function typeCheckbox($value, array $params, array $field)
     {
-        $value = (string) $value;
-        $field_value = (string) ($field['value'] ?? '1');
+        $value = (string)$value;
+        $field_value = (string)($field['value'] ?? '1');
 
         return $value === $field_value;
     }
@@ -290,6 +295,10 @@ class Validation
      */
     public static function typeToggle($value, array $params, array $field)
     {
+        if (\is_bool($value)) {
+            $value = (int)$value;
+        }
+
         return self::typeArray((array) $value, $params, $field);
     }
 
@@ -303,12 +312,12 @@ class Validation
      */
     public static function typeFile($value, array $params, array $field)
     {
-        return self::typeArray((array) $value, $params, $field);
+        return self::typeArray((array)$value, $params, $field);
     }
 
     protected static function filterFile($value, array $params, array $field)
     {
-        return (array) $value;
+        return (array)$value;
     }
 
     /**
@@ -568,10 +577,22 @@ class Validation
             }
         }
 
-        $options = isset($field['options']) ? array_keys($field['options']) : [];
-        $values = isset($field['use']) && $field['use'] === 'keys' ? array_keys($value) : $value;
+        // If creating new values is allowed, no further checks are needed.
+        if (!empty($field['selectize']['create'])) {
+            return true;
+        }
 
-        return !($options && array_diff($values, $options));
+        $options = $field['options'] ?? [];
+        $use = $field['use'] ?? 'values';
+
+        if (empty($field['selectize']) || empty($field['multiple'])) {
+            $options = array_keys($options);
+        }
+        if ($use === 'keys') {
+            $value = array_keys($value);
+        }
+
+        return !($options && array_diff($value, $options));
     }
 
     protected static function filterArray($value, $params, $field)
@@ -758,7 +779,7 @@ class Validation
 
     public static function validateInt($value, $params)
     {
-        return is_numeric($value) && (int) $value == $value;
+        return is_numeric($value) && (int)$value == $value;
     }
 
     protected static function filterInt($value, $params)

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Data
+ * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Errors/BareHandler.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Errors
+ * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Errors/Errors.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Errors
+ * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,11 +18,11 @@ class Errors
     {
         $grav = Grav::instance();
         $config = $grav['config']->get('system.errors');
-        $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] == 'application/json';
+        $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] === 'application/json';
 
         // Setup Whoops-based error handler
         $system = new SystemFacade;
-        $whoops = new \Whoops\Run($system);
+        $whoops = new Whoops\Run($system);
 
         $verbosity = 1;
 
@@ -49,17 +50,8 @@ class Errors
                 break;
         }
 
-        if (method_exists('Whoops\Util\Misc', 'isAjaxRequest')) { //Whoops 2.0
-            if (Whoops\Util\Misc::isAjaxRequest() || $jsonRequest) {
-                $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
-            }
-        } elseif (function_exists('Whoops\isAjaxRequest')) { //Whoops 2.0.0-alpha
-            if (Whoops\isAjaxRequest() || $jsonRequest) {
-                $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
-            }
-        } else { //Whoops 1.x
-            $json_page = new Whoops\Handler\JsonResponseHandler;
-            $json_page->onlyForAjaxRequests(true);
+        if (Whoops\Util\Misc::isAjaxRequest() || $jsonRequest) {
+            $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
         }
 
         if (isset($config['log']) && $config['log']) {
@@ -70,7 +62,7 @@ class Errors
                 } catch (\Exception $e) {
                     echo $e;
                 }
-            }, 'log');
+            });
         }
 
         $whoops->register();

system/src/Grav/Common/Errors/SimplePageHandler.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Errors
+ * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -20,7 +21,7 @@ class SimplePageHandler extends Handler
     public function __construct()
     {
         // Add the default, local resource search path:
-        $this->searchPaths[] = __DIR__ . "/Resources";
+        $this->searchPaths[] = __DIR__ . '/Resources';
     }
 
     /**
@@ -31,8 +32,8 @@ class SimplePageHandler extends Handler
         $inspector = $this->getInspector();
 
         $helper = new TemplateHelper();
-        $templateFile = $this->getResource("layout.html.php");
-        $cssFile      = $this->getResource("error.css");
+        $templateFile = $this->getResource('layout.html.php');
+        $cssFile      = $this->getResource('error.css');
 
         $code = $inspector->getException()->getCode();
         if ( ($code >= 400) && ($code < 600) )
@@ -46,9 +47,9 @@ class SimplePageHandler extends Handler
         }
 
         $vars = array(
-            "stylesheet" => file_get_contents($cssFile),
-            "code"        => $code,
-            "message"     => filter_var(rawurldecode($message), FILTER_SANITIZE_STRING),
+            'stylesheet' => file_get_contents($cssFile),
+            'code'        => $code,
+            'message'     => filter_var(rawurldecode($message), FILTER_SANITIZE_STRING),
         );
 
         $helper->setVariables($vars);
@@ -58,7 +59,7 @@ class SimplePageHandler extends Handler
     }
 
     /**
-     * @param $resource
+     * @param string $resource
      *
      * @return string
      * @throws \RuntimeException
@@ -74,7 +75,7 @@ class SimplePageHandler extends Handler
         // Search through available search paths, until we find the
         // resource we're after:
         foreach ($this->searchPaths as $path) {
-            $fullPath = $path . "/$resource";
+            $fullPath = "{$path}/{$resource}";
 
             if (is_file($fullPath)) {
                 // Cache the result:

system/src/Grav/Common/Errors/SystemFacade.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Errors
+ * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/File/CompiledFile.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.File
+ * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/File/CompiledJsonFile.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.File
+ * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -23,6 +24,6 @@ class CompiledJsonFile extends JsonFile
      */
     protected function decode($var, $assoc = true)
     {
-        return (array) json_decode($var, $assoc);
+        return (array)json_decode($var, $assoc);
     }
 }

system/src/Grav/Common/File/CompiledMarkdownFile.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.File
+ * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/File/CompiledYamlFile.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.File
+ * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Filesystem/Archiver.php

@@ -1,13 +1,16 @@
 <?php
+
 /**
- * @package    Grav.Common.FileSystem
+ * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
+use Grav\Common\Utils;
+
 abstract class Archiver
 {
     protected $options = [
@@ -19,11 +22,11 @@ abstract class Archiver
 
     public static function create($compression)
     {
-        if ($compression == 'zip') {
-            return new ZipArchiver();
-        } else {
+        if ($compression === 'zip') {
             return new ZipArchiver();
         }
+
+        return new ZipArchiver();
     }
 
     public function setArchive($archive_file)
@@ -34,6 +37,11 @@ abstract class Archiver
 
     public function setOptions($options)
     {
+        // Set infinite PHP execution time if possible.
+        if (function_exists('set_time_limit') && !Utils::isFunctionDisabled('set_time_limit')) {
+            set_time_limit(0);
+        }
+
         $this->options = $options + $this->options;
         return $this;
     }

system/src/Grav/Common/Filesystem/Folder.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.FileSystem
+ * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -48,7 +49,7 @@ abstract class Folder
     /**
      * Recursively find the last modified time under given path by file.
      *
-     * @param  string $path
+     * @param string  $path
      * @param string  $extensions   which files to search for specifically
      *
      * @return int
@@ -86,7 +87,7 @@ abstract class Folder
     /**
      * Recursively md5 hash all files in a path
      *
-     * @param $path
+     * @param string $path
      * @return string
      */
     public static function hashAllFiles($path)
@@ -141,6 +142,7 @@ abstract class Folder
      */
     public static function getRelativePathDotDot($path, $base)
     {
+        // Normalize paths.
         $base = preg_replace('![\\\/]+!', '/', $base);
         $path = preg_replace('![\\\/]+!', '/', $path);
 
@@ -148,8 +150,8 @@ abstract class Folder
             return '';
         }
 
-        $baseParts = explode('/', isset($base[0]) && '/' === $base[0] ? substr($base, 1) : $base);
-        $pathParts = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
+        $baseParts = explode('/', ltrim($base, '/'));
+        $pathParts = explode('/', ltrim($path, '/'));
 
         array_pop($baseParts);
         $lastPart = array_pop($pathParts);
@@ -164,7 +166,7 @@ abstract class Folder
         $path = str_repeat('../', count($baseParts)) . implode('/', $pathParts);
 
         return '' === $path
-        || '/' === $path[0]
+        || strpos($path, '/') === 0
         || false !== ($colonPos = strpos($path, ':')) && ($colonPos < ($slashPos = strpos($path, '/')) || false === $slashPos)
             ? "./$path" : $path;
     }
@@ -199,14 +201,14 @@ abstract class Folder
         }
 
         $compare = isset($params['compare']) ? 'get' . $params['compare'] : null;
-        $pattern = isset($params['pattern']) ? $params['pattern'] : null;
-        $filters = isset($params['filters']) ? $params['filters'] : null;
-        $recursive = isset($params['recursive']) ? $params['recursive'] : true;
-        $levels = isset($params['levels']) ? $params['levels'] : -1;
+        $pattern = $params['pattern'] ?? null;
+        $filters = $params['filters'] ?? null;
+        $recursive = $params['recursive'] ?? true;
+        $levels = $params['levels'] ?? -1;
         $key = isset($params['key']) ? 'get' . $params['key'] : null;
-        $value = isset($params['value']) ? 'get' . $params['value'] : ($recursive ? 'getSubPathname' : 'getFilename');
-        $folders = isset($params['folders']) ? $params['folders'] : true;
-        $files = isset($params['files']) ? $params['files'] : true;
+        $value = 'get' . ($params['value'] ?? ($recursive ? 'SubPathname' : 'Filename'));
+        $folders = $params['folders'] ?? true;
+        $files = $params['files'] ?? true;
 
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
@@ -233,7 +235,7 @@ abstract class Folder
         /** @var \RecursiveDirectoryIterator $file */
         foreach ($iterator as $file) {
             // Ignore hidden files.
-            if ($file->getFilename()[0] === '.') {
+            if (strpos($file->getFilename(), '.') === 0) {
                 continue;
             }
             if (!$folders && $file->isDir()) {
@@ -255,7 +257,7 @@ abstract class Folder
                 if (isset($filters['value'])) {
                     $filter = $filters['value'];
                     if (is_callable($filter)) {
-                        $filePath = call_user_func($filter, $file);
+                        $filePath = $filter($file);
                     } else {
                         $filePath = preg_replace($filter, '', $filePath);
                     }
@@ -416,23 +418,27 @@ abstract class Folder
      */
     public static function create($folder)
     {
-        if (is_dir($folder)) {
+        // Silence error for open_basedir; should fail in mkdir instead.
+        if (@is_dir($folder)) {
             return;
         }
 
         $success = @mkdir($folder, 0777, true);
 
         if (!$success) {
-            $error = error_get_last();
-            throw new \RuntimeException($error['message']);
+            // Take yet another look, make sure that the folder doesn't exist.
+            clearstatcache(true, $folder);
+            if (!@is_dir($folder)) {
+                throw new \RuntimeException(sprintf('Unable to create directory: %s', $folder));
+            }
         }
     }
 
     /**
      * Recursive copy of one directory to another
      *
-     * @param $src
-     * @param $dest
+     * @param string $src
+     * @param string $dest
      *
      * @return bool
      * @throws \RuntimeException
@@ -448,7 +454,7 @@ abstract class Folder
 
         // If the destination directory does not exist create it
         if (!is_dir($dest)) {
-            static::mkdir($dest);
+            static::create($dest);
         }
 
         // Open the source directory to read in files

system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.FileSystem
+ * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -38,7 +39,7 @@ class RecursiveDirectoryFilterIterator extends \RecursiveFilterIterator
      */
     public function accept()
     {
-        /** @var $file \SplFileInfo */
+        /** @var \SplFileInfo $file */
         $file = $this->current();
         $filename = $file->getFilename();
         $relative_filename = str_replace($this::$root . '/', '', $file->getPathname());
@@ -56,7 +57,11 @@ class RecursiveDirectoryFilterIterator extends \RecursiveFilterIterator
         return false;
     }
 
-    public function getChildren() {
-        return new self($this->getInnerIterator()->getChildren(), $this::$root, $this::$ignore_folders, $this::$ignore_files);
+    public function getChildren()
+    {
+        /** @var RecursiveDirectoryFilterIterator $iterator */
+        $iterator = $this->getInnerIterator();
+
+        return new self($iterator->getChildren(), $this::$root, $this::$ignore_folders, $this::$ignore_files);
     }
 }

system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.FileSystem
+ * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -38,12 +39,9 @@ class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
      */
     public function accept()
     {
-        /** @var $current \SplFileInfo */
+        /** @var \SplFileInfo $current */
         $current = $this->current();
 
-        if ($current->isDir() && !in_array($current->getFilename(), $this::$ignore_folders, true)) {
-            return true;
-        }
-        return false;
+        return $current->isDir() && !in_array($current->getFilename(), $this::$ignore_folders, true);
     }
 }

system/src/Grav/Common/Filesystem/ZipArchiver.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.FileSystem
+ * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,7 +18,7 @@ class ZipArchiver extends Archiver
         $archive = $zip->open($this->archive_file);
 
         if ($archive === true) {
-            Folder::mkdir($destination);
+            Folder::create($destination);
 
             if (!$zip->extractTo($destination)) {
                 throw new \RuntimeException('ZipArchiver: ZIP failed to extract ' . $this->archive_file . ' to ' . $destination);

system/src/Grav/Common/Form/FormFlash.php

@@ -1,66 +1,22 @@
 <?php
 
 /**
- * @package    Grav\Framework\Common
+ * @package    Grav\Common\Form
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Form;
 
 use Grav\Common\Filesystem\Folder;
-use Grav\Common\Grav;
-use Grav\Common\User\User;
-use RocketTheme\Toolbox\File\YamlFile;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Grav\Framework\Form\FormFlash as FrameworkFormFlash;
 
-class FormFlash extends \Grav\Framework\Form\FormFlash
+class FormFlash extends FrameworkFormFlash
 {
-    /**
-     * @param string $sessionId
-     */
-    public static function clearSession(string $sessionId): void
-    {
-        $folder = static::getSessionTmpDir($sessionId);
-        if (is_dir($folder)) {
-            Folder::delete($folder);
-        }
-    }
-
-    /**
-     * @param string $sessionId
-     * @return string
-     */
-    public static function getSessionTmpDir(string $sessionId): string
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-
-        return $locator->findResource("tmp://forms/{$sessionId}", true, true);
-    }
-
-    /**
-     * @param User|null $user
-     * @return $this
-     */
-    public function setUser(?User $user = null)
-    {
-        if ($user && $user->username) {
-            $this->user = [
-                'username' => $user->username,
-                'email' => $user->email ?? ''
-            ];
-        } else {
-            $this->user = null;
-        }
-
-        return $this;
-    }
-
     /**
      * @return array
-     * @deprecated 1.6 For backwards compatibility only, do not use.
+     * @deprecated 1.6 For backwards compatibility only, do not use
      */
     public function getLegacyFiles(): array
     {
@@ -85,12 +41,15 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
      * @param string $filename
      * @param array $upload
      * @return bool
-     * @deprecated 1.6 For backwards compatibility only, do not use.
+     * @deprecated 1.6 For backwards compatibility only, do not use
      */
     public function uploadFile(string $field, string $filename, array $upload): bool
     {
-        $tmp_dir = $this->getTmpDir();
+        if (!$this->uniqueId) {
+            return false;
+        }
 
+        $tmp_dir = $this->getTmpDir();
         Folder::create($tmp_dir);
 
         $tmp_file = $upload['file']['tmp_name'];
@@ -114,12 +73,15 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
      * @param array $upload
      * @param array $crop
      * @return bool
-     * @deprecated 1.6 For backwards compatibility only, do not use.
+     * @deprecated 1.6 For backwards compatibility only, do not use
      */
     public function cropFile(string $field, string $filename, array $upload, array $crop): bool
     {
-        $tmp_dir = $this->getTmpDir();
+        if (!$this->uniqueId) {
+            return false;
+        }
 
+        $tmp_dir = $this->getTmpDir();
         Folder::create($tmp_dir);
 
         $tmp_file = $upload['file']['tmp_name'];
@@ -136,32 +98,4 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
 
         return true;
     }
-
-    /**
-     * @return YamlFile
-     */
-    protected function getTmpIndex(): YamlFile
-    {
-        // Do not use CompiledYamlFile as the file can change multiple times per second.
-        return YamlFile::instance($this->getTmpDir() . '/index.yaml');
-    }
-
-    /**
-     * @param string $name
-     */
-    protected function removeTmpFile(string $name): void
-    {
-        $filename = $this->getTmpDir() . '/' . $name;
-        if ($name && is_file($filename)) {
-            unlink($filename);
-        }
-    }
-
-    protected function removeTmpDir(): void
-    {
-        $tmpDir = $this->getTmpDir();
-        if (file_exists($tmpDir)) {
-            Folder::delete($tmpDir);
-        }
-    }
 }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,13 +15,7 @@ abstract class AbstractCollection extends Iterator
 {
     public function toJson()
     {
-        $items = [];
-
-        foreach ($this->items as $name => $package) {
-            $items[$name] = $package->toArray();
-        }
-
-        return json_encode($items);
+        return json_encode($this->toArray());
     }
 
     public function toArray()

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,18 +11,22 @@ namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Iterator;
 
-class CachedCollection extends Iterator {
-
+class CachedCollection extends Iterator
+{
     protected static $cache;
 
     public function __construct($items)
     {
+        parent::__construct();
+
+        $method = static::class . __METHOD__;
+
         // local cache to speed things up
-        if (!isset(self::$cache[get_called_class().__METHOD__])) {
-            self::$cache[get_called_class().__METHOD__] = $items;
+        if (!isset(self::$cache[$method])) {
+            self::$cache[$method] = $items;
         }
 
-        foreach (self::$cache[get_called_class().__METHOD__] as $name => $item) {
+        foreach (self::$cache[$method] as $name => $item) {
             $this->append([$name => $item]);
         }
     }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,11 +11,18 @@ namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Data\Data;
 
-class Package {
-
+/**
+ * @property string $name
+ */
+class Package
+{
+    /**
+     * @var Data
+     */
     protected $data;
 
-    public function __construct(Data $package, $type = null) {
+    public function __construct(Data $package, $type = null)
+    {
         $this->data = $package;
 
         if ($type) {
@@ -22,28 +30,44 @@ class Package {
         }
     }
 
-    public function getData() {
+    /**
+     * @return Data
+     */
+    public function getData()
+    {
         return $this->data;
     }
 
-    public function __get($key) {
+    public function __get($key)
+    {
         return $this->data->get($key);
     }
 
-    public function __isset($key) {
-        return isset($this->data->$key);
+    public function __set($key, $value)
+    {
+        return $this->data->set($key, $value);
     }
 
-    public function __toString() {
+    public function __isset($key)
+    {
+        return isset($this->data->{$key});
+    }
+
+    public function __toString()
+    {
         return $this->toJson();
     }
 
-    public function toJson() {
+    public function toJson()
+    {
         return $this->data->toJson();
     }
 
-    public function toArray() {
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
         return $this->data->toArray();
     }
-
 }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -36,7 +37,7 @@ class GPM extends Iterator
 
     /**
      * Internal cache
-     * @var
+     * @var array
      */
     protected $cache;
 
@@ -48,11 +49,13 @@ class GPM extends Iterator
 
     /**
      * Creates a new GPM instance with Local and Remote packages available
-     * @param boolean $refresh Applies to Remote Packages only and forces a refetch of data
+     * @param bool $refresh Applies to Remote Packages only and forces a refetch of data
      * @param callable $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
+        parent::__construct();
+        $this->cache = [];
         $this->installed = new Local\Packages();
         try {
             $this->repository = new Remote\Packages($refresh, $callback);
@@ -94,7 +97,7 @@ class GPM extends Iterator
 
     /**
      * Returns the amount of locally installed packages
-     * @return integer Amount of installed packages
+     * @return int Amount of installed packages
      */
     public function countInstalled()
     {
@@ -144,7 +147,7 @@ class GPM extends Iterator
     /**
      * Checks if a Plugin is installed
      * @param  string $slug The slug of the Plugin
-     * @return boolean True if the Plugin has been installed. False otherwise
+     * @return bool True if the Plugin has been installed. False otherwise
      */
     public function isPluginInstalled($slug)
     {
@@ -178,7 +181,7 @@ class GPM extends Iterator
     /**
      * Checks if a Theme is installed
      * @param  string $slug The slug of the Theme
-     * @return boolean True if the Theme has been installed. False otherwise
+     * @return bool True if the Theme has been installed. False otherwise
      */
     public function isThemeInstalled($slug)
     {
@@ -187,7 +190,7 @@ class GPM extends Iterator
 
     /**
      * Returns the amount of updates available
-     * @return integer Amount of available updates
+     * @return int Amount of available updates
      */
     public function countUpdates()
     {
@@ -242,13 +245,12 @@ class GPM extends Iterator
                 continue;
             }
 
-            $local_version = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ?: 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
                 $repository[$slug]->available = $remote_version;
                 $repository[$slug]->version = $local_version;
-                $repository[$slug]->name = $repository[$slug]->name;
                 $repository[$slug]->type = $repository[$slug]->release_type;
                 $items[$slug] = $repository[$slug];
             }
@@ -262,7 +264,7 @@ class GPM extends Iterator
     /**
      * Get the latest release of a package from the GPM
      *
-     * @param $package_name
+     * @param string $package_name
      *
      * @return string|null
      */
@@ -285,7 +287,7 @@ class GPM extends Iterator
     /**
      * Check if a Plugin or Theme is updatable
      * @param  string $slug The slug of the package
-     * @return boolean True if updatable. False otherwise or if not found
+     * @return bool True if updatable. False otherwise or if not found
      */
     public function isUpdatable($slug)
     {
@@ -295,7 +297,7 @@ class GPM extends Iterator
     /**
      * Checks if a Plugin is updatable
      * @param  string $plugin The slug of the Plugin
-     * @return boolean True if the Plugin is updatable. False otherwise
+     * @return bool True if the Plugin is updatable. False otherwise
      */
     public function isPluginUpdatable($plugin)
     {
@@ -322,7 +324,7 @@ class GPM extends Iterator
                 continue;
             }
 
-            $local_version = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ?: 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
@@ -341,7 +343,7 @@ class GPM extends Iterator
     /**
      * Checks if a Theme is Updatable
      * @param  string $theme The slug of the Theme
-     * @return boolean True if the Theme is updatable. False otherwise
+     * @return bool True if the Theme is updatable. False otherwise
      */
     public function isThemeUpdatable($theme)
     {
@@ -351,7 +353,7 @@ class GPM extends Iterator
     /**
      * Get the release type of a package (stable / testing)
      *
-     * @param $package_name
+     * @param string $package_name
      *
      * @return string|null
      */
@@ -374,9 +376,9 @@ class GPM extends Iterator
     /**
      * Returns true if the package latest release is stable
      *
-     * @param $package_name
+     * @param string $package_name
      *
-     * @return boolean
+     * @return bool
      */
     public function isStableRelease($package_name)
     {
@@ -386,9 +388,9 @@ class GPM extends Iterator
     /**
      * Returns true if the package latest release is testing
      *
-     * @param $package_name
+     * @param string $package_name
      *
-     * @return boolean
+     * @return bool
      */
     public function isTestingRelease($package_name)
     {
@@ -503,8 +505,8 @@ class GPM extends Iterator
     /**
      * Download the zip package via the URL
      *
-     * @param $package_file
-     * @param $tmp
+     * @param string $package_file
+     * @param string $tmp
      * @return null|string
      */
     public static function downloadPackage($package_file, $tmp)
@@ -519,7 +521,7 @@ class GPM extends Iterator
         $output = Response::get($package_file, []);
 
         if ($output) {
-            Folder::mkdir($tmp);
+            Folder::create($tmp);
             file_put_contents($tmp . DS . $filename, $output);
             return $tmp . DS . $filename;
         }
@@ -530,8 +532,8 @@ class GPM extends Iterator
     /**
      * Copy the local zip package to tmp
      *
-     * @param $package_file
-     * @param $tmp
+     * @param string $package_file
+     * @param string $tmp
      * @return null|string
      */
     public static function copyPackage($package_file, $tmp)
@@ -540,7 +542,7 @@ class GPM extends Iterator
 
         if (file_exists($package_file)) {
             $filename = basename($package_file);
-            Folder::mkdir($tmp);
+            Folder::create($tmp);
             copy(realpath($package_file), $tmp . DS . $filename);
             return $tmp . DS . $filename;
         }
@@ -551,7 +553,7 @@ class GPM extends Iterator
     /**
      * Try to guess the package type from the source files
      *
-     * @param $source
+     * @param string $source
      * @return bool|string
      */
     public static function getPackageType($source)
@@ -564,44 +566,46 @@ class GPM extends Iterator
             file_exists($source . 'system/config/system.yaml')
         ) {
             return 'grav';
-        } else {
-            // must have a blueprint
-            if (!file_exists($source . 'blueprints.yaml')) {
-                return false;
-            }
+        }
 
-            // either theme or plugin
-            $name = basename($source);
-            if (Utils::contains($name, 'theme')) {
-                return 'theme';
-            } elseif (Utils::contains($name, 'plugin')) {
-                return 'plugin';
-            }
-            foreach (glob($source . "*.php") as $filename) {
-                $contents = file_get_contents($filename);
-                if (preg_match($theme_regex, $contents)) {
-                    return 'theme';
-                } elseif (preg_match($plugin_regex, $contents)) {
-                    return 'plugin';
-                }
-            }
+        // must have a blueprint
+        if (!file_exists($source . 'blueprints.yaml')) {
+            return false;
+        }
 
-            // Assume it's a theme
+        // either theme or plugin
+        $name = basename($source);
+        if (Utils::contains($name, 'theme')) {
             return 'theme';
         }
+        if (Utils::contains($name, 'plugin')) {
+            return 'plugin';
+        }
+        foreach (glob($source . '*.php') as $filename) {
+            $contents = file_get_contents($filename);
+            if (preg_match($theme_regex, $contents)) {
+                return 'theme';
+            }
+            if (preg_match($plugin_regex, $contents)) {
+                return 'plugin';
+            }
+        }
+
+        // Assume it's a theme
+        return 'theme';
     }
 
     /**
      * Try to guess the package name from the source files
      *
-     * @param $source
+     * @param string $source
      * @return bool|string
      */
     public static function getPackageName($source)
     {
         $ignore_yaml_files = ['blueprints', 'languages'];
 
-        foreach (glob($source . "*.yaml") as $filename) {
+        foreach (glob($source . '*.yaml') as $filename) {
             $name = strtolower(basename($filename, '.yaml'));
             if (in_array($name, $ignore_yaml_files)) {
                 continue;
@@ -614,7 +618,7 @@ class GPM extends Iterator
     /**
      * Find/Parse the blueprint file
      *
-     * @param $source
+     * @param string $source
      * @return array|bool
      */
     public static function getBlueprints($source)
@@ -634,15 +638,15 @@ class GPM extends Iterator
     /**
      * Get the install path for a name and a particular type of package
      *
-     * @param $type
-     * @param $name
+     * @param string $type
+     * @param string $name
      * @return string
      */
     public static function getInstallPath($type, $name)
     {
         $locator = Grav::instance()['locator'];
 
-        if ($type == 'theme') {
+        if ($type === 'theme') {
             $install_path = $locator->findResource('themes://', false) . DS . $name;
         } else {
             $install_path = $locator->findResource('plugins://', false) . DS . $name;
@@ -692,7 +696,7 @@ class GPM extends Iterator
                 }
 
                 $not_found = new \stdClass();
-                $not_found->name = $inflector->camelize($search);
+                $not_found->name = $inflector::camelize($search);
                 $not_found->slug = $search;
                 $not_found->package_type = $type;
                 $not_found->install_path = str_replace('%name%', $search, $this->install_paths[$type]);
@@ -726,7 +730,7 @@ class GPM extends Iterator
                         $dependency = $dependency['name'];
                     }
 
-                    if ($dependency == $slug) {
+                    if ($dependency === $slug) {
                         $dependent_packages[] = $package_name;
                     }
                 }
@@ -740,8 +744,8 @@ class GPM extends Iterator
     /**
      * Get the required version of a dependency of a package
      *
-     * @param $package_slug
-     * @param $dependency_slug
+     * @param string $package_slug
+     * @param string $dependency_slug
      *
      * @return mixed
      */
@@ -766,7 +770,7 @@ class GPM extends Iterator
      * @param array $ignore_packages_list
      *
      * @return bool
-     * @throws \Exception
+     * @throws \RuntimeException
      */
     public function checkNoOtherPackageNeedsThisDependencyInALowerVersion(
         $slug,
@@ -789,8 +793,8 @@ class GPM extends Iterator
                     $compatible = $this->checkNextSignificantReleasesAreCompatible($version,
                         $other_dependency_version);
                     if (!$compatible) {
-                        if (!in_array($dependent_package, $ignore_packages_list)) {
-                            throw new \Exception("Package <cyan>$slug</cyan> is required in an older version by package <cyan>$dependent_package</cyan>. This package needs a newer version, and because of this it cannot be installed. The <cyan>$dependent_package</cyan> package must be updated to use a newer release of <cyan>$slug</cyan>.",
+                        if (!in_array($dependent_package, $ignore_packages_list, true)) {
+                            throw new \RuntimeException("Package <cyan>$slug</cyan> is required in an older version by package <cyan>$dependent_package</cyan>. This package needs a newer version, and because of this it cannot be installed. The <cyan>$dependent_package</cyan> package must be updated to use a newer release of <cyan>$slug</cyan>.",
                                 2);
                         }
                     }
@@ -804,7 +808,7 @@ class GPM extends Iterator
     /**
      * Check the passed packages list can be updated
      *
-     * @param $packages_names_list
+     * @param array $packages_names_list
      *
      * @throws \Exception
      */
@@ -833,36 +837,36 @@ class GPM extends Iterator
     {
         $dependencies = $this->calculateMergedDependenciesOfPackages($packages);
         foreach ($dependencies as $dependency_slug => $dependencyVersionWithOperator) {
-            if (in_array($dependency_slug, $packages)) {
+            if (\in_array($dependency_slug, $packages, true)) {
                 unset($dependencies[$dependency_slug]);
                 continue;
             }
 
             // Check PHP version
-            if ($dependency_slug == 'php') {
+            if ($dependency_slug === 'php') {
                 $current_php_version = phpversion();
                 if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
                         $current_php_version) === 1
                 ) {
                     //Needs a Grav update first
-                    throw new \Exception("<red>One of the packages require PHP " . $dependencies['php'] . ". Please update PHP to resolve this");
-                } else {
-                    unset($dependencies[$dependency_slug]);
-                    continue;
+                    throw new \RuntimeException("<red>One of the packages require PHP {$dependencies['php']}. Please update PHP to resolve this");
                 }
+
+                unset($dependencies[$dependency_slug]);
+                continue;
             }
 
             //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
-            if ($dependency_slug == 'grav') {
+            if ($dependency_slug === 'grav') {
                 if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
                         GRAV_VERSION) === 1
                 ) {
                     //Needs a Grav update first
-                    throw new \Exception("<red>One of the packages require Grav " . $dependencies['grav'] . ". Please update Grav to the latest release.");
-                } else {
-                    unset($dependencies[$dependency_slug]);
-                    continue;
+                    throw new \RuntimeException("<red>One of the packages require Grav {$dependencies['grav']}. Please update Grav to the latest release.");
                 }
+
+                unset($dependencies[$dependency_slug]);
+                continue;
             }
 
             if ($this->isPluginInstalled($dependency_slug)) {
@@ -888,7 +892,7 @@ class GPM extends Iterator
                             $currentlyInstalledVersion);
 
                         if (!$compatible) {
-                            throw new \Exception('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the one installed. This package must be updated. Please get in touch with its developer.',
+                            throw new \RuntimeException('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the one installed. This package must be updated. Please get in touch with its developer.',
                                 2);
                         }
                     }
@@ -899,7 +903,7 @@ class GPM extends Iterator
 
                 if ($this->firstVersionIsLower($latestRelease, $dependencyVersion)) {
                     //throw an exception if a required version cannot be found in the GPM yet
-                    throw new \Exception('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
+                    throw new \RuntimeException('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
                         1);
                 }
 
@@ -950,7 +954,7 @@ class GPM extends Iterator
 
     private function firstVersionIsLower($firstVersion, $secondVersion)
     {
-        return version_compare($firstVersion, $secondVersion) == -1;
+        return version_compare($firstVersion, $secondVersion) === -1;
     }
 
     /**
@@ -1005,7 +1009,7 @@ class GPM extends Iterator
 
                         $current_package_version_number = $this->calculateVersionNumberFromDependencyVersion($current_package_version_information);
                         if (!$current_package_version_number) {
-                            throw new \Exception('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName,
+                            throw new \RuntimeException('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName,
                                 1);
                         }
 
@@ -1021,7 +1025,7 @@ class GPM extends Iterator
                             if (!$currently_stored_version_is_in_next_significant_release_format && !$current_package_version_is_in_next_significant_release_format) {
                                 //Comparing versions equals or higher, a simple version_compare is enough
                                 if (version_compare($currently_stored_version_number,
-                                        $current_package_version_number) == -1
+                                        $current_package_version_number) === -1
                                 ) { //Current package version is higher
                                     $dependencies[$current_package_name] = $current_package_version_information;
                                 }
@@ -1029,7 +1033,7 @@ class GPM extends Iterator
                                 $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number,
                                     $current_package_version_number);
                                 if (!$compatible) {
-                                    throw new \Exception('Dependency ' . $current_package_name . ' is required in two incompatible versions',
+                                    throw new \RuntimeException('Dependency ' . $current_package_name . ' is required in two incompatible versions',
                                         2);
                                 }
                             }
@@ -1076,17 +1080,20 @@ class GPM extends Iterator
      */
     public function calculateVersionNumberFromDependencyVersion($version)
     {
-        if ($version == '*') {
+        if ($version === '*') {
             return null;
-        } elseif ($version == '') {
-            return null;
-        } elseif ($this->versionFormatIsNextSignificantRelease($version)) {
-            return trim(substr($version, 1));
-        } elseif ($this->versionFormatIsEqualOrHigher($version)) {
-            return trim(substr($version, 2));
-        } else {
-            return $version;
         }
+        if ($version === '') {
+            return null;
+        }
+        if ($this->versionFormatIsNextSignificantRelease($version)) {
+            return trim(substr($version, 1));
+        }
+        if ($this->versionFormatIsEqualOrHigher($version)) {
+            return trim(substr($version, 2));
+        }
+
+        return $version;
     }
 
     /**
@@ -1094,13 +1101,13 @@ class GPM extends Iterator
      *
      * Example: returns true for $version: '~2.0'
      *
-     * @param $version
+     * @param string $version
      *
      * @return bool
      */
-    public function versionFormatIsNextSignificantRelease($version)
+    public function versionFormatIsNextSignificantRelease($version): bool
     {
-        return substr($version, 0, 1) == '~';
+        return strpos($version, '~') === 0;
     }
 
     /**
@@ -1108,13 +1115,13 @@ class GPM extends Iterator
      *
      * Example: returns true for $version: '>=2.0'
      *
-     * @param $version
+     * @param string $version
      *
      * @return bool
      */
-    public function versionFormatIsEqualOrHigher($version)
+    public function versionFormatIsEqualOrHigher($version): bool
     {
-        return substr($version, 0, 2) == '>=';
+        return strpos($version, '>=') === 0;
     }
 
     /**
@@ -1130,17 +1137,17 @@ class GPM extends Iterator
      *
      * @return bool
      */
-    public function checkNextSignificantReleasesAreCompatible($version1, $version2)
+    public function checkNextSignificantReleasesAreCompatible($version1, $version2): bool
     {
         $version1array = explode('.', $version1);
         $version2array = explode('.', $version2);
 
-        if (count($version1array) > count($version2array)) {
+        if (\count($version1array) > \count($version2array)) {
             list($version1array, $version2array) = [$version2array, $version1array];
         }
 
         $i = 0;
-        while ($i < count($version1array) - 1) {
+        while ($i < \count($version1array) - 1) {
             if ($version1array[$i] != $version2array[$i]) {
                 return false;
             }

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,23 +15,23 @@ use Grav\Common\Grav;
 class Installer
 {
     /** @const No error */
-    const OK = 0;
+    public const OK = 0;
     /** @const Target already exists */
-    const EXISTS = 1;
+    public const EXISTS = 1;
     /** @const Target is a symbolic link */
-    const IS_LINK = 2;
+    public const IS_LINK = 2;
     /** @const Target doesn't exist */
-    const NOT_FOUND = 4;
+    public const NOT_FOUND = 4;
     /** @const Target is not a directory */
-    const NOT_DIRECTORY = 8;
+    public const NOT_DIRECTORY = 8;
     /** @const Target is not a Grav instance */
-    const NOT_GRAV_ROOT = 16;
+    public const NOT_GRAV_ROOT = 16;
     /** @const Error while trying to open the ZIP package */
-    const ZIP_OPEN_ERROR = 32;
+    public const ZIP_OPEN_ERROR = 32;
     /** @const Error while trying to extract the ZIP package */
-    const ZIP_EXTRACT_ERROR = 64;
+    public const ZIP_EXTRACT_ERROR = 64;
     /** @const Invalid source file */
-    const INVALID_SOURCE = 128;
+    public const INVALID_SOURCE = 128;
 
     /**
      * Destination folder on which validation checks are applied
@@ -39,12 +40,12 @@ class Installer
     protected static $target;
 
     /**
-     * @var integer Error Code
+     * @var int Error Code
      */
     protected static $error = 0;
 
     /**
-     * @var integer Zip Error Code
+     * @var int Zip Error Code
      */
     protected static $error_zip = 0;
 
@@ -74,9 +75,10 @@ class Installer
      * @param  string $destination The local path to the Grav Instance
      * @param  array $options Options to use for installing. ie, ['install_path' => 'user/themes/antimatter']
      * @param  string $extracted The local path to the extacted ZIP package
+     * @param  bool $keepExtracted True if you want to keep the original files
      * @return bool True if everything went fine, False otherwise.
      */
-    public static function install($zip, $destination, $options = [], $extracted = null)
+    public static function install($zip, $destination, $options = [], $extracted = null, $keepExtracted = false)
     {
         $destination = rtrim($destination, DS);
         $options = array_merge(self::$options, $options);
@@ -88,15 +90,15 @@ class Installer
             return false;
         }
 
-        if (self::lastErrorCode() == self::IS_LINK && $options['ignore_symlinks'] ||
-            self::lastErrorCode() == self::EXISTS && !$options['overwrite']
+        if ((self::lastErrorCode() === self::IS_LINK && $options['ignore_symlinks']) ||
+            (self::lastErrorCode() === self::EXISTS && !$options['overwrite'])
         ) {
             return false;
         }
 
         // Create a tmp location
         $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
-        $tmp = $tmp_dir . '/Grav-' . uniqid();
+        $tmp = $tmp_dir . '/Grav-' . uniqid('', false);
 
         if (!$extracted) {
             $extracted = self::unZip($zip, $tmp);
@@ -111,7 +113,6 @@ class Installer
             return false;
         }
 
-
         $is_install = true;
         $installer = self::loadInstaller($extracted, $is_install);
 
@@ -140,7 +141,7 @@ class Installer
                 self::moveInstall($extracted, $install_path);
             }
         } else {
-            self::sophisticatedInstall($extracted, $install_path, $options['ignores']);
+            self::sophisticatedInstall($extracted, $install_path, $options['ignores'], $keepExtracted);
         }
 
         Folder::delete($tmp);
@@ -165,8 +166,8 @@ class Installer
     /**
      * Unzip a file to somewhere
      *
-     * @param $zip_file
-     * @param $destination
+     * @param string $zip_file
+     * @param string $destination
      * @return bool|string
      */
     public static function unZip($zip_file, $destination)
@@ -175,7 +176,7 @@ class Installer
         $archive = $zip->open($zip_file);
 
         if ($archive === true) {
-            Folder::mkdir($destination);
+            Folder::create($destination);
 
             $unzip = $zip->extractTo($destination);
 
@@ -189,9 +190,8 @@ class Installer
 
             $package_folder_name = preg_replace('#\./$#', '', $zip->getNameIndex(0));
             $zip->close();
-            $extracted_folder = $destination . '/' . $package_folder_name;
 
-            return $extracted_folder;
+            return $destination . '/' . $package_folder_name;
         }
 
         self::$error = self::ZIP_EXTRACT_ERROR;
@@ -216,7 +216,7 @@ class Installer
         $install_file = $installer_file_folder . DS . 'install.php';
 
         if (file_exists($install_file)) {
-            require_once($install_file);
+            require_once $install_file;
         } else {
             return null;
         }
@@ -253,8 +253,8 @@ class Installer
     }
 
     /**
-     * @param             $source_path
-     * @param             $install_path
+     * @param string            $source_path
+     * @param string            $install_path
      *
      * @return bool
      */
@@ -270,8 +270,8 @@ class Installer
     }
 
     /**
-     * @param             $source_path
-     * @param             $install_path
+     * @param string            $source_path
+     * @param string            $install_path
      *
      * @return bool
      */
@@ -279,24 +279,26 @@ class Installer
     {
         if (empty($source_path)) {
             throw new \RuntimeException("Directory $source_path is missing");
-        } else {
-            Folder::rcopy($source_path, $install_path);
         }
 
+        Folder::rcopy($source_path, $install_path);
+
         return true;
     }
 
     /**
-     * @param             $source_path
-     * @param             $install_path
+     * @param string            $source_path
+     * @param string            $install_path
+     * @param array             $ignores
+     * @param bool              $keep_source
      *
      * @return bool
      */
-    public static function sophisticatedInstall($source_path, $install_path, $ignores = [])
+    public static function sophisticatedInstall($source_path, $install_path, $ignores = [], $keep_source = false)
     {
         foreach (new \DirectoryIterator($source_path) as $file) {
 
-            if ($file->isLink() || $file->isDot() || in_array($file->getFilename(), $ignores)) {
+            if ($file->isLink() || $file->isDot() || \in_array($file->getFilename(), $ignores, true)) {
                 continue;
             }
 
@@ -304,7 +306,11 @@ class Installer
 
             if ($file->isDir()) {
                 Folder::delete($path);
-                Folder::move($file->getPathname(), $path);
+                if ($keep_source) {
+                    Folder::copy($file->getPathname(), $path);
+                } else {
+                    Folder::move($file->getPathname(), $path);
+                }
 
                 if ($file->getFilename() === 'bin') {
                     foreach (glob($path . DS . '*') as $bin_file) {
@@ -326,7 +332,7 @@ class Installer
      * @param  string $path    The slug of the package(s)
      * @param  array  $options Options to use for uninstalling
      *
-     * @return boolean True if everything went fine, False otherwise.
+     * @return bool True if everything went fine, False otherwise.
      */
     public static function uninstall($path, $options = [])
     {
@@ -368,7 +374,7 @@ class Installer
      * @param  string $destination The directory to run validations at
      * @param  array  $exclude     An array of constants to exclude from the validation
      *
-     * @return boolean True if validation passed. False otherwise
+     * @return bool True if validation passed. False otherwise
      */
     public static function isValidDestination($destination, $exclude = [])
     {
@@ -385,11 +391,11 @@ class Installer
             self::$error = self::NOT_DIRECTORY;
         }
 
-        if (count($exclude) && in_array(self::$error, $exclude)) {
+        if (\count($exclude) && \in_array(self::$error, $exclude, true)) {
             return true;
         }
 
-        return !(self::$error);
+        return !self::$error;
     }
 
     /**
@@ -397,7 +403,7 @@ class Installer
      *
      * @param  string $target The local path to the Grav Instance
      *
-     * @return boolean True if is a Grav Instance. False otherwise
+     * @return bool True if is a Grav Instance. False otherwise
      */
     public static function isGravInstance($target)
     {
@@ -469,23 +475,23 @@ class Installer
                 if (self::$error_zip) {
                     switch(self::$error_zip) {
                         case \ZipArchive::ER_EXISTS:
-                            $msg .= "File already exists.";
+                            $msg .= 'File already exists.';
                             break;
 
                         case \ZipArchive::ER_INCONS:
-                            $msg .= "Zip archive inconsistent.";
+                            $msg .= 'Zip archive inconsistent.';
                             break;
 
                         case \ZipArchive::ER_MEMORY:
-                            $msg .= "Malloc failure.";
+                            $msg .= 'Memory allocation failure.';
                             break;
 
                         case \ZipArchive::ER_NOENT:
-                            $msg .= "No such file.";
+                            $msg .= 'No such file.';
                             break;
 
                         case \ZipArchive::ER_NOZIP:
-                            $msg .= "Not a zip archive.";
+                            $msg .= 'Not a zip archive.';
                             break;
 
                         case \ZipArchive::ER_OPEN:
@@ -493,16 +499,20 @@ class Installer
                             break;
 
                         case \ZipArchive::ER_READ:
-                            $msg .= "Read error.";
+                            $msg .= 'Read error.';
                             break;
 
                         case \ZipArchive::ER_SEEK:
-                            $msg .= "Seek error.";
+                            $msg .= 'Seek error.';
                             break;
                     }
                 }
                 break;
 
+            case self::INVALID_SOURCE:
+                $msg = 'Invalid source file';
+                break;
+
             default:
                 $msg = 'Unknown Error';
                 break;
@@ -513,7 +523,7 @@ class Installer
 
     /**
      * Returns the last error code of the occurred error
-     * @return integer The code of the last error
+     * @return int|string The code of the last error
      */
     public static function lastErrorCode()
     {

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -32,22 +33,22 @@ class Licenses
     /**
      * Returns the license for a Premium package
      *
-     * @param $slug
-     * @param $license
+     * @param string $slug
+     * @param string $license
      *
-     * @return boolean
+     * @return bool
      */
     public static function set($slug, $license)
     {
         $licenses = self::getLicenseFile();
-        $data = $licenses->content();
+        $data = (array)$licenses->content();
         $slug = strtolower($slug);
 
         if ($license && !self::validate($license)) {
             return false;
         }
 
-        if (!is_string($license)) {
+        if (!\is_string($license)) {
             if (isset($data['licenses'][$slug])) {
                 unset($data['licenses'][$slug]);
             } else {
@@ -66,33 +67,29 @@ class Licenses
     /**
      * Returns the license for a Premium package
      *
-     * @param $slug
+     * @param string $slug
      *
-     * @return string
+     * @return array|string
      */
     public static function get($slug = null)
     {
         $licenses = self::getLicenseFile();
-        $data = $licenses->content();
+        $data = (array)$licenses->content();
         $licenses->free();
         $slug = strtolower($slug);
 
         if (!$slug) {
-            return isset($data['licenses']) ? $data['licenses'] : [];
+            return $data['licenses'] ?? [];
         }
 
-        if (!isset($data['licenses']) || !isset($data['licenses'][$slug])) {
-            return '';
-        }
-
-        return $data['licenses'][$slug];
+        return $data['licenses'][$slug] ?? '';
     }
 
 
     /**
      * Validates the License format
      *
-     * @param $license
+     * @param string $license
      *
      * @return bool
      */
@@ -106,7 +103,7 @@ class Licenses
     }
 
     /**
-     * Get's the License File object
+     * Get the License File object
      *
      * @return \RocketTheme\Toolbox\File\FileInterface
      */

system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,6 +15,8 @@ abstract class AbstractPackageCollection extends BaseCollection
 {
     public function __construct($items)
     {
+        parent::__construct();
+
         foreach ($items as $name => $data) {
             $data->set('slug', $name);
             $this->items[$name] = new Package($data, $this->type);

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -22,11 +23,11 @@ class Package extends BasePackage
 
         $this->settings = $package->toArray();
 
-        $html_description = \Parsedown::instance()->line($this->description);
-        $this->data->set('slug', $package->slug);
+        $html_description = \Parsedown::instance()->line($this->__get('description'));
+        $this->data->set('slug', $package->__get('slug'));
         $this->data->set('description_html', $html_description);
         $this->data->set('description_plain', strip_tags($html_description));
-        $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->slug));
+        $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->__get('slug')));
     }
 
     /**

system/src/Grav/Common/GPM/Local/Packages.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.GPM
+ * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */