Merge branch '1.4' into develop

# Conflicts: # system/src/Grav/Common/Twig/TwigExtension.php # system/src/Grav/Common/Uri.php # tests/unit/Grav/Common/AssetsTest.php
getgrav · Mar 9, 2018 · 7aa930c · 7aa930c
2 parents eca23a9 + 7e1c6b6
commit 7aa930c
Show file tree

Hide file tree

Showing 213 changed files with 8,073 additions and 1,333 deletions.
diff --git a/.dependencies b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,95 @@
+# v1.4.0-rc.3
+## mm/dd/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
+1. [](#improved)
+    * Vendor library updated to latest  
+    * Improved `Session` initialization
+    * Added ability to set a `theme_var()` option in page frontmatter
+    * Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`
+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)
+
+# v1.4.0-rc.2
+## 02/15/2018
+
+1. [](#new)
+    * 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
+1. [](#improved)
+    * 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`
+1. [](#bugfix) 
+    * 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
+
+# v1.4.0-rc.1
+## 01/22/2018
+
+1. [](#new)
+    * Moved Twig `urlFunc()` to `Utils::url()` as its so darn handy
+1. [](#improved)
+    * 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
+    * Updated vendor libs to latest
+1. [](#bugfix)
+    * Date ordering should always be numeric [#1810](https://github.com/getgrav/grav/issues/1810)
+
+# v1.4.0-beta.3
+## 12/29/2017
+
+1. [](#bugfix)
+    * 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)
+1. [](#improved)
+    * Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin
+
+# v1.4.0-beta.2
+## 12/18/2017
+
+1. [](#new)
+    * Transferred overall copyright from RocketTheme, LLC, to Trilby Media LLC
+    * Added `theme_var`, `header_var` and `body_class` Twig functions for themes
+1. [](#improved)
+    * Updated vendor libraries to latest versions
+    * Removed constructor from `ObjectInterface`
+1. [](#bugfix)
+    * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
+
+# v1.4.0-beta.1
+## 12/11/2017
+
+1. [](#new)
+    * 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)
+    * Make it possible to include debug bar also into non-HTML responses
+
 # v1.3.11
 ## mm/dd/2017
 
@@ -10,14 +102,14 @@
 ## 12/06/2017
 
 1. [](#bugfix)
-    * Reverted GPM Local pull request as it broken admin [#1742](https://github.com/getgrav/grav/issues/1742) 
+    * 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
@@ -41,15 +133,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
@@ -65,20 +157,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
@@ -92,7 +184,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)
@@ -135,7 +227,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
 

diff --git a/backup/.gitkeep b/backup/.gitkeep
diff --git a/composer.json b/composer.json
@@ -16,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": "*",