MAGETWO-34991: Eliminate exceptions from the list Part2

Author: Dooffy

app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php

@@ -30,7 +30,7 @@ public function execute()
         try {
             $provider = $this->rssManager->getProvider($type);
         } catch (\InvalidArgumentException $e) {
-            throw new NotFoundException($e->getMessage());
+            throw new NotFoundException(__($e->getMessage()));
         }
 
         if (!$provider->isAllowed()) {

app/code/Magento/Rss/Controller/Feed/Index.php

@@ -30,7 +30,7 @@ public function execute()
         try {
             $provider = $this->rssManager->getProvider($type);
         } catch (\InvalidArgumentException $e) {
-            throw new NotFoundException($e->getMessage());
+            throw new NotFoundException(__($e->getMessage()));
         }
 
         if ($provider->isAuthRequired() && !$this->auth()) {

dev/tests/performance/framework/Magento/TestFramework/Performance/Bootstrap.php

@@ -60,7 +60,7 @@ public function cleanupReports()
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
             if (file_exists($reportDir)) {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __("Cannot cleanup reports directory '%1'.", $reportDir)
+                    new \Magento\Framework\Phrase("Cannot cleanup reports directory '%1'.", $reportDir)
                 );
             }
         }

dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php

@@ -45,7 +45,7 @@ public function getList($path)
     {
         $realPath = realpath($path);
         if (!(bool)$realPath) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('Invalid path: %1', $realPath));
+            throw new FileSystemException(new \Magento\Framework\Phrase('Invalid path: %1', $path));
         }
 
         $recursiveIterator = new \RecursiveIteratorIterator(

lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php

@@ -120,7 +120,7 @@ public function testDispatchedNotFoundException()
         $this->router->expects($this->at(0))
             ->method('match')
             ->with($this->request)
-            ->will($this->throwException(new NotFoundException(__('Page not found.'))));
+            ->willThrowException(new NotFoundException(new \Magento\Framework\Phrase('Page not found.')));
         $this->router->expects($this->at(1))
             ->method('match')
             ->with($this->request)