Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Andy Miller
2017-12-15 15:13:29 -07:00
2 changed files with 3 additions and 6 deletions

View File

@@ -6,6 +6,7 @@
* Added `theme_var` and `body_class` Twig functions that are useful for themes
1. [](#improved)
* Updated vendor libraries to latest version
* Removed constructor from ObjectInterface
1. [](#bugfix)
* Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
@@ -26,6 +27,8 @@
# v1.3.11
## mm/dd/2017
1. [](#improved)
* Updated vendor libraries to latest
1. [](#bugfix)
* Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)

View File

@@ -14,12 +14,6 @@ namespace Grav\Framework\Object\Interfaces;
*/
interface ObjectInterface extends \Serializable, \JsonSerializable
{
/**
* @param array $elements
* @param string $key
*/
public function __construct(array $elements = [], $key = null);
/**
* @return string
*/