Oops, accidentally merged local 2.0 branch into develop, revert GravT…

…rait deprecation and add back new Framework classes
getgrav · May 10, 2017 · 6685dad · 6685dad
1 parent 08e0679
commit 6685dad
Show file tree

Hide file tree

Showing 21 changed files with 2,072 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v2.0.0-dev
+## mm/dd/2017
+
+1. [](#new)
+    * Added `Grav\Framework\ContentBlock` classes which add better support for nested HTML blocks with assets
+    * Added `Grav\Framework\Object` classes to support general objects and their collections
+    * Added `Grav\Framework\Page` interfaces 
+    * Deprecated GravTrait
+
 # v1.2.5
 ## mm/dd/2017
 

diff --git a/composer.lock b/composer.lock
diff --git a/system/src/Grav/Common/GravTrait.php b/system/src/Grav/Common/GravTrait.php
@@ -8,6 +8,9 @@
 
 namespace Grav\Common;
 
+/**
+ * @deprecated in Grav 2.0
+ */
 trait GravTrait
 {
     protected static $grav;
@@ -21,7 +24,9 @@ public static function getGrav()
             self::$grav = Grav::instance();
         }
 
+        $caller = self::$grav['debugger']->getCaller();
+        self::$grav['debugger']->addMessage("Deprecated GravTrait used in {$caller['file']}", 'deprecated');
+
         return self::$grav;
     }
 }
-