From: Evan Coury <me@evancoury.com>
Date: Fri, 2 Mar 2012 21:33:02 +0000 (-0800)
Subject: Merge pull request #37 from gabriel403/master
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=aaaa2b62988e4b84e60288f60974ef9572ea0ff4;hp=20762032d6f0a465b462cc313e92f7919bd57414;p=zf2.biz%2Fgalerie.git

Merge pull request #37 from gabriel403/master

Removed error controller
---

diff --git a/module/Application/autoload_classmap.php b/module/Application/autoload_classmap.php
index acf5238..156e8bd 100644
--- a/module/Application/autoload_classmap.php
+++ b/module/Application/autoload_classmap.php
@@ -1,6 +1,5 @@
 <?php
 return array(
     'Application\Controller\IndexController' => __DIR__ . '/src/Application/Controller/IndexController.php',
-    'Application\Controller\ErrorController' => __DIR__ . '/src/Application/Controller/ErrorController.php',
     'Application\Module'                     => __DIR__ . '/Module.php',
 );
diff --git a/module/Application/src/Application/Controller/ErrorController.php b/module/Application/src/Application/Controller/ErrorController.php
deleted file mode 100644
index d959f98..0000000
--- a/module/Application/src/Application/Controller/ErrorController.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Application\Controller;
-
-use Zend\Mvc\Controller\ActionController,
-    Zend\View\Model\ViewModel;
-
-class ErrorController extends ActionController
-{
-    const ERROR_NO_ROUTE = 404;
-    const ERROR_NO_CONTROLLER = 404;
-
-    public function indexAction()
-    {
-        $error = $this->request->getMetadata('error', false);
-        if (!$error) {
-            $error = array(
-                'type'    => 404,
-                'message' => 'Page not found',
-            );
-        }
-        
-        switch ($error['type']) {
-            case self::ERROR_NO_ROUTE:
-            case self::ERROR_NO_CONTROLLER:
-            default:
-                // 404 error -- controller or action not found
-                $this->response->setStatusCode(404);
-                break;
-        }
-        
-        return new ViewModel(array('message' => $error['message']));
-    }
-}