@@ -3,25 +3,21 @@

 /**

  * Class representing restaurant

  */

-class Restaurant

-{

+class Restaurant {

     private $url;

     private $name;

     private $xpaths = array();

-    public function getName()

-    {

+    public function getName() {

         return $this->name;

     }

-    public function getUrl()

-    {

+    public function getUrl() {

         return $this->url;

     }

-    public function getXpaths()

-    {

+    public function getXpaths() {

         return $this->xpaths;

     }

@@ -30,8 +26,7 @@ class Restaurant

      * @param $url

      * @param $xpaths

      */

-    function __construct($name, $url, $xpaths)

-    {

+    function __construct($name, $url, $xpaths) {

         if (empty($url) || empty($xpaths)) {

             throw new InvalidArgumentException("All argument are required");

@@ -51,13 +46,49 @@ class Restaurant

 }

+interface iOutput {

+    public function log($message);

+    public function display();

+}

+

+class Output implements iOutput {

+    protected $output = "";

+

+    public function log($message) {

+        $this->output .= $message;

+    }

+

+    public function display(){}

+}

+

+class HtmlOutput extends Output  {

+

+    public function display(){

+        echo $this->output;

+    }

+}

+

+class EmailOutput {

+

+    public function display(){

+        // Send mail

+    }

+}

+

 class Parser {

     private $restaurants = array();

+    private $logger;

+

+    function __construct($logger, $restaurants) {

+

+        // Check if logger implements iOutput interface

+        if (  !in_array("iOutput", class_implements($logger)) ) {

+            throw new InvalidArgumentException("Logger class must implement interface iOutput");

+        }

-    function __construct($restaurants)

-    {

+        $this->logger = $logger;

         if (empty($restaurants) || !is_array($restaurants)) {

             throw new InvalidArgumentException("Array argument required");

@@ -66,8 +97,7 @@ class Parser {

         $this->restaurants = $restaurants;

     }

-    public function parse()

-    {

+    public function parse() {

         foreach ($this->restaurants as $restaurant) {

             $source = file_get_contents($restaurant->getUrl());

@@ -80,7 +110,7 @@ class Parser {

             @$dom->loadHTML($source);

             $xpath_obj = new DOMXPath($dom);

-            echo("Restaurant: <a href='{$restaurant->getUrl()}'>" . $restaurant->getName() . "</a><br>\n");

+            $this->logger->log("Restaurant: <a href='{$restaurant->getUrl()}'>" . $restaurant->getName() . "</a><br>\n");

             foreach ($restaurant->getXpaths() as $name => $xpath) {

@@ -90,22 +120,22 @@ class Parser {

                     continue;

                 }

-                echo "<b>$name</b>";

+                $this->logger->log("<b>$name</b>");

                 $exists = false;

                 foreach ($found->item(0)->childNodes as $elem) {

                     $meal = trim($elem->nodeValue);

                     if (!empty($meal)) {

-                        echo("\t<br>$meal\n");

+                        $this->logger->log("\t<br>$meal\n");

                         $exists = true;

                     }

                 }

                 if (!$exists) {

-                    echo "<br>{}";

+                    $this->logger->log("<br>{}");

                 }

-                echo "<br>";

+                $this->logger->log("<br>");

             }

-            echo "<br>";

+            $this->logger->log("<br>");

         }

     }

@@ -121,8 +151,10 @@ $slovak = new Restaurant("Slovak pub", "http://www.arcaderestaurant.sk/articles/

         "Polievka" => '//*[@id="table2"]/tbody/tr[2]'));

-$parser = new Parser(array($twenties, $pulitzer, $slovak));

+$htmlOutput = new HtmlOutput();

+$parser = new Parser($htmlOutput, array($twenties, $pulitzer, $slovak));

 $parser->parse();

+$htmlOutput->display();

@@ -172,7 +204,7 @@ foreach ($sites as $restaurant => $site)

                 }

                 $found_meal = FALSE;

-                foreach ($oh_my_god_here_are_saved_meals->item(0)->childNodes as $elem)

+        foreach ($oh_my_god_here_are_saved_meals->item(0)->childNodes as $elem)

                 {

                         $meal_meal_meal = trim($elem->nodeValue);

                         if (! empty($meal_meal_meal))