Throw ValidatorException with bad template in dev mode

Author: convenient

lib/internal/Magento/Framework/View/Element/Template.php

@@ -259,7 +259,11 @@ public function fetchView($fileName)
             $errorMessage = "Invalid template file: '{$templatePath}' in module: '{$this->getModuleName()}'"
                 . " block's name: '{$this->getNameInLayout()}'";
             if ($this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
-                throw new \InvalidArgumentException($errorMessage);
+                throw new \Magento\Framework\Exception\ValidatorException(
+                    new \Magento\Framework\Phrase(
+                        $errorMessage
+                    )
+                );
             }
             $this->_logger->critical($errorMessage);
         }

lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php

@@ -196,7 +196,7 @@ public function testFetchViewWithNoFileNameDeveloperMode()
             ->method('getMode')
             ->willReturn(\Magento\Framework\App\State::MODE_DEVELOPER);
 
-        $this->setExpectedException('\InvalidArgumentException', $exception);
+        $this->setExpectedException('\Magento\Framework\Exception\ValidatorException', $exception);
         $this->block->fetchView($template);
     }