Merge pull request #19 from JindrichPilar/master

Možnost vlastní třídy pro WS (via AbstractFactory)

Author: sinacek

src/SkautIS/Factory/BasicWSFactory.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace SkautIS\Factory;
+
+use SkautIS\Factory\WSFactory;
+use SkautIS\WS;
+
+/**
+ * @inheritdoc
+ */
+class BasicWSFactory extends WSFactory {
+
+	/**
+	 * @inheritdoc
+	 */
+	public function createWS($wsdl, array $init, $compression, $profiler) {
+		return new WS($wsdl, $init, $compression, $profiler);
+	}
+
+}

src/SkautIS/Factory/WSFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace SkautIS\Factory;
+
+use SkautIS\WS;
+
+/**
+ * Trida umoznujici pouziti vlastni tridy WS se tridou SkautIS
+ */
+abstract class WSFactory {
+
+	/**
+	 * Vytvor novy WS objekt
+	 *
+	 * @param string $wsdl        Odkaz na WSDL soubor
+	 * @param array  $init        Zakladni informace pro vsechny pozadavky
+	 * @param bool   $compression Ma pouzivat kompresi na prenasena data?
+	 * @param bool   $profiler    Ma ukladat data pro profilovani?
+	 *
+	 * @return WS;
+	 */
+	abstract public function createWS($wsdl, array $init, $compression, $profiler);
+}

src/SkautIS/Nette/Tracy/Panel.php

@@ -87,7 +87,7 @@ protected function prepareTrace(array $trace) {
         $s = '<a href="#"class="tracy-toggle tracy-collapsed">Trace</a><div class="tracy-collapsed">';
         $cnt = 0;
         foreach ($trace as $f) {
-            $s .= "" . ++$cnt . ". " . $f['function'] . " (" . $f['class'] . ($f['line'] !== NULL ? ": " . $f['line'] : "") . ")" . '<br />';
+            $s .= "" . ++$cnt . ". " . $f['function'] . " (" . $f['class'] . (array_key_exists("line", $f) ? ": " . $f['line'] : "") . ")" . '<br />';
         }
         return $s . "</div>";
     }

src/SkautIS/SkautIS.php

@@ -2,6 +2,8 @@
 
 namespace SkautIS;
 
+use SkautIS\Factory\WSFactory;
+use SkautIS\Factory\BasicWSFactory;
 use SkautIS\Exception\AbortException;
 use SkautIS\Exception\InvalidArgumentException;
 use SkautIS\Exception\WsdlException;
@@ -103,6 +105,11 @@ class SkautIS {
      */
     public $profiler;
 
+    /**
+     * @var WSFactory
+     */
+    protected $wsFactory = NULL;
+
 // </editor-fold>
 // <editor-fold defaultstate="collapsed" desc="getters & setters">
 
@@ -201,6 +208,10 @@ public function setStorage(&$storage, $leaveValues = false) {
     private function __construct() {
         $this->perStorage = &$_SESSION["__" . __CLASS__]; //defaultni persistentní uloziste
 
+        if ($this->wsFactory === NULL) {
+            $this->wsFactory = new BasicWSFactory();
+        }
+
         if (defined("SkautIS_ID_Application")) {
             $this->setAppId(SkautIS_ID_Application);
         }
@@ -215,7 +226,7 @@ private function __construct() {
      * @return SkautIS
      * @throws InvalidArgumentException
      */
-    public static function getInstance($appId = NULL, $testMode = FALSE, $profiler = FALSE) {
+    public static function getInstance($appId = NULL, $testMode = FALSE, $profiler = FALSE, $wsFactory = NULL) {
         if (!is_bool($testMode)) {
             throw new InvalidArgumentException('Argument $testMode ma spatnou hodnotu: ' . print_r($testMode, TRUE));
         }
@@ -235,6 +246,11 @@ public static function getInstance($appId = NULL, $testMode = FALSE, $profiler =
         self::$instance->setTestMode($testMode);
         self::$instance->profiler = $profiler;
 
+        if ($wsFactory !== NULL) {
+            self::$instance->wsFactory = $wsFactory;
+        }
+
+
         return self::$instance;
     }
 
@@ -256,7 +272,7 @@ public function __get($name) {
         }
 
         if (!isset($this->active[$wsdlKey])) {
-            $this->active[$wsdlKey] = new WS($this->getWsdlUri($wsdlName), $this->perStorage->init, $this->compression, $this->profiler);
+            $this->active[$wsdlKey] = $this->wsFactory->createWS($this->getWsdlUri($wsdlName), $this->perStorage->init, $this->compression, $this->profiler);
             if ($this->profiler) {
                 $this->active[$wsdlKey]->onEvent = $this->onEvent;
             }
@@ -372,4 +388,13 @@ public function isMaintenance() {
         return FALSE;
     }
 
+    /**
+     * Nastavi WSFactory
+     *
+     * @param $wsFactory WSFactory
+     */
+    public function setWSFactory(WSFactory $wsFactory)
+    {
+        $this->wsFactory = $wsFactory;
+    }
 }

tests/SkautIS/SkautISTest.php

@@ -43,20 +43,30 @@ public function testGetWsdlList() {
         }
     }
 
-    public function test__get() {
+    public function testMagicMethodGet() {
+        $wsA = new \StdClass;
+        $wsB = new \StdClass;
+
+        $factory = \Mockery::mock("\SkautIS\Factory\WSFactory");
+        $factory->shouldReceive("createWS")->with()->twice()->andReturn($wsA, $wsB);
 
         $skautIS = \SkautIS\SkautIS::getInstance("123");
+        $skautIS->setWSFactory($factory);
 
 
         $skautIS->setTestMode(true);
-        $userA = $skautIS->user;
-        $this->assertSame($userA, $skautIS->user);
+        $eventA = $skautIS->event;
+        $this->assertSame($eventA, $skautIS->event);
 
         $skautIS->setTestMode(false);
-        $this->assertNotSame($userA, $skautIS->user);
+        $this->assertNotSame($eventA, $skautIS->event);
+        $eventB = $skautIS->event;
 
         $skautIS->setTestMode(true);
-        $this->assertSame($userA, $skautIS->user);
+        $this->assertSame($eventA, $skautIS->event);
+
+        $this->assertSame($wsA, $eventA);
+        $this->assertSame($wsB, $eventB);
     }
 
     public function testSetLoginData() {
@@ -82,8 +92,16 @@ public function testSetLoginData() {
     }
 
     public function testIsLoggedIn() {
+        $ws = \Mockery::mock("\SkautIS\WS");
+        $ws->shouldReceive("LoginUpdateRefresh")->once()->andReturn();
+
+
+        $factory = \Mockery::mock("\SkautIS\Factory\WSFactory");
+        $factory->shouldReceive("createWS")->with()->once()->andReturn($ws);
+
         $skautIS = SkautIS::getInstance();
-        $this->assertFalse($skautIS->isLoggedIn());
-    }
+        $skautIS->setWSFactory($factory);
 
+        $this->assertTrue($skautIS->isLoggedIn());
+    }
 }