diff --git a/composer.json b/composer.json
index 3786ef4..3341268 100644
--- a/composer.json
+++ b/composer.json
@@ -3,11 +3,10 @@
"preferred-install": "dist"
},
"require": {
- "fguillot/simple-validator": "v0.0.3",
+ "fguillot/simple-validator": "v1.0.0",
"fguillot/json-rpc": "v1.0.1",
"fguillot/picodb": "v1.0.1",
- "fguillot/picofeed": "v0.1.8",
- "fguillot/picofarad": "dev-master"
+ "fguillot/picofeed": "v0.1.9"
},
"require-dev": {
"phpunit/phpunit": "4.8.3",
@@ -18,6 +17,11 @@
"files": [
"lib/helpers.php",
"lib/Translator.php",
+ "lib/Request.php",
+ "lib/Response.php",
+ "lib/Router.php",
+ "lib/Session.php",
+ "lib/Template.php",
"models/config.php",
"models/service.php",
"models/user.php",
diff --git a/controllers/bookmark.php b/controllers/bookmark.php
index 4ea7cbd..d529fa5 100644
--- a/controllers/bookmark.php
+++ b/controllers/bookmark.php
@@ -1,9 +1,5 @@
- = \PicoFarad\Template\load('item', array(
+ = \Template\load('item', array(
'item' => $item,
'menu' => $menu,
'offset' => $offset,
@@ -23,7 +23,7 @@
)) ?>
- = \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
+ = \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
\ No newline at end of file
diff --git a/templates/feed_items.php b/templates/feed_items.php
index 7262594..ae71af3 100644
--- a/templates/feed_items.php
+++ b/templates/feed_items.php
@@ -27,7 +27,7 @@
- = \PicoFarad\Template\load('item', array(
+ = \Template\load('item', array(
'feed' => $feed,
'item' => $item,
'menu' => $menu,
@@ -43,7 +43,7 @@
= t('mark all as read') ?>
- = \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'feed_id' => $feed['id'])) ?>
+ = \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'feed_id' => $feed['id'])) ?>
\ No newline at end of file
diff --git a/templates/help.php b/templates/help.php
index df11896..68890a5 100644
--- a/templates/help.php
+++ b/templates/help.php
@@ -12,7 +12,7 @@
- = \PicoFarad\Template\load('keyboard_shortcuts') ?>
+ = \Template\load('keyboard_shortcuts') ?>
= t('Documentation') ?>
diff --git a/templates/history.php b/templates/history.php
index dc8de46..b8cbebe 100644
--- a/templates/history.php
+++ b/templates/history.php
@@ -15,7 +15,7 @@
- = \PicoFarad\Template\load('item', array(
+ = \Template\load('item', array(
'item' => $item,
'menu' => $menu,
'offset' => $offset,
@@ -26,7 +26,7 @@
)) ?>
- = \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
+ = \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
diff --git a/templates/item.php b/templates/item.php
index 318578b..c079e49 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -51,7 +51,7 @@
- = \PicoFarad\Template\load('bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset, 'source' => '')) ?>
- = \PicoFarad\Template\load('status_links', array('item' => $item, 'redirect' => $menu, 'offset' => $offset)) ?>
+ = \Template\load('bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset, 'source' => '')) ?>
+ = \Template\load('status_links', array('item' => $item, 'redirect' => $menu, 'offset' => $offset)) ?>
diff --git a/templates/show_help.php b/templates/show_help.php
index 4a82a2e..f37c9bb 100644
--- a/templates/show_help.php
+++ b/templates/show_help.php
@@ -12,7 +12,7 @@
= t('Help') ?>
- = \PicoFarad\Template\load('keyboard_shortcuts') ?>
+ = \Template\load('keyboard_shortcuts') ?>