From f978d32ae5bcc94fc5e3c3cf48e545660e064991 Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Thu, 29 Jan 2015 23:06:42 +0300 Subject: [PATCH 1/4] Update README.md --- README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e834116..a1ef66f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,20 @@ Data storage for Fenom ======= + +# Install + +Use composer: +```json +{ + "require": { + "fenom/storage": "1.*" + } +} +``` + # Setup -Add traits into your Fenom class: +Add trait into your Fenom class: ```php @@ -31,4 +43,4 @@ $fenom->resetVars(); $fenom->pipe($template_name, $callback); $fenom->fetch($template_name); $fenom->display($template_name); -``` \ No newline at end of file +``` From 826f5905f4a2f63e69099b84910662c734c50606 Mon Sep 17 00:00:00 2001 From: Anton Popov Date: Wed, 18 Feb 2015 08:40:31 +0500 Subject: [PATCH 2/4] Fix display() --- src/Fenom/StorageTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Fenom/StorageTrait.php b/src/Fenom/StorageTrait.php index f917476..729b9e9 100644 --- a/src/Fenom/StorageTrait.php +++ b/src/Fenom/StorageTrait.php @@ -121,7 +121,7 @@ public function resetVars() public function display($template, array $vars = array()) { /* @var \Fenom|StorageTrait $this */ - return $this->_vars = $this->getTemplate($template)->display($template, $vars ? $vars + $this->_vars : $this->_vars); + return $this->_vars = $this->getTemplate($template)->display($vars ? $vars + $this->_vars : $this->_vars); } /** @@ -154,4 +154,4 @@ public function pipe($template, $callback, array $vars = array(), $chunk = 1e6) ob_end_flush(); return $data; } -} \ No newline at end of file +} From a2ea5dd766df2e46fa22bdae5225a876178360a4 Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Tue, 2 Jun 2015 15:23:43 +0300 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a1ef66f..c068465 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add trait into your Fenom class: ```php class MyFenom extends Fenom { - use Fenom\Storage; + use Fenom\StorageTrait; } ``` From 321687230e571c5de22269497a3237e23dc46e0e Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Tue, 2 Jun 2015 15:24:08 +0300 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c068465..b3e5843 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Add trait into your Fenom class: ```php -class MyFenom extends Fenom { - use Fenom\StorageTrait; +class MyFenom extends \Fenom { + use \Fenom\StorageTrait; } ```