From 041b8eedbe3632f2590d5a204e29606c04594967 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sat, 5 Oct 2013 21:24:20 +0200
Subject: [PATCH] Moved AbstractController to Bootstrap

---
 src/Bootstrap.php                      |  6 ++++++
 src/Controllers/AbstractController.php | 17 -----------------
 src/Controllers/AuthController.php     |  2 +-
 src/Controllers/CommentController.php  |  2 +-
 src/Controllers/IndexController.php    |  2 +-
 src/Controllers/PostController.php     |  2 +-
 src/Controllers/TagController.php      |  2 +-
 src/Controllers/UserController.php     |  2 +-
 8 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 src/Controllers/AbstractController.php

diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index b4dac46e..b89ccbdd 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -47,6 +47,12 @@ class Bootstrap
 		{
 			$workCallback();
 		}
+		catch (SimpleException $e)
+		{
+			$this->context->transport->errorMessage = rtrim($e->getMessage(), '.') . '.';
+			$this->context->transport->exception = $e;
+			$this->context->transport->success = false;
+		}
 		catch (Exception $e)
 		{
 			$this->context->exception = $e;
diff --git a/src/Controllers/AbstractController.php b/src/Controllers/AbstractController.php
deleted file mode 100644
index c0ebe266..00000000
--- a/src/Controllers/AbstractController.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-abstract class AbstractController
-{
-	public function workWrapper($workCallback)
-	{
-		try
-		{
-			$workCallback();
-		}
-		catch (SimpleException $e)
-		{
-			$this->context->transport->errorMessage = rtrim($e->getMessage(), '.') . '.';
-			$this->context->transport->exception = $e;
-			$this->context->transport->success = false;
-		}
-	}
-}
diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index cc0d9de5..5adf3700 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -1,5 +1,5 @@
 <?php
-class AuthController extends AbstractController
+class AuthController
 {
 	private static function hashPassword($pass, $salt2)
 	{
diff --git a/src/Controllers/CommentController.php b/src/Controllers/CommentController.php
index f239a641..b76c70e6 100644
--- a/src/Controllers/CommentController.php
+++ b/src/Controllers/CommentController.php
@@ -1,5 +1,5 @@
 <?php
-class CommentController extends AbstractController
+class CommentController
 {
 	/**
 	* @route /comments
diff --git a/src/Controllers/IndexController.php b/src/Controllers/IndexController.php
index e1c905a5..7aeb998a 100644
--- a/src/Controllers/IndexController.php
+++ b/src/Controllers/IndexController.php
@@ -1,5 +1,5 @@
 <?php
-class IndexController extends AbstractController
+class IndexController
 {
 	/**
 	* @route /
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index 44ed4c4b..78232405 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -1,5 +1,5 @@
 <?php
-class PostController extends AbstractController
+class PostController
 {
 	/**
 	* @route /posts
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
index 04024bd1..4072d010 100644
--- a/src/Controllers/TagController.php
+++ b/src/Controllers/TagController.php
@@ -1,5 +1,5 @@
 <?php
-class TagController extends AbstractController
+class TagController
 {
 	/**
 	* @route /tags
diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
index 394371f0..1d65c0aa 100644
--- a/src/Controllers/UserController.php
+++ b/src/Controllers/UserController.php
@@ -1,5 +1,5 @@
 <?php
-class UserController extends AbstractController
+class UserController
 {
 	/**
 	* @route /users