Merge a871dbd into 15ccff1

Cecilapp · Nov 27, 2017 · 8b064d8 · 8b064d8
2 parents 15ccff1 + a871dbd
commit 8b064d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Page/VariableTrait.php b/src/Page/VariableTrait.php
@@ -83,7 +83,7 @@ public function setVariable($name, $value)
                         }
                     }
                 } catch (\Exception $e) {
-                    throw new \Exception(sprintf("Expected date string"));
+                    throw new \Exception(sprintf('Expected date string'));
                 }
                 break;
             case 'draft':

diff --git a/src/Step/ConvertPages.php b/src/Step/ConvertPages.php
@@ -10,7 +10,6 @@
 
 use PHPoole\Collection\Page\Page;
 use PHPoole\Converter\Converter;
-use PHPoole\Exception\Exception;
 
 /**
  * Converts content of all pages.
@@ -33,6 +32,7 @@ public function internalProcess()
         foreach ($this->phpoole->getPages() as $page) {
             if (!$page->isVirtual()) {
                 $count++;
+
                 try {
                     $convertedPage = $this->convertPage($page, $this->phpoole->getConfig()->get('frontmatter.format'));
                     $message = $page->getName();
@@ -56,7 +56,7 @@ public function internalProcess()
         }
         if ($error > 0) {
             $message = '[ERROR] '.$message;
-            call_user_func_array($this->phpoole->getMessageCb(), ['CONVERT', 'ERROR', $message, $count-$error, $max]);
+            call_user_func_array($this->phpoole->getMessageCb(), ['CONVERT', 'ERROR', $message, $count - $error, $max]);
         }
     }
 
@@ -77,13 +77,15 @@ public function convertPage(Page $page, $format = 'yaml')
             $variables = Converter::convertFrontmatter($page->getFrontmatter(), $format);
         } catch (\Exception $e) {
             $message = sprintf("Unable to convert frontmatter of '%s': %s", $page->getId(), $e->getMessage());
+
             throw new \Exception($message);
         }
         // set variables
         try {
             $page->setVariables($variables);
         } catch (\Exception $e) {
             $message = sprintf("Unable to set variable in '%s': %s", $page->getId(), $e->getMessage());
+
             throw new \Exception($message);
         }