Make use of built-in message template of MissingElementException

cakephp · Dec 12, 2016 · 1feaa49 · 1feaa49
1 parent 520926f
commit 1feaa49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/View/View.php b/src/View/View.php
@@ -505,9 +505,7 @@ public function element($name, array $data = [], array $options = [])
             list ($plugin, $name) = pluginSplit($name, true);
             $name = str_replace('/', DIRECTORY_SEPARATOR, $name);
             $file = $plugin . 'Element' . DIRECTORY_SEPARATOR . $name . $this->_ext;
-            throw new MissingElementException(
-                sprintf('Element file "%s" is missing', $file)
-            );
+            throw new MissingElementException([$file]);
         }
     }
 

diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -897,9 +897,10 @@ public function testPrefixElement()
     }
 
     /**
-     * Test elementInexistent method
+     * Test loading inexistent view element
      *
      * @expectedException \Cake\View\Exception\MissingElementException
+     * @expectedExceptionMessage Element file "Element\non_existent_element.ctp" is missing
      * @return void
      */
     public function testElementInexistent()
@@ -908,12 +909,13 @@ public function testElementInexistent()
     }
 
     /**
-     * Test elementInexistent3 method
+     * Test loading inexistent plugin view element
      *
      * @expectedException \Cake\View\Exception\MissingElementException
+     * @expectedExceptionMessage Element file "test_plugin.Element\plugin_element.ctp" is missing
      * @return void
      */
-    public function testElementInexistent3()
+    public function testElementInexistentPluginElement()
     {
         $this->View->element('test_plugin.plugin_element');
     }