Merge branch 'hotfix-relocate-template-dir'

bradley-holt · Dec 24, 2011 · 3f076b1 · 3f076b1
2 parents 60e6098 + 9381b17
commit 3f076b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/Slim/Slim.php b/Slim/Slim.php
@@ -220,6 +220,14 @@ public function __construct( $userSettings = array() ) {
             $this->setName('default');
         }
 
+        // Setting template path
+        $templatesPath = $this->config('templates.path');
+        //Legacy support
+        if ( is_null($templatesPath) ) {
+            $templatesPath = $this->config('templates_dir');
+        }
+        $this->view->setTemplatesDirectory($templatesPath);
+
         //Set global Error handler after Slim app instantiated
         set_error_handler(array('Slim', 'handleErrors'));
     }
@@ -595,12 +603,6 @@ public function view( $viewClass = null ) {
      * @return  void
      */
     public function render( $template, $data = array(), $status = null ) {
-        $templatesPath = $this->config('templates.path');
-        //Legacy support
-        if ( is_null($templatesPath) ) {
-            $templatesPath = $this->config('templates_dir');
-        }
-        $this->view->setTemplatesDirectory($templatesPath);
         if ( !is_null($status) ) {
             $this->response->status($status);
         }

diff --git a/Slim/View.php b/Slim/View.php
@@ -129,9 +129,6 @@ public function getTemplatesDirectory() {
      * @throws  RuntimeException If directory is not a directory or does not exist
      */
     public function setTemplatesDirectory( $dir ) {
-        if ( !is_dir($dir) ) {
-            throw new RuntimeException('Cannot set View templates directory to: ' . $dir . '. Directory does not exist.');
-        }
         $this->templatesDirectory = rtrim($dir, '/');
     }
 

diff --git a/tests/ViewTest.php b/tests/ViewTest.php
@@ -131,20 +131,6 @@ public function testTemplatesDirectoryWithTrailingSlash() {
         $this->assertEquals(dirname(__FILE__) . '/templates', $this->view->getTemplatesDirectory());
     }
 
-    /**
-     * Test View throws Exception if templates directory does not exist
-     *
-     * Pre-conditions:
-     * View templates directory is set to a non-existent directory
-     *
-     * Post-conditions:
-     * A RuntimeException is thrown
-     */
-    public function testExceptionForInvalidTemplatesDirectory() {
-        $this->setExpectedException('RuntimeException');
-        $this->view->setTemplatesDirectory('./foo');
-    }
-
     /**
      * Test View renders template
      *