Merge remote-tracking branch 'origin/MAGETWO-37444' into UI

Author: Natalia Momotenko

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Oyejorge.php

@@ -12,16 +12,25 @@
  */
 class Oyejorge implements \Magento\Framework\Css\PreProcessor\AdapterInterface
 {
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
     /**
      * @var \Magento\Framework\App\State
      */
     protected $appState;
 
     /**
-     * @param \Magento\Framework\App\State $appState
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param State $appState
      */
-    public function __construct(State $appState)
-    {
+    public function __construct(
+        \Psr\Log\LoggerInterface $logger,
+        State $appState
+    ) {
+        $this->logger = $logger;
         $this->appState = $appState;
     }
 
@@ -32,8 +41,14 @@ public function __construct(State $appState)
     public function process($sourceFilePath)
     {
         $options = ['relativeUrls' => false, 'compress' => $this->appState->getMode() !== State::MODE_DEVELOPER];
-        $parser = new \Less_Parser($options);
-        $parser->parseFile($sourceFilePath, '');
-        return $parser->getCss();
+        try {
+            $parser = new \Less_Parser($options);
+            $parser->parseFile($sourceFilePath, '');
+            return $parser->getCss();
+        } catch (\Exception $e) {
+            $messagePrefix = 'CSS compilation from LESS ';
+            $this->logger->critical($messagePrefix . $e->getMessage());
+            return $messagePrefix . $e->getMessage();
+        }
     }
 }