Merge branch 'release/1.4.0'

.dependencies

@@ -11,9 +11,9 @@ git:
         url: https://github.com/getgrav/grav-plugin-markdown-notices
         path: user/plugins/markdown-notices
         branch: master
-    antimatter:
-        url: https://github.com/getgrav/grav-theme-antimatter
-        path: user/themes/antimatter
+    quark:
+        url: https://github.com/getgrav/grav-theme-quark
+        path: user/themes/quark
         branch: master
 links:
     problems:
@@ -28,7 +28,7 @@ links:
         src: grav-plugin-markdown-notices
         path: user/plugins/markdown-notices
         scm: github
-    antimatter:
-        src: grav-theme-antimatter
-        path: user/themes/antimatter
+    quark:
+        src: grav-theme-quark
+        path: user/themes/quark
         scm: github

.travis.yml

@@ -4,6 +4,7 @@ php:
   - '5.6'
   - '7.0.21'
   - '7.1'
+  - '7.2'
 branches:
   only:
     - develop

CHANGELOG.md

@@ -1,17 +1,76 @@
+# v1.4.0
+## 03/09/2018
+
+1. [](#new)
+    * Added `Grav\Framework\Uri` classes extending PSR-7 `HTTP message UriInterface` implementation
+    * Added `Grav\Framework\Route` classes to allow route/link manipulation
+    * Added `$grav['uri]->getCurrentUri()` method to get `Grav\Framework\Uri\Uri` instance for the current URL
+    * Added `$grav['uri]->getCurrentRoute()` method to get `Grav\Framework\Route\Route` instance for the current URL
+    * Added ability to have `php` version dependencies in GPM assets
+    * Added new `{% switch %}` twig tag for more elegant if statements
+    * Added new `{% markdown %}` twig tag
+    * Added **Route Overrides** to the default page blueprint
+    * Added new `Collection::toExtendedArray()` method that's particularly useful for Json output of data
+    * Added new `|yaml_encode` and `|yaml_decode` Twig filter to convert to and from YAML
+    * Added new `read_file()` Twig function to allow you to load and display a file in Twig (Supports streams and regular paths)
+    * Added a new `Medium::exists()` method to check for file existence
+    * Moved Twig `urlFunc()` to `Utils::url()` as its so darn handy
+    * Transferred overall copyright from RocketTheme, LLC, to Trilby Media LLC
+    * Added `theme_var`, `header_var` and `body_class` Twig functions for themes
+    * Added `Grav\Framework\Cache` classes providing PSR-16 `Simple Cache` implementation
+    * Added `Grav\Framework\ContentBlock` classes for nested HTML blocks with CSS/JS assets
+    * Added `Grav\Framework\Object` classes for creating collections of objects
+    * Added `|nicenumber` Twig filter
+    * Added `{% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %}` tag to allow basic exception handling inside Twig
+    * Added `{% script %}` and `{% style %}` tags for Twig templates
+    * Deprecated GravTrait
+1. [](#improved)
+    * Improved `Session` initialization
+    * Added ability to set a `theme_var()` option in page frontmatter
+    * Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`
+    * Better `Page.collection()` filtering support including ability to have non-published pages in collections
+    * Stopped Chrome from auto-completing admin user profile form [#1847](https://github.com/getgrav/grav/issues/1847)
+    * Support for empty `switch` field like a `checkbox`
+    * Made `modular` blueprint more flexible
+    * Code optimizations to `Utils` class [#1830](https://github.com/getgrav/grav/pull/1830)
+    * Objects: Add protected function `getElement()` to get serialized value for a single property
+    * `ObjectPropertyTrait`: Added protected functions `isPropertyLoaded()`, `offsetLoad()`, `offsetPrepare()` and `offsetSerialize()`    
+    * `Grav\Framework\Cache`: Allow unlimited TTL
+    * Optimizations & refactoring to the test suite [#1779](https://github.com/getgrav/grav/pull/1779)
+    * Slight modification of Whoops error colors
+    * Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin
+    * Vendor library updated to latest 
+    * Updated vendor libraries to latest versions
+    * Removed constructor from `ObjectInterface`
+    * Make it possible to include debug bar also into non-HTML responses
+    * Updated built-in JQuery to latest 3.3.1
+1. [](#bugfix) 
+    * Fixed issue with image alt tag always getting empted out unless set in markdown
+    * Fixed issue with remote PHP version determination for Grav updates [#1883](https://github.com/getgrav/grav/issues/1883)
+    * Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)
+    * Properly validate YAML blueprint fields so admin can save as proper YAML now  [addresses many issues]   
+    * Fixed OpenGraph metatags so only Twitter uses `name=`, and all others use `property=` [#1849](https://github.com/getgrav/grav/issues/1849)
+    * Fixed an issue with `evaluate()` and `evaluate_twig()` Twig functions that throws invalid template error
+    * Fixed issue with `|sort_by_key` twig filter if the input was null or not an array
+    * Date ordering should always be numeric [#1810](https://github.com/getgrav/grav/issues/1810)
+    * Fix for base paths containing special characters [#1799](https://github.com/getgrav/grav/issues/1799)
+    * Fix for session cookies in paths containing special characters
+    * Fix for `vundefined` error for version numbers in GPM [form#222](https://github.com/getgrav/grav-plugin-form/issues/222)
+    * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
+    * NOTE: Parsedown security release now escapes `&` to `&` in Markdown links
+
 # v1.3.10
 ## 12/06/2017
 
 1. [](#bugfix)
-    * Reverted GPM Local pull request as it broken admin [#1742](https://github.com/getgrav/grav/issues/1742) 
-
-1. [](#new)
+    * Reverted GPM Local pull request as it broken admin [#1742](https://github.com/getgrav/grav/issues/1742)
 
 # v1.3.9
 ## 12/05/2017
 
 1. [](#new)
     * Added new core Twig templates for `partials/metadata.html.twig` and `partials/messages.html.twig`
-    * Added ability to work with GPM locally [#1742](https://github.com/getgrav/grav/issues/1742) 
+    * Added ability to work with GPM locally [#1742](https://github.com/getgrav/grav/issues/1742)
     * Added new HTML5 audio controls [#1756](https://github.com/getgrav/grav/issues/1756)
     * Added `Medium::copy()` method to create a copy of a medium object
     * Added new `force_lowercase_urls` functionality on routes and slugs
@@ -35,15 +94,15 @@
     * Fixed token creation issue with `Uri` params like `/id:3`
     * Fixed CSS Pipeline failing with Google remote fonts if the file was minified [#1261](https://github.com/getgrav/grav-plugin-admin/issues/1261)
     * Forced `field.multiple: true` to allow use of min/max options in `checkboxes.validate`
-    
+
 # v1.3.8
 ## 10/26/2017
 
 1. [](#new)
     * Added Page `media_order` capability to manually order page media via a page header
 1. [](#bugfix)
-    * Fixed GPM update issue with filtered slugs [#1711](https://github.com/getgrav/grav/issues/1711)   
-    * Fixed issue with missing image file not throwing 404 properly [#1713](https://github.com/getgrav/grav/issues/1713) 
+    * Fixed GPM update issue with filtered slugs [#1711](https://github.com/getgrav/grav/issues/1711)
+    * Fixed issue with missing image file not throwing 404 properly [#1713](https://github.com/getgrav/grav/issues/1713)
 
 # v1.3.7
 ## 10/18/2017
@@ -59,20 +118,20 @@
 1. [](#bugfix)
     * Regression: Ajax error in Nginx [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
     * Remove the `_url=$uri` portion of the the Nginx `try_files` command [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
-    
+
 # v1.3.5
 ## 10/11/2017
 
 1. [](#improved)
     * Refactored `URI` class with numerous bug fixes, and optimizations
     * Override `system.media.upload_limit` with PHP's `post_max_size` or `upload_max_filesize`
-    * Updated `bin/grav clean` command to remove unnecessary vendor files (save some bytes) 
+    * Updated `bin/grav clean` command to remove unnecessary vendor files (save some bytes)
     * Added a `http_status_code` Twig function to allow setting HTTP status codes from Twig directly.
     * Deter XSS attacks via URI path/uri methods (credit:newbthenewbd)
     * Added support for `$uri->toArray()` and `(string)$uri`
     * Added support for `type` on `Asstes::addInlineJs()` [#1683](https://github.com/getgrav/grav/pull/1683)
 1. [](#bugfix)
-    * Fixed method signature error with `GPM\InstallCommand::processPackage()` [#1682](https://github.com/getgrav/grav/pull/1682)   
+    * Fixed method signature error with `GPM\InstallCommand::processPackage()` [#1682](https://github.com/getgrav/grav/pull/1682)
 
 # v1.3.4
 ## 09/29/2017
@@ -86,7 +145,7 @@
     * Improved support for Assets with query strings [#1451](https://github.com/getgrav/grav/issues/1451)
     * Twig extension cleanup
 1. [](#bugfix)
-    * Fixed an issue where fallback was not supporting dynamic page generation 
+    * Fixed an issue where fallback was not supporting dynamic page generation
     * Fixed issue with Image query string not being fully URL encoded [#1622](https://github.com/getgrav/grav/issues/1622)
     * Fixed `Page::summary()` when using delimiter and multibyte UTF8 Characters [#1644](https://github.com/getgrav/grav/issues/1644)
     * Fixed missing `.json` thumbnail throwing error when adding media [grav-plugin-admin#1156](https://github.com/getgrav/grav-plugin-admin/issues/1156)
@@ -129,7 +188,7 @@
     * Allow `session.timeout` field to be set to `0` via blueprints [#1598](https://github.com/getgrav/grav/issues/1598)
     * Fixed `Data::exists()` and `Data::raw()` functions breaking if `Data::file()` hasn't been called with non-null value
     * Fixed parent theme auto-loading in child themes of Gantry 5
-    
+
 # v1.3.1
 ## 07/19/2017
 

LICENSE.txt

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

composer.json

@@ -6,6 +6,7 @@
     "homepage": "http://getgrav.org",
     "license": "MIT",
     "require": {
+        "roave/security-advisories": "dev-master",
         "php": ">=5.5.9",
         "twig/twig": "~1.24",
         "erusev/parsedown": "~1.6",
@@ -15,15 +16,16 @@
         "symfony/event-dispatcher": "~2.8",
         "symfony/var-dumper": "~2.8",
         "symfony/polyfill-iconv": "~1.0",
-        "doctrine/cache": "1.6.*",
+        "doctrine/cache": "^1.6",
         "doctrine/collections": "1.3",
+        "psr/simple-cache": "^1.0",
         "filp/whoops": "~2.0",
         "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
         "gregwar/image": "2.*",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "~1.0",
+        "rockettheme/toolbox": "~1.3",
         "maximebf/debugbar": "~1.10",
         "ext-mbstring": "*",
         "ext-openssl": "*",
@@ -40,6 +42,11 @@
         "fzaninotto/faker": "^1.5",
         "victorjonsson/markdowndocs": "dev-master"
     },
+    "config": {
+        "platform": {
+            "php": "5.5.9"
+        }
+    },
     "repositories": [
         {
             "type": "vcs",

index.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,7 +17,7 @@ if (!is_file($autoload)) {
 
 if (PHP_SAPI == 'cli-server') {
     if (!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>");
+       die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
     }
 }
 

system/assets/whoops.css

@@ -1,5 +1,5 @@
 body header {
-    background: #8552A2;
+    background: #3085EE;
 }
 
 body .left-panel {

system/blueprints/pages/default.yaml

@@ -310,6 +310,31 @@ form:
                   toggleable: true
                   help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
 
+            routes_only:
+              type: section
+              title: PLUGIN_ADMIN.ROUTE_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.routes.default:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_DEFAULT
+
+                header.routes.canonical:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_CANONICAL
+
+                header.routes.aliases:
+                  type: array
+                  toggleable: true
+                  value_only: true
+                  size: large
+                  label: PLUGIN_ADMIN.ROUTE_ALIASES
+
+
             admin_only:
               type: section
               title: PLUGIN_ADMIN.ADMIN_SPECIFIC_OVERRIDES

system/blueprints/pages/modular.yaml

@@ -1,7 +1,5 @@
 title: PLUGIN_ADMIN.MODULAR
-@extends:
-    type: default
-    context: blueprints://pages
+'@extends': default
 
 form:
   fields:
@@ -13,35 +11,28 @@ form:
         content:
           fields:
 
+            modular_title:
+              type: spacer
+              title: Modular Setup
+
             header.content.items:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
-              options:
-                '@self.modular': Modular Children
+              size: medium
 
             header.content.order.by:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER_BY
-              default: date
-              options:
-                folder: PLUGIN_ADMIN.FOLDER
-                title: PLUGIN_ADMIN.TITLE
-                date: PLUGIN_ADMIN.DATE
-                default: PLUGIN_ADMIN.DEFAULT
+              placeholder: date
+              help:
+              size: small
 
             header.content.order.dir:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER
-              default: desc
-              options:
-                asc: PLUGIN_ADMIN.ASCENDING
-                desc: PLUGIN_ADMIN.DESCENDING
+              help: '"desc" or "asc" are valid values'
+              placeholder: desc
+              size: small
 
-            header.process:
-              type: ignore
-            content:
-              type: ignore
-            header.media_order:
-              type: ignore
 

system/blueprints/user/account.yaml

@@ -40,6 +40,7 @@ form:
                 type: password
                 size: large
                 label: PLUGIN_ADMIN.PASSWORD
+                autocomplete: new-password
                 validate:
                   required: false
                   message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE

system/config/system.yaml

@@ -25,7 +25,7 @@ home:
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  theme: antimatter                              # Default theme (defaults to "antimatter" theme)
+  theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
     dir: asc                                     # Default ordering direction, "asc" or "desc"
@@ -132,6 +132,7 @@ media:
 
 session:
   enabled: true                                  # Enable Session support
+  initialize: true                               # Initialize session from Grav (if false, plugin needs to start the session)
   timeout: 1800                                  # Timeout in seconds
   name: grav-site                                # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
   secure: false                                  # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS

system/defines.php

@@ -2,14 +2,14 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.3.10');
-//define('GRAV_TESTING', true);
+define('GRAV_VERSION', '1.4.0');
+define('GRAV_TESTING', false);
 define('DS', '/');
 
 if (!defined('GRAV_PHP_MIN')) {

system/router.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Assets.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -617,7 +617,7 @@ class Assets
 
         $inlineGroup = array_key_exists('loading', $attributes) && $attributes['loading'] === 'inline';
 
-        $attributes = $this->attributes(array_merge(['type' => 'text/javascript'], $attributes));
+        $attributes = $this->attributes($attributes);
 
         $output = '';
         $inline_js = '';

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Backup
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -32,7 +32,7 @@ class ZipBackup
     /**
      * Backup
      *
-     * @param null          $destination
+     * @param string|null   $destination
      * @param callable|null $messager
      *
      * @return null|string
@@ -107,18 +107,19 @@ class ZipBackup
      * @param $exclusiveLength
      * @param $messager
      */
-    private static function folderToZip($folder, \ZipArchive &$zipFile, $exclusiveLength, callable $messager = null)
+    private static function folderToZip($folder, \ZipArchive $zipFile, $exclusiveLength, callable $messager = null)
     {
         $handle = opendir($folder);
         while (false !== $f = readdir($handle)) {
-            if ($f != '.' && $f != '..') {
+            if ($f !== '.' && $f !== '..') {
                 $filePath = "$folder/$f";
                 // Remove prefix from file path before add to zip.
                 $localPath = substr($filePath, $exclusiveLength);
 
                 if (in_array($f, static::$ignoreFolders)) {
                     continue;
-                } elseif (in_array($localPath, static::$ignorePaths)) {
+                }
+                if (in_array($localPath, static::$ignorePaths)) {
                     $zipFile->addEmptyDir($f);
                     continue;
                 }

system/src/Grav/Common/Browser.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Cache.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -429,6 +429,14 @@ class Cache extends Getters
             $output[] = '';
         }
 
+        // Clear stat cache
+        @clearstatcache();
+
+        // Clear opcache
+        if (function_exists('opcache_reset')) {
+            @opcache_reset();
+        }
+
         return $output;
     }
 

system/src/Grav/Common/Composer.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 namespace Grav\Common\Config;
@@ -32,7 +32,7 @@ class CompiledBlueprints extends CompiledBase
      */
     public function checksum()
     {
-        if (!isset($this->checksum)) {
+        if (null === $this->checksum) {
             $this->checksum = md5(json_encode($this->files) . json_encode($this->getTypes()) . $this->version);
         }
 
@@ -92,6 +92,7 @@ class CompiledBlueprints extends CompiledBase
 
         // Convert file list into parent list.
         $list = [];
+        /** @var array $files */
         foreach ($this->files as $files) {
             foreach ($files as $name => $item) {
                 $list[$name][] = $this->path . $item['file'];

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -60,7 +60,7 @@ class CompiledLanguages extends CompiledBase
     {
         $file = CompiledYamlFile::instance($filename);
         if (preg_match('|languages\.yaml$|', $filename)) {
-            $this->object->mergeRecursive($file->content());
+            $this->object->mergeRecursive((array) $file->content());
         } else {
             $this->object->mergeRecursive([$name => $file->content()]);
         }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,6 +16,7 @@ use Grav\Common\Utils;
 
 class Config extends Data
 {
+    /** @var string */
     protected $checksum;
     protected $modified = false;
     protected $timestamp = 0;

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -133,7 +133,7 @@ class Setup extends Data
      */
     public function __construct($container)
     {
-        $environment = isset(static::$environment) ? static::$environment : ($container['uri']->environment() ?: 'localhost');
+        $environment = null !== static::$environment ? static::$environment : ($container['uri']->environment() ?: 'localhost');
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
@@ -151,11 +151,13 @@ class Setup extends Data
 
         // Set up environment.
         $this->def('environment', $environment ?: 'cli');
-        $this->def('streams.schemes.environment.prefixes', ['' => ($environment ? ["user://{$this->environment}"] : [])]);
+        $this->def('streams.schemes.environment.prefixes', ['' => $environment ? ["user://{$this->environment}"] : []]);
     }
 
     /**
      * @return $this
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
      */
     public function init()
     {
@@ -175,7 +177,7 @@ class Setup extends Data
             // Update streams.
             foreach (array_reverse($files) as $path) {
                 $file = CompiledYamlFile::instance($path);
-                $content = $file->content();
+                $content = (array)$file->content();
                 if (!empty($content['schemes'])) {
                     $this->items['streams']['schemes'] = $content['schemes'] + $this->items['streams']['schemes'];
                 }
@@ -196,6 +198,7 @@ class Setup extends Data
      * Initialize resource locator by using the configuration.
      *
      * @param UniformResourceLocator $locator
+     * @throws \BadMethodCallException
      */
     public function initializeLocator(UniformResourceLocator $locator)
     {
@@ -212,7 +215,7 @@ class Setup extends Data
             $force = isset($config['force']) ? $config['force'] : false;
 
             if (isset($config['prefixes'])) {
-                foreach ($config['prefixes'] as $prefix => $paths) {
+                foreach ((array)$config['prefixes'] as $prefix => $paths) {
                     $locator->addPath($scheme, $prefix, $paths, $override, $force);
                 }
             }
@@ -229,7 +232,7 @@ class Setup extends Data
         $schemes = [];
         foreach ((array) $this->get('streams.schemes') as $scheme => $config) {
             $type = !empty($config['type']) ? $config['type'] : 'ReadOnlyStream';
-            if ($type[0] != '\\') {
+            if ($type[0] !== '\\') {
                 $type = '\\RocketTheme\\Toolbox\\StreamWrapper\\' . $type;
             }
 
@@ -242,6 +245,8 @@ class Setup extends Data
     /**
      * @param UniformResourceLocator $locator
      * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \RuntimeException
      */
     protected function check(UniformResourceLocator $locator)
     {

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -78,7 +78,7 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
                 $messages += $this->validateArray($field, $val);
-            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+            } elseif (isset($rules['validation']) && $rules['validation'] === 'strict') {
                 // Undefined/extra item.
                 throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
             }
@@ -106,7 +106,7 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
                 $field = $this->filterArray($field, $val);
-            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+            } elseif (isset($rules['validation']) && $rules['validation'] === 'strict') {
                 $field = null;
             }
 
@@ -138,7 +138,7 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
                 if (isset($data[$name])) {
                     continue;
                 }
-                if ($field['type'] == 'file' && isset($data['data']['name'][$name])) { //handle case of file input fields required
+                if ($field['type'] === 'file' && isset($data['data']['name'][$name])) { //handle case of file input fields required
                     continue;
                 }
 
@@ -164,7 +164,7 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
         $default = isset($field[$property]) ? $field[$property] : null;
         $config = Grav::instance()['config']->get($value, $default);
 
-        if (!is_null($config)) {
+        if (null !== $config) {
             $field[$property] = $config;
         }
     }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -65,11 +65,11 @@ class Blueprints
 
             /** @var \DirectoryIterator $file */
             foreach ($iterator as $file) {
-                if (!$file->isFile() || '.' . $file->getExtension() != YAML_EXT) {
+                if (!$file->isFile() || '.' . $file->getExtension() !== YAML_EXT) {
                     continue;
                 }
                 $name = $file->getBasename(YAML_EXT);
-                $this->types[$name] = ucfirst(strtr($name, '_', ' '));
+                $this->types[$name] = ucfirst(str_replace('_', ' ', $name));
             }
         }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -233,6 +233,7 @@ class Data implements DataInterface, \ArrayAccess, \Countable, ExportInterface
 
     /**
      * Save data if storage has been defined.
+     * @throws \RuntimeException
      */
     public function save()
     {

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -33,7 +33,7 @@ class Validation
         $method = 'type'.strtr($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' && $value == false))) {
+        if ((empty($validate['required']) || (isset($validate['required']) && $validate['required'] !== true)) && ($value === null || $value === '' || (($field['type'] === 'checkbox' || $field['type'] === 'switch') && $value == false))) {
             return $messages;
         }
 
@@ -41,11 +41,6 @@ class Validation
             $field['type'] = 'text';
         }
 
-        // If this is a YAML field, stop validation
-        if (isset($field['yaml']) && $field['yaml'] === true) {
-            return $messages;
-        }
-
         // Get language class.
         $language = Grav::instance()['language'];
 
@@ -54,6 +49,12 @@ class Validation
             ? $language->translate($field['validate']['message'])
             : $language->translate('FORM.INVALID_INPUT', null, true) . ' "' . $language->translate($name) . '"';
 
+
+        // If this is a YAML field validate/filter as such
+        if ($type != 'yaml' && isset($field['yaml']) && $field['yaml'] === true) {
+            $method = 'typeYaml';
+        }
+
         if (method_exists(__CLASS__, $method)) {
             $success = self::$method($value, $validate, $field);
         } else {
@@ -100,15 +101,16 @@ class Validation
             $field['type'] = 'text';
         }
 
-        // If this is a YAML field, simply parse it and return the value.
-        if (isset($field['yaml']) && $field['yaml'] === true) {
-            return $value;
-        }
 
         // Validate type with fallback type text.
         $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
         $method = 'filter' . ucfirst(strtr($type, '-', '_'));
 
+        // If this is a YAML field validate/filter as such
+        if ($type != 'yaml' && isset($field['yaml']) && $field['yaml'] === true) {
+            $method = 'filterYaml';
+        }
+
         if (!method_exists(__CLASS__, $method)) {
             $method = 'filterText';
         }
@@ -639,22 +641,16 @@ class Validation
         return (array) $value;
     }
 
-    public static function typeYaml($value, $params)
-    {
-        try {
-            Yaml::parse($value);
-            return true;
-        } catch (ParseException $e) {
-            return false;
-        }
-    }
-
     public static function filterYaml($value, $params)
     {
         try {
-            return (array) Yaml::parse($value);
+            if (is_string($value)) {
+                return (array) Yaml::parse($value);
+            } else {
+                return $value;
+            }
         } catch (ParseException $e) {
-            return null;
+            return $value;
         }
     }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Debugger.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -36,6 +36,9 @@ class Debugger
      */
     public function __construct()
     {
+        // Enable debugger until $this->init() gets called.
+        $this->enabled = true;
+
         $this->debugbar = new StandardDebugBar();
         $this->debugbar['time']->addMeasure('Loading', $this->debugbar['time']->getRequestStartTime(), microtime(true));
     }
@@ -51,6 +54,9 @@ class Debugger
         $this->grav = Grav::instance();
         $this->config = $this->grav['config'];
 
+        // Enable/disable debugger based on configuration.
+        $this->enabled = $this->config->get('system.debugger.enabled');
+
         if ($this->enabled()) {
             $this->debugbar->addCollector(new ConfigCollector((array)$this->config->get('system'), 'Config'));
             $this->debugbar->addCollector(new ConfigCollector((array)$this->config->get('plugins'), 'Plugins'));
@@ -68,12 +74,8 @@ class Debugger
      */
     public function enabled($state = null)
     {
-        if (isset($state)) {
+        if ($state !== null) {
             $this->enabled = $state;
-        } else {
-            if (!isset($this->enabled)) {
-                $this->enabled = $this->config->get('system.debugger.enabled');
-            }
         }
 
         return $this->enabled;
@@ -90,8 +92,7 @@ class Debugger
 
             // Only add assets if Page is HTML
             $page = $this->grav['page'];
-            if ($page->templateFormat() != 'html') {
-                $this->enabled = false;
+            if ($page->templateFormat() !== 'html') {
                 return $this;
             }
 
@@ -106,13 +107,13 @@ class Debugger
 
             // Get the required CSS files
             list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL);
-            foreach ($css_files as $css) {
+            foreach ((array)$css_files as $css) {
                 $assets->addCss($css);
             }
 
             $assets->addCss('/system/assets/debugger.css');
 
-            foreach ($js_files as $js) {
+            foreach ((array)$js_files as $js) {
                 $assets->addJs($js);
             }
         }
@@ -163,6 +164,12 @@ class Debugger
     public function render()
     {
         if ($this->enabled()) {
+            // Only add assets if Page is HTML
+            $page = $this->grav['page'];
+            if (!$this->renderer || $page->templateFormat() !== 'html') {
+                return $this;
+            }
+
             echo $this->renderer->render();
         }
 
@@ -176,11 +183,29 @@ class Debugger
      */
     public function sendDataInHeaders()
     {
-        $this->debugbar->sendDataInHeaders();
+        if ($this->enabled()) {
+            $this->debugbar->sendDataInHeaders();
+        }
 
         return $this;
     }
 
+    /**
+     * Returns collected debugger data.
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        if (!$this->enabled()) {
+            return null;
+        }
+
+        $this->timers = [];
+
+        return $this->debugbar->getData();
+    }
+
     /**
      * Start a timer with an associated name and description
      *
@@ -191,7 +216,7 @@ class Debugger
      */
     public function startTimer($name, $description = null)
     {
-        if ($name[0] == '_' || $this->config->get('system.debugger.enabled')) {
+        if ($name[0] === '_' || $this->enabled()) {
             $this->debugbar['time']->startMeasure($name, $description);
             $this->timers[] = $name;
         }
@@ -208,7 +233,7 @@ class Debugger
      */
     public function stopTimer($name)
     {
-        if (in_array($name, $this->timers) && ($name[0] == '_' || $this->config->get('system.debugger.enabled'))) {
+        if (in_array($name, $this->timers, true) && ($name[0] === '_' || $this->enabled())) {
             $this->debugbar['time']->stopMeasure($name);
         }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -57,6 +57,7 @@ class SimplePageHandler extends Handler
      * @param $resource
      *
      * @return string
+     * @throws \RuntimeException
      */
     protected function getResource($resource)
     {
@@ -80,8 +81,7 @@ class SimplePageHandler extends Handler
 
         // If we got this far, nothing was found.
         throw new \RuntimeException(
-            "Could not find resource '$resource' in any resource paths."
-            . "(searched: " . join(", ", $this->searchPaths). ")"
+            "Could not find resource '{$resource}' in any resource paths (searched: " . implode(', ', $this->searchPaths). ')'
         );
     }
 
@@ -89,7 +89,7 @@ class SimplePageHandler extends Handler
     {
         if (!is_dir($path)) {
             throw new \InvalidArgumentException(
-                "'$path' is not a valid directory"
+                "'{$path}' is not a valid directory"
             );
         }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.File
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -42,9 +42,9 @@ trait CompiledFile
                 // Load real file if cache isn't up to date (or is invalid).
                 if (
                     !isset($cache['@class'])
-                    || $cache['@class'] != $class
-                    || $cache['modified'] != $modified
-                    || $cache['filename'] != $this->filename
+                    || $cache['@class'] !== $class
+                    || $cache['modified'] !== $modified
+                    || $cache['filename'] !== $this->filename
                 ) {
                     // Attempt to lock the file for writing.
                     try {

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.File
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.File
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.File
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.FileSystem
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -108,8 +108,7 @@ abstract class Folder
             $files[] = $file->getPathname() . '?'. $file->getMTime();
         }
 
-        $hash = md5(serialize($files));
-        return $hash;
+        return md5(serialize($files));
     }
 
     /**
@@ -234,7 +233,7 @@ abstract class Folder
         /** @var \RecursiveDirectoryIterator $file */
         foreach ($iterator as $file) {
             // Ignore hidden files.
-            if ($file->getFilename()[0] == '.') {
+            if ($file->getFilename()[0] === '.') {
                 continue;
             }
             if (!$folders && $file->isDir()) {
@@ -339,7 +338,7 @@ abstract class Folder
         }
 
         // Don't do anything if the source is the same as the new target
-        if ($source == $target) {
+        if ($source === $target) {
             return;
         }
 
@@ -377,6 +376,7 @@ abstract class Folder
      * @param  string $target
      * @param  bool   $include_target
      * @return bool
+     * @throws \RuntimeException
      */
     public static function delete($target, $include_target = true)
     {
@@ -435,6 +435,7 @@ abstract class Folder
      * @param $dest
      *
      * @return bool
+     * @throws \RuntimeException
      */
     public static function rcopy($src, $dest)
     {
@@ -447,7 +448,7 @@ abstract class Folder
 
         // If the destination directory does not exist create it
         if (!is_dir($dest)) {
-            Folder::mkdir($dest);
+            static::mkdir($dest);
         }
 
         // Open the source directory to read in files
@@ -455,10 +456,10 @@ abstract class Folder
         /** @var \DirectoryIterator $f */
         foreach ($i as $f) {
             if ($f->isFile()) {
-                copy($f->getRealPath(), "$dest/" . $f->getFilename());
+                copy($f->getRealPath(), "{$dest}/" . $f->getFilename());
             } else {
                 if (!$f->isDot() && $f->isDir()) {
-                    static::rcopy($f->getRealPath(), "$dest/$f");
+                    static::rcopy($f->getRealPath(), "{$dest}/{$f}");
                 }
             }
         }
@@ -479,10 +480,10 @@ abstract class Folder
         }
 
         // Go through all items in filesystem and recursively remove everything.
-        $files = array_diff(scandir($folder), array('.', '..'));
+        $files = array_diff(scandir($folder, SCANDIR_SORT_NONE), array('.', '..'));
         foreach ($files as $file) {
             $path = "{$folder}/{$file}";
-            (is_dir($path)) ? self::doDelete($path) : @unlink($path);
+            is_dir($path) ? self::doDelete($path) : @unlink($path);
         }
 
         return $include_target ? @rmdir($folder) : true;

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.FileSystem
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -37,7 +37,7 @@ class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
         /** @var $current \SplFileInfo */
         $current = $this->current();
 
-        if ($current->isDir() && !in_array($current->getFilename(), $this::$folder_ignores)) {
+        if ($current->isDir() && !in_array($current->getFilename(), $this::$folder_ignores, true)) {
             return true;
         }
         return false;

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -719,8 +719,8 @@ class GPM extends Iterator
         foreach ($packages as $package_name => $package) {
             if (isset($package['dependencies'])) {
                 foreach ($package['dependencies'] as $dependency) {
-                    if (is_array($dependency)) {
-                        $dependency = array_keys($dependency)[0];
+                    if (is_array($dependency) && isset($dependency['name'])) {
+                        $dependency = $dependency['name'];
                     }
 
                     if ($dependency == $slug) {
@@ -835,6 +835,20 @@ class GPM extends Iterator
                 continue;
             }
 
+            // Check PHP version
+            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;
+                }
+            }
+
             //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
             if ($dependency_slug == 'grav') {
                 if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
@@ -1062,9 +1076,9 @@ class GPM extends Iterator
         } elseif ($version == '') {
             return null;
         } elseif ($this->versionFormatIsNextSignificantRelease($version)) {
-            return substr($version, 1);
+            return trim(substr($version, 1));
         } elseif ($this->versionFormatIsEqualOrHigher($version)) {
-            return substr($version, 2);
+            return trim(substr($version, 2));
         } else {
             return $version;
         }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -18,10 +18,12 @@ class GravCore extends AbstractPackageCollection
 
     private $version;
     private $date;
+    private $min_php;
 
     /**
      * @param bool $refresh
      * @param null $callback
+     * @throws \InvalidArgumentException
      */
     public function __construct($refresh = false, $callback = null)
     {
@@ -36,9 +38,10 @@ class GravCore extends AbstractPackageCollection
         $this->data    = json_decode($this->raw, true);
         $this->version = isset($this->data['version']) ? $this->data['version'] : '-';
         $this->date    = isset($this->data['date']) ? $this->data['date'] : '-';
+        $this->min_php = isset($this->data['min_php']) ? $this->data['min_php'] : null;
 
         if (isset($this->data['assets'])) {
-            foreach ($this->data['assets'] as $slug => $data) {
+            foreach ((array)$this->data['assets'] as $slug => $data) {
                 $this->items[$slug] = new Package($data);
             }
         }
@@ -68,10 +71,10 @@ class GravCore extends AbstractPackageCollection
         }
 
         $diffLog = [];
-        foreach ($this->data['changelog'] as $version => $changelog) {
+        foreach ((array)$this->data['changelog'] as $version => $changelog) {
             preg_match("/[\w-\.]+/", $version, $cleanVersion);
 
-            if (!$cleanVersion || version_compare($diff, $cleanVersion[0], ">=")) {
+            if (!$cleanVersion || version_compare($diff, $cleanVersion[0], '>=')) {
                 continue;
             }
 
@@ -91,6 +94,11 @@ class GravCore extends AbstractPackageCollection
         return $this->date;
     }
 
+    /**
+     * Determine if this version of Grav is eligible to be updated
+     *
+     * @return mixed
+     */
     public function isUpdatable()
     {
         return version_compare(GRAV_VERSION, $this->getVersion(), '<');
@@ -106,6 +114,25 @@ class GravCore extends AbstractPackageCollection
         return $this->version;
     }
 
+    /**
+     * Returns the minimum PHP version
+     *
+     * @return null|string
+     */
+    public function getMinPHPVersion()
+    {
+        // If non min set, assume current PHP version
+        if (is_null($this->min_php)) {
+            $this->min_php = phpversion();
+        }
+        return $this->min_php;
+    }
+
+    /**
+     * Is this installation symlinked?
+     *
+     * @return bool
+     */
     public function isSymlink()
     {
         return is_link(GRAV_ROOT . DS . 'index.php');

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.GPM
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -24,11 +24,14 @@ class Upgrader
      */
     private $remote;
 
+    private $min_php;
+
     /**
      * 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 callable $callback Either a function or callback in array notation
+     * @throws \InvalidArgumentException
      */
     public function __construct($refresh = false, $callback = null)
     {
@@ -88,17 +91,33 @@ class Upgrader
     }
 
     /**
+     * Make sure this meets minimum PHP requirements
+     *
      * @return bool
      */
     public function meetsRequirements()
     {
-        if (version_compare(PHP_VERSION, GRAV_PHP_MIN, '<')) {
+        $current_php_version = phpversion();
+        if (version_compare($current_php_version, $this->minPHPVersion(), '<')) {
             return false;
         }
 
         return true;
     }
 
+    /**
+     * Get minimum PHP version from remote
+     *
+     * @return null
+     */
+    public function minPHPVersion()
+    {
+        if (is_null($this->min_php)) {
+            $this->min_php = $this->remote->getMinPHPVersion();
+        }
+        return $this->min_php;
+    }
+
     /**
      * Checks if the currently installed Grav is upgradable to a newer version
      *

system/src/Grav/Common/Getters.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Grav.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,7 @@ use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Page\Page;
 use RocketTheme\Toolbox\DI\Container;
 use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\Event\EventDispatcher;
 
 class Grav extends Container
 {
@@ -38,8 +39,7 @@ class Grav extends Container
         'uri'                     => 'Grav\Common\Uri',
         'events'                  => 'RocketTheme\Toolbox\Event\EventDispatcher',
         'cache'                   => 'Grav\Common\Cache',
-        'session'                 => 'Grav\Common\Session',
-        'Grav\Common\Service\MessagesServiceProvider',
+        'Grav\Common\Service\SessionServiceProvider',
         'plugins'                 => 'Grav\Common\Plugins',
         'themes'                  => 'Grav\Common\Themes',
         'twig'                    => 'Grav\Common\Twig\Twig',
@@ -256,11 +256,6 @@ class Grav extends Container
             header('ETag: "' . md5($page->raw() . $page->modified()).'"');
         }
 
-        // Set debugger data in headers
-        if (!($format === null || $format == 'html')) {
-            $this['debugger']->enabled(false);
-        }
-
         // Set HTTP response code
         if (isset($this['page']->header()->http_response_code)) {
             http_response_code($this['page']->header()->http_response_code);
@@ -440,7 +435,7 @@ class Grav extends Container
      */
     public function fallbackUrl($path)
     {
-      	$this->fireEvent('onPageFallBackUrl');
+        $this->fireEvent('onPageFallBackUrl');
 
         /** @var Uri $uri */
         $uri = $this['uri'];
@@ -453,10 +448,11 @@ class Grav extends Container
         $supported_types = $config->get('media.types');
 
         // Check whitelist first, then ensure extension is a valid media type
-        if (!empty($fallback_types) && !in_array($uri_extension, $fallback_types)) {
-            return;
-        } elseif (!array_key_exists($uri_extension, $supported_types)) {
-            return;
+        if (!empty($fallback_types) && !\in_array($uri_extension, $fallback_types, true)) {
+            return false;
+        }
+        if (!array_key_exists($uri_extension, $supported_types)) {
+            return false;
         }
 
         $path_parts = pathinfo($path);

system/src/Grav/Common/GravTrait.php

@@ -2,12 +2,15 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+/**
+ * @deprecated 2.0
+ */
 trait GravTrait
 {
     protected static $grav;
@@ -21,7 +24,9 @@ trait GravTrait
             self::$grav = Grav::instance();
         }
 
+        $caller = self::$grav['debugger']->getCaller();
+        self::$grav['debugger']->addMessage("Deprecated GravTrait used in {$caller['file']}", 'deprecated');
+
         return self::$grav;
     }
 }
-

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Helpers
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -32,7 +32,7 @@ class Base32 {
      */
     public static function encode( $bytes ) {
         $i = 0; $index = 0; $digit = 0;
-        $base32 = "";
+        $base32 = '';
         $bytes_len = strlen($bytes);
         while( $i < $bytes_len ) {
             $currByte = ord($bytes{$i});
@@ -51,7 +51,7 @@ class Base32 {
             } else {
                 $digit = ($currByte >> (8 - ($index + 5))) & 0x1F;
                 $index = ($index + 5) % 8;
-                if( $index == 0 ) $i++;
+                if( $index === 0 ) $i++;
             }
             $base32 .= self::$base32Chars{$digit};
         }
@@ -96,7 +96,7 @@ class Base32 {
                 $bytes[$offset] |= $digit << (8 - $index);
             }
         }
-        $bites = "";
+        $bites = '';
         foreach( $bytes as $byte ) $bites .= chr($byte);
         return $bites;
     }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Helpers
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -56,7 +56,7 @@ class Excerpts
     public static function getExcerptFromHtml($html, $tag)
     {
         $doc = new \DOMDocument();
-        $doc->loadHtml($html);
+        $doc->loadHTML($html);
         $images = $doc->getElementsByTagName($tag);
         $excerpt = null;
 
@@ -142,9 +142,9 @@ class Excerpts
                 foreach ($actions as $attrib => $value) {
                     $key = $attrib;
 
-                    if (in_array($attrib, $valid_attributes)) {
+                    if (in_array($attrib, $valid_attributes, true)) {
                         // support both class and classes.
-                        if ($attrib == 'classes') {
+                        if ($attrib === 'classes') {
                             $attrib = 'class';
                         }
                         $excerpt['element']['attributes'][$attrib] = str_replace(',', ' ', $value);
@@ -211,8 +211,8 @@ class Excerpts
         } else {
             // File is also local if scheme is http(s) and host matches.
             $local_file = isset($url_parts['path'])
-                && (empty($url_parts['scheme']) || in_array($url_parts['scheme'], ['http', 'https']))
-                && (empty($url_parts['host']) || $url_parts['host'] == Grav::instance()['uri']->host());
+                && (empty($url_parts['scheme']) || in_array($url_parts['scheme'], ['http', 'https'], true))
+                && (empty($url_parts['host']) || $url_parts['host'] === Grav::instance()['uri']->host());
 
             if ($local_file) {
                 $filename = basename($url_parts['path']);
@@ -246,13 +246,14 @@ class Excerpts
 
             // Process operations
             $medium = static::processMediaActions($medium, $url_parts);
+            $element_excerpt = $excerpt['element']['attributes'];
 
-            $alt = isset($excerpt['element']['attributes']['alt']) ? $excerpt['element']['attributes']['alt'] : '';
-            $title = isset($excerpt['element']['attributes']['title']) ? $excerpt['element']['attributes']['title'] : '';
-            $class = isset($excerpt['element']['attributes']['class']) ? $excerpt['element']['attributes']['class'] : '';
-            $id = isset($excerpt['element']['attributes']['id']) ? $excerpt['element']['attributes']['id'] : '';
+            $alt = isset($element_excerpt['alt']) ? $element_excerpt['alt'] : '';
+            $title = isset($element_excerpt['title']) ? $element_excerpt['title'] : '';
+            $class = isset($element_excerpt['class']) ? $element_excerpt['class'] : '';
+            $id = isset($element_excerpt['id']) ? $element_excerpt['id'] : '';
 
-            $excerpt['element'] = $medium->parseDownElement($title, $alt, $class, $id, true);
+            $excerpt['element'] = $medium->parsedownElement($title, $alt, $class, $id, true);
 
         } else {
             // Not a current page media file, see if it needs converting to relative.

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

@@ -2,25 +2,30 @@
 /**
  * @package    Grav.Common.Helpers
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
 use Grav\Common\Grav;
+use SebastianBergmann\GlobalState\RuntimeException;
 
 class Exif
 {
     public $reader;
 
+    /**
+     * Exif constructor.
+     * @throws RuntimeException
+     */
     public function __construct()
     {
         if (Grav::instance()['config']->get('system.media.auto_metadata_exif')) {
             if (function_exists('exif_read_data') && class_exists('\PHPExif\Reader\Reader')) {
                 $this->reader = \PHPExif\Reader\Reader::factory(\PHPExif\Reader\Reader::TYPE_NATIVE);
             } else {
-                throw new \Exception('Please enable the Exif extension for PHP or disable Exif support in Grav system configuration');
+                throw new \RuntimeException('Please enable the Exif extension for PHP or disable Exif support in Grav system configuration');
             }
         }
     }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Helpers
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -34,7 +34,7 @@ class Truncator {
      * @param  string  $ellipsis String to use as ellipsis (if any).
      * @return string            Safe truncated HTML.
      */
-    public static function truncateWords($html, $limit = 0, $ellipsis = "")
+    public static function truncateWords($html, $limit = 0, $ellipsis = '')
     {
         if ($limit <= 0) {
             return $html;
@@ -94,7 +94,7 @@ class Truncator {
         $dom = self::htmlToDomDocument($html);
 
         // Grab the body of our DOM.
-        $body = $dom->getElementsByTagName("body")->item(0);
+        $body = $dom->getElementsByTagName('body')->item(0);
 
         // Iterate over letters.
         $letters = new DOMLettersIterator($body);
@@ -181,7 +181,7 @@ class Truncator {
     {
         $avoid = array('a', 'strong', 'em', 'h1', 'h2', 'h3', 'h4', 'h5'); //html tags to avoid appending the ellipsis to
 
-        if (in_array($domNode->parentNode->nodeName, $avoid) && $domNode->parentNode->parentNode !== null) {
+        if ($domNode->parentNode->parentNode !== null && in_array($domNode->parentNode->nodeName, $avoid, true)) {
             // Append as text node to parent instead
             $textNode = new DOMText($ellipsis);
 
@@ -204,7 +204,7 @@ class Truncator {
      * @return string
      */
     private static function innerHTML($element) {
-        $innerHTML = "";
+        $innerHTML = '';
         $children = $element->childNodes;
         foreach ($children as $child)
         {

system/src/Grav/Common/Inflector.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Iterator.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Language
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -174,23 +174,23 @@ class Language
 
         // if languages set
         if ($this->enabled()) {
-            // try setting from prefix of URL (/en/blah/blah)
+            // Try setting language from prefix of URL (/en/blah/blah).
             if (preg_match($regex, $uri, $matches)) {
                 $this->lang_in_url = true;
                 $this->active = $matches[2];
-                $uri = preg_replace("/\\" . $matches[1] . "/", '', $uri, 1);
+                $uri = preg_replace("/\\" . $matches[1] . '/', '', $uri, 1);
 
-                // store in session if different
-                if ($this->config->get('system.session.enabled', false)
+                // Store in session if language is different.
+                if (isset($this->grav['session']) && $this->grav['session']->started()
                     && $this->config->get('system.languages.session_store_active', true)
                     && $this->grav['session']->active_language != $this->active
                 ) {
                     $this->grav['session']->active_language = $this->active;
                 }
             } else {
-                // try getting from session, else no active
-                if ($this->config->get('system.session.enabled', false) &&
-                    $this->config->get('system.languages.session_store_active', true)) {
+                // Try getting language from the session, else no active.
+                if (isset($this->grav['session']) && $this->grav['session']->started()
+                    && $this->config->get('system.languages.session_store_active', true)) {
                     $this->active = $this->grav['session']->active_language ?: null;
                 }
                 // if still null, try from http_accept_language header
@@ -203,8 +203,8 @@ class Language
                         }
                     }
 
-                    // repeat if not found, try base language only - fixes Safari sending the language code always
-                    // with a locale (e.g. it-it or fr-fr)
+                    // Repeat if not found, try base language only - fixes Safari sending the language code always
+                    // with a locale (e.g. it-it or fr-fr).
                     foreach ($preferred as $lang) {
                         $lang = substr($lang, 0, 2);
                         if ($this->validate($lang)) {

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Language
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -157,14 +157,13 @@ class LanguageCodes
     {
         if (isset(static::$codes[$code])) {
             return static::get($code, 'nativeName');
-        } else {
-            if (preg_match('/[a-zA-Z]{2}-[a-zA-Z]{2}/', $code)) {
-                return static::get(substr($code, 0, 2), 'nativeName') . ' (' . substr($code, -2) . ')';
-            } else {
-                return $code;
-            }
-
         }
+
+        if (preg_match('/[a-zA-Z]{2}-[a-zA-Z]{2}/', $code)) {
+            return static::get(substr($code, 0, 2), 'nativeName') . ' (' . substr($code, -2) . ')';
+        }
+
+        return $code;
     }
 
     public static function getOrientation($code)
@@ -179,7 +178,7 @@ class LanguageCodes
 
     public static function isRtl($code)
     {
-        if (static::getOrientation($code) == 'rtl') {
+        if (static::getOrientation($code) === 'rtl') {
             return true;
         }
         return false;
@@ -192,7 +191,6 @@ class LanguageCodes
             if (isset(static::$codes[$key])) {
                 $results[$key] = static::$codes[$key];
             }
-
         }
         return $results;
     }
@@ -201,8 +199,8 @@ class LanguageCodes
     {
         if (isset(static::$codes[$code][$type])) {
             return static::$codes[$code][$type];
-        } else {
-            return false;
         }
+
+        return false;
     }
 }

system/src/Grav/Common/Markdown/Parsedown.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Markdown
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Markdown/ParsedownExtra.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Markdown
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,10 +17,12 @@ class ParsedownExtra extends \ParsedownExtra
      *
      * @param $page
      * @param $defaults
+     * @throws \Exception
      */
     public function __construct($page, $defaults)
     {
         parent::__construct();
+
         $this->init($page, $defaults);
     }
 }

system/src/Grav/Common/Markdown/ParsedownGravTrait.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Markdown
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -35,7 +35,7 @@ trait ParsedownGravTrait
         $grav = Grav::instance();
 
         $this->page = $page;
-        $this->BlockTypes['{'] [] = "TwigTag";
+        $this->BlockTypes['{'] [] = 'TwigTag';
         $this->special_chars = ['>' => 'gt', '<' => 'lt', '"' => 'quot'];
 
         if ($defaults === null) {
@@ -56,6 +56,9 @@ trait ParsedownGravTrait
      *
      * @param $type
      * @param $tag
+     * @param bool $continuable
+     * @param bool $completable
+     * @param $index
      */
     public function addBlockType($type, $tag, $continuable = false, $completable = false, $index = null)
     {
@@ -67,7 +70,7 @@ trait ParsedownGravTrait
             $block = &$this->BlockTypes[$type];
         }
 
-        if (!isset($index)) {
+        if (null === $index) {
             $block[] = $tag;
         } else {
             array_splice($block, $index, 0, [$tag]);
@@ -86,10 +89,11 @@ trait ParsedownGravTrait
      *
      * @param $type
      * @param $tag
+     * @param $index
      */
     public function addInlineType($type, $tag, $index = null)
     {
-        if (!isset($index) || !isset($this->InlineTypes[$type])) {
+        if (null === $index || !isset($this->InlineTypes[$type])) {
             $this->InlineTypes[$type] [] = $tag;
         } else {
             array_splice($this->InlineTypes[$type], $index, 0, [$tag]);
@@ -109,7 +113,7 @@ trait ParsedownGravTrait
      */
     protected function isBlockContinuable($Type)
     {
-        $continuable = in_array($Type, $this->continuable_blocks) || method_exists($this, 'block' . $Type . 'Continue');
+        $continuable = \in_array($Type, $this->continuable_blocks) || method_exists($this, 'block' . $Type . 'Continue');
 
         return $continuable;
     }
@@ -123,7 +127,7 @@ trait ParsedownGravTrait
      */
     protected function isBlockCompletable($Type)
     {
-        $completable = in_array($Type, $this->completable_blocks) || method_exists($this, 'block' . $Type . 'Complete');
+        $completable = \in_array($Type, $this->completable_blocks) || method_exists($this, 'block' . $Type . 'Complete');
 
         return $completable;
     }
@@ -157,32 +161,31 @@ trait ParsedownGravTrait
 
     /**
      * Ensure Twig tags are treated as block level items with no <p></p> tags
+     *
+     * @param array $line
+     * @return array|null
      */
-    protected function blockTwigTag($Line)
+    protected function blockTwigTag($line)
     {
-        if (preg_match('/(?:{{|{%|{#)(.*)(?:}}|%}|#})/', $Line['body'], $matches)) {
-            $Block = [
-                'markup' => $Line['body'],
-            ];
-
-            return $Block;
+        if (preg_match('/(?:{{|{%|{#)(.*)(?:}}|%}|#})/', $line['body'], $matches)) {
+            return ['markup' => $line['body']];
         }
 
         return null;
     }
 
-    protected function inlineSpecialCharacter($Excerpt)
+    protected function inlineSpecialCharacter($excerpt)
     {
-        if ($Excerpt['text'][0] === '&' && !preg_match('/^&#?\w+;/', $Excerpt['text'])) {
+        if ($excerpt['text'][0] === '&' && !preg_match('/^&#?\w+;/', $excerpt['text'])) {
             return [
                 'markup' => '&amp;',
                 'extent' => 1,
             ];
         }
 
-        if (isset($this->special_chars[$Excerpt['text'][0]])) {
+        if (isset($this->special_chars[$excerpt['text'][0]])) {
             return [
-                'markup' => '&' . $this->special_chars[$Excerpt['text'][0]] . ';',
+                'markup' => '&' . $this->special_chars[$excerpt['text'][0]] . ';',
                 'extent' => 1,
             ];
         }
@@ -199,11 +202,11 @@ trait ParsedownGravTrait
             $excerpt['extent'] = $excerpt['extent'] + strlen($matches[1]) - 1;
 
             return $excerpt;
-        } else {
-            $excerpt['type'] = 'image';
-            $excerpt = parent::inlineImage($excerpt);
         }
 
+        $excerpt['type'] = 'image';
+        $excerpt = parent::inlineImage($excerpt);
+
         // if this is an image process it
         if (isset($excerpt['element']['attributes']['src'])) {
             $excerpt = Excerpts::processImageExcerpt($excerpt, $this->page);
@@ -228,10 +231,10 @@ trait ParsedownGravTrait
             $excerpt['extent'] = $excerpt['extent'] + strlen($matches[1]) - 1;
 
             return $excerpt;
-        } else {
-            $excerpt = parent::inlineLink($excerpt);
         }
 
+        $excerpt = parent::inlineLink($excerpt);
+
         // if this is a link
         if (isset($excerpt['element']['attributes']['href'])) {
             $excerpt = Excerpts::processLinkExcerpt($excerpt, $this->page, $type);
@@ -243,10 +246,10 @@ trait ParsedownGravTrait
     // For extending this class via plugins
     public function __call($method, $args)
     {
-        if (isset($this->$method) === true) {
-            $func = $this->$method;
+        if (isset($this->{$method}) === true) {
+            $func = $this->{$method};
 
-            return call_user_func_array($func, $args);
+            return  \call_user_func_array($func, $args);
         }
 
         return null;

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -610,4 +610,23 @@ class Collection extends Iterator
 
         return $this;
     }
+
+    /**
+     * Get the extended version of this Collection with each page keyed by route
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function toExtendedArray()
+    {
+        $items  = [];
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+
+            if ($page !== null) {
+                $items[$page->route()] = $page->toArray();
+            }
+        }
+        return $items;
+    }
 }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -92,6 +92,20 @@ class Medium extends Data implements RenderableInterface
         return new Data($this->items);
     }
 
+    /**
+     * Check if this medium exists or not
+     *
+     * @return bool
+     */
+    public function exists()
+    {
+        $path = $this->get('filepath');
+        if (file_exists($path)) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Returns an array containing just the metadata
      *
@@ -270,10 +284,14 @@ class Medium extends Data implements RenderableInterface
         }
 
         if (empty($attributes['alt'])) {
-            if (!empty($alt) || $alt === '') {
+            if (!empty($alt)) {
                 $attributes['alt'] = $alt;
             } elseif (!empty($this->items['alt'])) {
                 $attributes['alt'] = $this->items['alt'];
+            } elseif (!empty($this->items['alt_text'])) {
+                $attributes['alt'] = $this->items['alt_text'];
+            } else {
+                $attributes['alt'] = '';
             }
         }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -34,7 +34,7 @@ class MediumFactory
 
         $config = Grav::instance()['config'];
 
-        $media_params = $config->get("media.types.".strtolower($ext));
+        $media_params = $config->get("media.types." . strtolower($ext));
         if (!$media_params) {
             return null;
         }
@@ -106,7 +106,7 @@ class MediumFactory
      * @param  ImageMedium $medium
      * @param  int         $from
      * @param  int         $to
-     * @return Medium
+     * @return Medium|array
      */
     public static function scaledFromMedium($medium, $from, $to)
     {

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -123,8 +123,8 @@ class ThumbnailImageMedium extends ImageMedium
     {
         if (!$testLinked || $this->linked) {
             return $this->parent ? call_user_func_array(array($this->parent, $method), $arguments) : $this;
-        } else {
-            return call_user_func_array(array($this, 'parent::' . $method), $arguments);
         }
+
+        return call_user_func_array(array($this, 'parent::' . $method), $arguments);
     }
 }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -38,14 +38,12 @@ class VideoMedium extends Medium
      */
     public function controls($display = true)
     {
-        if($display)
-        {
+        if($display) {
             $this->attributes['controls'] = true;
-        }
-        else
-        {
+        } else {
             unset($this->attributes['controls']);
         }
+
         return $this;
     }
 
@@ -58,6 +56,7 @@ class VideoMedium extends Medium
     public function poster($urlImage)
     {
         $this->attributes['poster'] = $urlImage;
+
         return $this;
     }
 
@@ -69,14 +68,12 @@ class VideoMedium extends Medium
      */
     public function loop($status = false)
     {
-        if($status)
-        {
+        if($status) {
             $this->attributes['loop'] = true;
-        }
-        else
-        {
+        } else {
             unset($this->attributes['loop']);
         }
+
         return $this;
     }
 
@@ -88,14 +85,12 @@ class VideoMedium extends Medium
      */
     public function autoplay($status = false)
     {
-        if($status)
-        {
+        if($status) {
             $this->attributes['autoplay'] = true;
-        }
-        else
-        {
+        } else {
             unset($this->attributes['autoplay']);
         }
+
         return $this;
     }
 
@@ -109,6 +104,7 @@ class VideoMedium extends Medium
         parent::reset();
 
         $this->attributes['controls'] = true;
+
         return $this;
     }
 }

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -1109,7 +1109,7 @@ class Page
      */
     public function toYaml()
     {
-        return Yaml::dump($this->toArray(), 10);
+        return Yaml::dump($this->toArray(), 20);
     }
 
     /**
@@ -1525,12 +1525,13 @@ class Page
                             $separator = strpos($key, ':');
                             $hasSeparator = $separator && $separator < strlen($key) - 1;
                             $entry = [
-                                'name' => $key,
                                 'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
                             ];
 
-                            if ($hasSeparator) {
+                            if ($hasSeparator && !Utils::startsWith($key, 'twitter')) {
                                 $entry['property'] = $key;
+                            } else {
+                                $entry['name'] = $key;
                             }
 
                             $this->metadata[$key] = $entry;
@@ -2471,7 +2472,15 @@ class Page
             return new Collection();
         }
 
-        $collection = $this->evaluate($params['items']);
+        // See if require published filter is set and use that, if assume published=true
+        $only_published = true;
+        if (isset($params['filter']['published']) && $params['filter']['published']) {
+            $only_published = false;
+        } elseif (isset($params['filter']['non-published']) && $params['filter']['non-published']) {
+            $only_published = false;
+        }
+
+        $collection = $this->evaluate($params['items'], $only_published);
         if (!$collection instanceof Collection) {
             $collection = new Collection();
         }
@@ -2486,7 +2495,7 @@ class Page
 
         if ($process_taxonomy) {
             foreach ((array)$config->get('site.taxonomies') as $taxonomy) {
-                if ($uri->param($taxonomy)) {
+                if ($uri->param(rawurlencode($taxonomy))) {
                     $items = explode(',', $uri->param($taxonomy));
                     $collection->setParams(['taxonomies' => [$taxonomy => $items]]);
 
@@ -2510,25 +2519,60 @@ class Page
 
         // If  a filter or filters are set, filter the collection...
         if (isset($params['filter'])) {
+
+            // remove any inclusive sets from filer:
+            $sets = ['published', 'visible', 'modular', 'routable'];
+            foreach ($sets as $type) {
+                if (isset($params['filter'][$type]) && isset($params['filter']['non-'.$type])) {
+                    if ($params['filter'][$type] && $params['filter']['non-'.$type]) {
+                        unset ($params['filter'][$type]);
+                        unset ($params['filter']['non-'.$type]);
+                    }
+
+                }
+            }
+
             foreach ((array)$params['filter'] as $type => $filter) {
                 switch ($type) {
+                    case 'published':
+                        if ((bool) $filter) {
+                            $collection->published();
+                        }
+                        break;
+                    case 'non-published':
+                        if ((bool) $filter) {
+                            $collection->nonPublished();
+                        }
+                        break;
                     case 'visible':
-                        $collection->visible($filter);
+                        if ((bool) $filter) {
+                            $collection->visible();
+                        }
                         break;
                     case 'non-visible':
-                        $collection->nonVisible($filter);
+                        if ((bool) $filter) {
+                            $collection->nonVisible();
+                        }
                         break;
                     case 'modular':
-                        $collection->modular($filter);
+                        if ((bool) $filter) {
+                            $collection->modular();
+                        }
                         break;
                     case 'non-modular':
-                        $collection->nonModular($filter);
+                        if ((bool) $filter) {
+                            $collection->nonModular();
+                        }
                         break;
                     case 'routable':
-                        $collection->routable($filter);
+                        if ((bool) $filter) {
+                            $collection->routable();
+                        }
                         break;
                     case 'non-routable':
-                        $collection->nonRoutable($filter);
+                        if ((bool) $filter) {
+                            $collection->nonRoutable();
+                        }
                         break;
                     case 'type':
                         $collection->ofType($filter);
@@ -2589,11 +2633,11 @@ class Page
 
     /**
      * @param string|array $value
-     *
+     * @param bool $only_published
      * @return mixed
      * @internal
      */
-    public function evaluate($value)
+    public function evaluate($value, $only_published = true)
     {
         // Parse command.
         if (is_string($value)) {
@@ -2662,7 +2706,7 @@ class Page
                     }
                 }
 
-                $results = $results->published();
+
                 break;
 
             case 'page@':
@@ -2706,16 +2750,14 @@ class Page
                     $results = $page->children()->nonModular();
                 }
 
-                $results = $results->published();
-
                 break;
 
             case 'root@':
             case '@root':
                 if (!empty($parts) && $parts[0] === 'descendants') {
-                    $results = $pages->all($pages->root())->nonModular()->published();
+                    $results = $pages->all($pages->root())->nonModular();
                 } else {
-                    $results = $pages->root()->children()->nonModular()->published();
+                    $results = $pages->root()->children()->nonModular();
                 }
                 break;
 
@@ -2732,10 +2774,14 @@ class Page
                 if (!empty($parts)) {
                     $params = [implode('.', $parts) => $params];
                 }
-                $results = $taxonomy_map->findTaxonomy($params)->published();
+                $results = $taxonomy_map->findTaxonomy($params);
                 break;
         }
 
+        if ($only_published) {
+            $results = $results->published();
+        }
+
         return $results;
     }
 

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

@@ -2,7 +2,7 @@
 /**
  * @package    Grav.Common.Page
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -1203,19 +1203,19 @@ class Pages
                     break;
                 case 'date':
                     $list[$key] = $child->date();
-                    $sort_flags = SORT_REGULAR;
+                    $sort_flags = SORT_NUMERIC;
                     break;
                 case 'modified':
                     $list[$key] = $child->modified();
-                    $sort_flags = SORT_REGULAR;
+                    $sort_flags = SORT_NUMERIC;
                     break;
                 case 'publish_date':
                     $list[$key] = $child->publishDate();
-                    $sort_flags = SORT_REGULAR;
+                    $sort_flags = SORT_NUMERIC;
                     break;
                 case 'unpublish_date':
                     $list[$key] = $child->unpublishDate();
-                    $sort_flags = SORT_REGULAR;
+                    $sort_flags = SORT_NUMERIC;
                     break;
                 case 'slug':
                     $list[$key] = $child->slug();