jon48 / webtrees-lib

src/Webtrees/Module/WelcomeBlock/Views/WelcomeBlockConfigView.php

Indentation +21 added lines, -21 removed lines

@@ -23,51 +23,51 @@
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {     
+	protected function renderContent() {     
         
-        return '
+		return '
             <tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Enable Piwik Statistics') .
-                // Ideally, would like to add helpLink, but this does not work for modules...
-                // FunctionsPrint::helpLink('piwik_enabled', $this->getName());
-                '</td>
+				I18N::translate('Enable Piwik Statistics') .
+				// Ideally, would like to add helpLink, but this does not work for modules...
+				// FunctionsPrint::helpLink('piwik_enabled', $this->getName());
+				'</td>
                 <td class="optionbox">' .
-                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
-                '</td>
+				FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
+				'</td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Piwik URL') .
-                '</td>
+				I18N::translate('Piwik URL') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_url" size="45" value="' . 
-                    $this->data->get('piwik_url', '') . '" />
+					$this->data->get('piwik_url', '') . '" />
                 </td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Token') .
-                '</td>
+					I18N::translate('Piwik Token') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_token" size="45" value="' . 
-                    $this->data->get('piwik_token', '') . '" />
+					$this->data->get('piwik_token', '') . '" />
                 </td>
             </tr>' .
             
-            '<tr>
+			'<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Site ID') .
-                '</td>
+					I18N::translate('Piwik Site ID') .
+				'</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_siteid" size="4" value="' . 
-                    $this->data->get('piwik_siteid', '') . '" />
+					$this->data->get('piwik_siteid', '') . '" />
                 </td>
             </tr>' ;
         
-    }
+	}
     
 
 }

Spacing +8 added lines, -8 removed lines

@@ -28,42 +28,42 @@
         return '
             <tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Enable Piwik Statistics') .
+                I18N::translate('Enable Piwik Statistics').
                 // Ideally, would like to add helpLink, but this does not work for modules...
                 // FunctionsPrint::helpLink('piwik_enabled', $this->getName());
                 '</td>
                 <td class="optionbox">' .
-                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
+                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')).
                 '</td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Piwik URL') .
+                I18N::translate('Piwik URL').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_url" size="45" value="' . 
-                    $this->data->get('piwik_url', '') . '" />
+                    $this->data->get('piwik_url', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Token') .
+                    I18N::translate('Piwik Token').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_token" size="45" value="' . 
-                    $this->data->get('piwik_token', '') . '" />
+                    $this->data->get('piwik_token', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Site ID') .
+                    I18N::translate('Piwik Site ID').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_siteid" size="4" value="' . 
-                    $this->data->get('piwik_siteid', '') . '" />
+                    $this->data->get('piwik_siteid', '').'" />
                 </td>
             </tr>' ;
         

src/Webtrees/Place.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 			$index = str_replace('%', '', $match2);
 			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
 				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
-			}
-			else{
+			} else{
 				$displayPlace = str_replace($match2, '' , $displayPlace);
 			}
 		}

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\Place $place_in The Place to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\Place $place){
+	public function __construct(\Fisharebest\Webtrees\Place $place) {
 		$this->place = $place;
 	}
 
@@ -39,9 +39,9 @@ 
 	 * @param \Fisharebest\Webtrees\Tree $tree
 	 * @return \MyArtJaub\Webtrees\Place|null Instance of \MyArtJaub\Webtrees\Place, if relevant
 	 */
-	public static function getIntance($place_str, Tree $tree){
+	public static function getIntance($place_str, Tree $tree) {
 		$dplace = null;
-		if(is_string($place_str) && strlen($place_str) > 0){
+		if (is_string($place_str) && strlen($place_str) > 0) {
 			$dplace = new Place(new \Fisharebest\Webtrees\Place($place_str, $tree));
 		}
 		return $dplace;
@@ -52,7 +52,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\Place Embedded place record
 	 */
-	public function getDerivedPlace(){
+	public function getDerivedPlace() {
 		return $this->place;
 	}
 	
@@ -65,8 +65,8 @@ 
 	 * @param bool $anchor Option to print a link to placelist
 	 * @return string HTML code for formatted place
 	 */
-	public function htmlFormattedName($format, $anchor = false){		
-		$html='';
+	public function htmlFormattedName($format, $anchor = false) {		
+		$html = '';
 		
 		$levels = array_map('trim', explode(',', $this->place->getGedcomName()));
 		$nbLevels = count($levels);
@@ -74,15 +74,15 @@ 
 		preg_match_all('/%[^%]/', $displayPlace, $matches);
 		foreach ($matches[0] as $match2) {
 			$index = str_replace('%', '', $match2);
-			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
-				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
+			if (is_numeric($index) && $index > 0 && $index <= $nbLevels) {
+				$displayPlace = str_replace($match2, $levels[$index - 1], $displayPlace);
 			}
-			else{
-				$displayPlace = str_replace($match2, '' , $displayPlace);
+			else {
+				$displayPlace = str_replace($match2, '', $displayPlace);
 			}
 		}
 		if ($anchor && !Auth::isSearchEngine()) {
-			$html .='<a href="' . $this->place->getURL() . '">' . $displayPlace . '</a>';
+			$html .= '<a href="'.$this->place->getURL().'">'.$displayPlace.'</a>';
 		} else {
 			$html .= $displayPlace;
 		}

src/Webtrees/Mvc/Controller/MvcControllerInterface.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
  */
 interface MvcControllerInterface {
     
-    /**
-     * Return the module attached to this controller.
-     * 
-     * @return \Fisharebest\Webtrees\Module\AbstractModule
-     */
-    function getModule();
+	/**
+	 * Return the module attached to this controller.
+	 * 
+	 * @return \Fisharebest\Webtrees\Module\AbstractModule
+	 */
+	function getModule();
     
 }
  
\ No newline at end of file

src/Webtrees/Mvc/Controller/MvcController.php

Indentation +20 added lines, -20 removed lines

@@ -17,28 +17,28 @@
  */
 class MvcController implements MvcControllerInterface 
 {
-    /**
-     * Reference module
-     * @var Fisharebest\Webtrees\Module\AbstractModule $module
-     */
-    protected $module;
+	/**
+	 * Reference module
+	 * @var Fisharebest\Webtrees\Module\AbstractModule $module
+	 */
+	protected $module;
     
-    /**
-     * Constructor for MvcController
-     * 
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for MvcController
+	 * 
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		$this->module = $module;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
-     */
-    public function getModule() {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface::getModule()
+	 */
+	public function getModule() {
+		return $this->module;
+	}
         
 }
  
\ No newline at end of file

src/Webtrees/Mvc/DispatcherInterface.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * @param \Fisharebest\Webtrees\Module\AbstractModule $module
 	 * @param string $request
 	 */
-    public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
+	public function handle(\Fisharebest\Webtrees\Module\AbstractModule $module, $request);
     
 }
  
\ No newline at end of file

src/Webtrees/Mvc/View/ViewFactory.php

Indentation +72 added lines, -72 removed lines

@@ -17,87 +17,87 @@
  */
 class ViewFactory {
     
-    /**
-     * @var ViewFactory $instance Singleton pattern instance
-     */
-    private static $instance = null;
+	/**
+	 * @var ViewFactory $instance Singleton pattern instance
+	 */
+	private static $instance = null;
     
-    /**
-     * Returns the *ViewFactory* instance of this class.
-     *
-     * @return ViewFactory The *Singleton* instance.
-     */
-    public static function getInstance()
-    {
-        if (null === static::$instance) {
-            static::$instance = new static();
-        }
+	/**
+	 * Returns the *ViewFactory* instance of this class.
+	 *
+	 * @return ViewFactory The *Singleton* instance.
+	 */
+	public static function getInstance()
+	{
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
     
-        return static::$instance;
-    }
+		return static::$instance;
+	}
     
-    /**
-     * Protected constructor
-     */
-    protected function __construct() {}
+	/**
+	 * Protected constructor
+	 */
+	protected function __construct() {}
               
-    /**
-     * Return the view specified by the controller and view name, using data from the ViewBag
-     * 
-     * @param string $view_name
-     * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
-     * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
-     * @throws \Exception
-     */
-    public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
-    {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+	/**
+	 * Return the view specified by the controller and view name, using data from the ViewBag
+	 * 
+	 * @param string $view_name
+	 * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
+	 * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
+	 * @throws \Exception
+	 */
+	public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
+	{
+		if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+		if(!$ctrl) throw new \Exception('Base Controller not defined');
+		if(!$view_name) throw new \Exception('View not defined');
         
-        $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+		$mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
+		$view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
+		if(!class_exists($view_class)) throw new \Exception('View does not exist');
         
-        return new $view_class($ctrl, $data);
-    }
+		return new $view_class($ctrl, $data);
+	}
     
-    /**
-     * Static invocation of the makeView method
-     * 
-     * @param string $view_name
-     * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
-     * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
-     * @see \MyArtJaub\Webtrees\Mvc\View\ViewFactory::handle()
-     */
-    public static function make($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
-    {
-        return self::getInstance()->makeView($view_name, $mvc_ctrl, $ctrl, $data);
-    }
+	/**
+	 * Static invocation of the makeView method
+	 * 
+	 * @param string $view_name
+	 * @param \MyArtJaub\Webtrees\Mvc\Controller\MvcControllerInterface $mvc_ctrl
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 * @param \MyArtJaub\Webtrees\Mvc\View\ViewBag $data
+	 * @return \MyArtJaub\Webtrees\Mvc\View\AbstractView View
+	 * @see \MyArtJaub\Webtrees\Mvc\View\ViewFactory::handle()
+	 */
+	public static function make($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
+	{
+		return self::getInstance()->makeView($view_name, $mvc_ctrl, $ctrl, $data);
+	}
     
-    /**
-     * Private clone method to prevent cloning of the instance of the
-     * *Dispatcher* instance.
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
+	/**
+	 * Private clone method to prevent cloning of the instance of the
+	 * *Dispatcher* instance.
+	 *
+	 * @return void
+	 */
+	private function __clone()
+	{
+	}
     
-    /**
-     * Private unserialize method to prevent unserializing of the *Dispatcher*
-     * instance.
-     *
-     * @return void
-     */
-    private function __wakeup()
-    {
-    }
+	/**
+	 * Private unserialize method to prevent unserializing of the *Dispatcher*
+	 * instance.
+	 *
+	 * @return void
+	 */
+	private function __wakeup()
+	{
+	}
     
 }
  
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if (!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+        if (!$ctrl) throw new \Exception('Base Controller not defined');
+        if (!$view_name) throw new \Exception('View not defined');
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        $view_class = $mvc_ctrl_refl->getNamespaceName().'\\Views\\'.$view_name.'View';       
+        if (!class_exists($view_class)) throw new \Exception('View does not exist');
         
         return new $view_class($ctrl, $data);
     }

Braces +12 added lines, -4 removed lines

@@ -53,13 +53,21 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if(!$mvc_ctrl) {
+        	throw new \Exception('Mvc Controller not defined');
+        }
+        if(!$ctrl) {
+        	throw new \Exception('Base Controller not defined');
+        }
+        if(!$view_name) {
+        	throw new \Exception('View not defined');
+        }
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
         $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        if(!class_exists($view_class)) {
+        	throw new \Exception('View does not exist');
+        }
         
         return new $view_class($ctrl, $data);
     }

src/Webtrees/Mvc/View/ViewBag.php

Spacing +3 added lines, -3 removed lines

@@ -73,8 +73,8 @@ 
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if (is_null($key)) return;
+        if (!$override && array_key_exists($key, $this->data)) return;
         $this->data[$key] = $value;        
     }
     
@@ -107,7 +107,7 @@ 
      * @param string $key
      */
     public function __unset($key) {
-        unset($this->data[$key]);;
+        unset($this->data[$key]); ;
     }
     
 }

Braces +6 added lines, -2 removed lines

@@ -73,8 +73,12 @@
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if(is_null($key)) {
+        	return;
+        }
+        if(!$override && array_key_exists($key, $this->data)) {
+        	return;
+        }
         $this->data[$key] = $value;        
     }
     

Indentation +83 added lines, -83 removed lines

@@ -18,97 +18,97 @@
 	/**
 	 * @var array $data Container for data
 	 */
-    protected $data = array();
+	protected $data = array();
     
-    /**
-     * Constructor for ViewBag
-     * @param array $data_in
-     */
-    public function __construct(array $data_in = array()) {
-        $this->data = $data_in;
-    }
+	/**
+	 * Constructor for ViewBag
+	 * @param array $data_in
+	 */
+	public function __construct(array $data_in = array()) {
+		$this->data = $data_in;
+	}
     
-    /**
-     * Get the keys present in the view bag.
-     *
-     * @return array
-     */
-    public function keys()
-    {
-        return array_keys($this->data);
-    }
+	/**
+	 * Get the keys present in the view bag.
+	 *
+	 * @return array
+	 */
+	public function keys()
+	{
+		return array_keys($this->data);
+	}
     
-    /**
-     * Get all the data from the bag for a given key.
-     *
-     * @param  string  $key
-     * @param  string  $format
-     * @return unknown
-     */
-    public function get($key, $default = null)
-    {
-        if (array_key_exists($key, $this->data)) {
-            return $this->data[$key];
-        }
-        return $default;
-    }
+	/**
+	 * Get all the data from the bag for a given key.
+	 *
+	 * @param  string  $key
+	 * @param  string  $format
+	 * @return unknown
+	 */
+	public function get($key, $default = null)
+	{
+		if (array_key_exists($key, $this->data)) {
+			return $this->data[$key];
+		}
+		return $default;
+	}
     
-    /**
-     * Magic getter.
-     * Returns the value associated with the key.
-     * 
-     * @param string $key
-     * @return unknown
-     */
-    public function __get($key) {
-        return $this->get($key, null);
-    }
+	/**
+	 * Magic getter.
+	 * Returns the value associated with the key.
+	 * 
+	 * @param string $key
+	 * @return unknown
+	 */
+	public function __get($key) {
+		return $this->get($key, null);
+	}
     
-    /**
-     * Set the value for the specified key.
-     * Can define whether to override an existing value;
-     * 
-     * @param string $key
-     * @param mixed $value
-     * @param bool $override
-     */
-    public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
-        $this->data[$key] = $value;        
-    }
+	/**
+	 * Set the value for the specified key.
+	 * Can define whether to override an existing value;
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 * @param bool $override
+	 */
+	public function set($key, $value, $override = true) {
+		if(is_null($key)) return;
+		if(!$override && array_key_exists($key, $this->data)) return;
+		$this->data[$key] = $value;        
+	}
     
-    /**
-     * Magic setter.
-     * Set the value for the specified key.
-     * 
-     * @param string $key
-     * @param mixed $value
-     */
-    public function __set($key, $value) {
-        $this->set($key, $value);
-    }
+	/**
+	 * Magic setter.
+	 * Set the value for the specified key.
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function __set($key, $value) {
+		$this->set($key, $value);
+	}
     
-    /**
-     * Magic isset
-     * Checks whether the ViewBag contains the specified key
-     * 
-     * @param string $key
-     * @return bool
-     */
-    public function __isset($key) {
-        return isset($this->data[$key]);
-    }
+	/**
+	 * Magic isset
+	 * Checks whether the ViewBag contains the specified key
+	 * 
+	 * @param string $key
+	 * @return bool
+	 */
+	public function __isset($key) {
+		return isset($this->data[$key]);
+	}
     
-    /**
-     * Magic unset
-     * Unset the specified key from the ViewBag
-     * 
-     * @param string $key
-     */
-    public function __unset($key) {
-        unset($this->data[$key]);;
-    }
+	/**
+	 * Magic unset
+	 * Unset the specified key from the ViewBag
+	 * 
+	 * @param string $key
+	 */
+	public function __unset($key) {
+		unset($this->data[$key]);;
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Hook/HookSubscriberInterface.php

Indentation +2 added lines, -2 removed lines

@@ -15,13 +15,13 @@
  */
 interface HookSubscriberInterface {
 	
-    /**
+	/**
 	 * Return the list of functions implementented in the class which needs to be registered as hooks.
 	 * The format is either { function1, function 2,...} in which case the priority is the default one
 	 * or { function1 => priority1, function2 => priority2, ...}
 	 * 
 	 * @return array Array of hooks
 	 */
-    public function getSubscribedHooks();
+	public function getSubscribedHooks();
     
 }
\ No newline at end of file

src/Webtrees/Cache.php

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 	 *
 	 */
 	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+		if(!$this->is_init) {
+			$this->init();
+		}
 	}
 	
 	/**
@@ -93,7 +95,9 @@ 
 	protected function getKeyName($value, AbstractModule $mod = null){
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if($mod !== null) {
+			$mod_name = $mod->getName();
+		}
 		return $mod_name.'_'.$value;
 	}
 

Indentation +22 added lines, -22 removed lines

@@ -22,10 +22,10 @@ 
  */
 class Cache{
 	
-    /**
-     * Underlying Cache object
-     * @var CacheItemPoolInterface $cache
-     */
+	/**
+	 * Underlying Cache object
+	 * @var CacheItemPoolInterface $cache
+	 */
 	protected $cache=null;
 	
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	protected static function getInstance()
 	{
-	    if (null === static::$instance) {
-	        static::$instance = new static();
-	    }
+		if (null === static::$instance) {
+			static::$instance = new static();
+		}
 	
-	    return static::$instance;
+		return static::$instance;
 	}
 	
 	/**
@@ -59,8 +59,8 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
-		    $driver = new Apc();
+		if(Apc::isAvailable()) {
+			$driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
 				// We may not have permission - especially during setup, before we instruct
@@ -68,7 +68,7 @@ 
 				@mkdir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 			}
 			if (is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
-			    $driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
+				$driver = new FileSystem(array('path' => WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache'));
 			} else {
 				// No cache available, let's just use a basic one :-(
 				$driver = new Ephemeral();
@@ -95,7 +95,7 @@ 
 	 * @return string Cached key name
 	 */
 	protected function getKeyName($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		$mod_name = 'myartjaub';
 		if($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
@@ -109,7 +109,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public function getI($value, AbstractModule $mod = null){
-	    $this->checkInit();
+		$this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
 	
@@ -121,7 +121,7 @@ 
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
 	public static function get($value, AbstractModule $mod = null){
-	    return self::getInstance()->getI($value, $mod);
+		return self::getInstance()->getI($value, $mod);
 	}
 	
 	/**
@@ -136,8 +136,8 @@ 
 		
 		$item = $value;
 		if(!($value instanceof CacheItemInterface)) {
-		    $item = new \Stash\Item();
-    		$item->setKey($this->getKeyName($value, $mod));
+			$item = new \Stash\Item();
+			$item->setKey($this->getKeyName($value, $mod));
 		}		
 		$item->set($data);
 		$this->cache->save($item);
@@ -151,7 +151,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 */
 	public static function save($value, $data, AbstractModule $mod = null){
-	    self::getInstance()->saveI($value, $data, $mod);
+		self::getInstance()->saveI($value, $data, $mod);
 	}
 	
 	/**
@@ -162,8 +162,8 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public function deleteI($value, AbstractModule $mod = null){
-	    $this->checkInit();	
-	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
+		$this->checkInit();	
+		return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
 	
 	/**
@@ -174,7 +174,7 @@ 
 	 * @return bool Deletion successful?
 	 */
 	public static function delete($value, AbstractModule $mod = null){
-	    return self::getInstance()->deleteI($value, $mod);
+		return self::getInstance()->deleteI($value, $mod);
 	}
 	
 	/**
@@ -182,7 +182,7 @@ 
 	 *
 	 */
 	public function cleanI(){
-	    $this->checkInit();
+		$this->checkInit();
 		$this->cache->clear();
 	}
 	
@@ -190,7 +190,7 @@ 
 	 * Static invocation of the *clean* method.
 	 */
 	public static function clean() {
-	    self::getInstance()->cleanI();
+		self::getInstance()->cleanI();
 	}
 	
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Cache component to speed up some potential data retrievals
  */
-class Cache{
+class Cache {
 	
     /**
      * Underlying Cache object
      * @var CacheItemPoolInterface $cache
      */
-	protected $cache=null;
+	protected $cache = null;
 	
 	/**
 	 * Defines whether the cache has been initialised
@@ -59,7 +59,7 @@ 
 	 *
 	 */
 	protected function init() {		
-	    if(Apc::isAvailable()) {
+	    if (Apc::isAvailable()) {
 		    $driver = new Apc();
 		} else {
 			if (!is_dir(WT_DATA_DIR.DIRECTORY_SEPARATOR.'cache')) {
@@ -83,8 +83,8 @@ 
 	 * Initiliase the Cache if not done.
 	 *
 	 */
-	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+	protected function checkInit() {
+		if (!$this->is_init) $this->init();
 	}
 	
 	/**
@@ -94,10 +94,10 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return string Cached key name
 	 */
-	protected function getKeyName($value, AbstractModule $mod = null){
+	protected function getKeyName($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if ($mod !== null) $mod_name = $mod->getName();
 		return $mod_name.'_'.$value;
 	}
 	
@@ -108,7 +108,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public function getI($value, AbstractModule $mod = null){
+	public function getI($value, AbstractModule $mod = null) {
 	    $this->checkInit();
 		return $this->cache->getItem($this->getKeyName($value, $mod));
 	}
@@ -120,7 +120,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return \Psr\Cache\CacheItemInterface
 	 */
-	public static function get($value, AbstractModule $mod = null){
+	public static function get($value, AbstractModule $mod = null) {
 	    return self::getInstance()->getI($value, $mod);
 	}
 	
@@ -131,11 +131,11 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public function saveI($value, $data, AbstractModule $mod = null){
+	public function saveI($value, $data, AbstractModule $mod = null) {
 		$this->checkInit();
 		
 		$item = $value;
-		if(!($value instanceof CacheItemInterface)) {
+		if (!($value instanceof CacheItemInterface)) {
 		    $item = new \Stash\Item();
     		$item->setKey($this->getKeyName($value, $mod));
 		}		
@@ -150,7 +150,7 @@ 
 	 * @param mixed $data Value
 	 * @param AbstractModule $mod Calling module
 	 */
-	public static function save($value, $data, AbstractModule $mod = null){
+	public static function save($value, $data, AbstractModule $mod = null) {
 	    self::getInstance()->saveI($value, $data, $mod);
 	}
 	
@@ -161,7 +161,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public function deleteI($value, AbstractModule $mod = null){
+	public function deleteI($value, AbstractModule $mod = null) {
 	    $this->checkInit();	
 	    return $this->cache->deleteItem($this->getKeyName($value, $mod));
 	}
@@ -173,7 +173,7 @@ 
 	 * @param AbstractModule $mod Calling module
 	 * @return bool Deletion successful?
 	 */
-	public static function delete($value, AbstractModule $mod = null){
+	public static function delete($value, AbstractModule $mod = null) {
 	    return self::getInstance()->deleteI($value, $mod);
 	}
 	
@@ -181,7 +181,7 @@ 
 	 * Clean the cache
 	 *
 	 */
-	public function cleanI(){
+	public function cleanI() {
 	    $this->checkInit();
 		$this->cache->clear();
 	}