supernova-ws / SuperNova

classes/Buddy/BuddyModel.php

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * @package Buddy
  */
-class BuddyModel extends \Entity\KeyedModel{
+class BuddyModel extends \Entity\KeyedModel {
   /**
    * Name of table for this entity
    *

classes/Buddy/BuddyParams.php

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  * @property string           $playerName
  * @property string           $playerNameAndCoordinates
  */
-class BuddyParams extends ContainerPlus  {
+class BuddyParams extends ContainerPlus {
 
   /**
    * BuddyParams constructor.

classes/template.php

Braces +29 added lines, -58 removed lines

@@ -16,8 +16,7 @@ 
 * Base Template class.
 * @package phpBB3
 */
-class template
-{
+class template {
   /** variable that holds all the data we'll be substituting into
   * the compiled templates. Takes form:
   * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
@@ -57,8 +56,7 @@ 
   * Set template location
   * @access public
   */
-  public function set_template()
-  {
+  public function set_template() {
     global $phpbb_root_path, $user;
 
     if (file_exists($phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template'))
@@ -83,8 +81,7 @@ 
       {
         $this->inherit_root = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template';
       }
-    }
-    else
+    } else
     {
       trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
     }
@@ -98,8 +95,7 @@ 
   * Set custom template location (able to use directory outside of phpBB)
   * @access public
   */
-  public function set_custom_template($template_path, $template_name, $fallback_template_path = false)
-  {
+  public function set_custom_template($template_path, $template_name, $fallback_template_path = false) {
     global $phpbb_root_path, $user;
 
     // Make sure $template_path has no ending slash
@@ -120,8 +116,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -140,8 +135,7 @@ 
   * should be a hash of handle => filename pairs.
   * @access public
   */
-  public function set_filenames($filename_array)
-  {
+  public function set_filenames($filename_array) {
     if (!is_array($filename_array))
     {
       return false;
@@ -169,8 +163,7 @@ 
   * Destroy template data set
   * @access public
   */
-  public function destroy()
-  {
+  public function destroy() {
     $this->_tpldata = array('.' => array(0 => array()));
     $this->_rootref = &$this->_tpldata['.'][0];
   }
@@ -179,8 +172,7 @@ 
   * Reset/empty complete block
   * @access public
   */
-  public function destroy_block_vars($blockname)
-  {
+  public function destroy_block_vars($blockname) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -195,8 +187,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -209,8 +200,7 @@ 
   * Display handle
   * @access public
   */
-  public function display($handle, $include_once = true)
-  {
+  public function display($handle, $include_once = true) {
     global $phpbb_hook;
 
     if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once))
@@ -232,8 +222,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
     }
@@ -245,8 +234,7 @@ 
   * Display the handle and assign the output to a template variable or return the compiled result.
   * @access public
   */
-  public function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
-  {
+  public function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) {
     ob_start();
     $this->display($handle, $include_once);
     $contents = ob_get_clean();
@@ -265,8 +253,7 @@ 
   * Load a compiled template if possible, if not, recompile it
   * @access private
   */
-  public function _tpl_load(&$handle)
-  {
+  public function _tpl_load(&$handle) {
     global $user;
 
     if (!isset($this->filename[$handle]))
@@ -287,8 +274,7 @@ 
     if (!file_exists($filename) || @filesize($filename) === 0)
     {
       $recompile = true;
-    }
-    else if (classSupernova::$config->load_tplcompile)
+    } else if (classSupernova::$config->load_tplcompile)
     {
       // No way around it: we need to check inheritance here
       if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -376,15 +362,13 @@ 
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
-            }
-            else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
+            } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
             {
               // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that.
               $force_reload = true;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
             }
-          }
-          else
+          } else
           {
             $this->files_template[$row['template_filename']] = $user->theme['template_id'];
           }
@@ -394,8 +378,7 @@ 
             if ($row['template_filename'] == $this->filename[$handle])
             {
               $compile->_tpl_load_file($handle, true);
-            }
-            else
+            } else
             {
               $this->files[$row['template_filename']] = $file;
               $this->filename[$row['template_filename']] = $row['template_filename'];
@@ -410,8 +393,7 @@ 
           {
             $this->compiled_code[$handle] = $compile->compile(trim($row['template_data']));
             $compile->compile_write($handle, $this->compiled_code[$handle]);
-          }
-          else
+          } else
           {
             // Only bother compiling if it doesn't already exist
             if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
@@ -422,8 +404,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -450,8 +431,7 @@ 
   * Assign key variable pairs from an array
   * @access public
   */
-  public function assign_vars($vararray)
-  {
+  public function assign_vars($vararray) {
     foreach ($vararray as $key => $val)
     {
       $this->_rootref[$key] = $val;
@@ -464,8 +444,7 @@ 
   * Assign a single variable to a single key
   * @access public
   */
-  public function assign_var($varname, $varval)
-  {
+  public function assign_var($varname, $varval) {
     $this->_rootref[$varname] = $varval;
 
     return true;
@@ -475,8 +454,7 @@ 
   * Assign key variable pairs from an array to a specified block
   * @access public
   */
-  public function assign_block_vars($blockname, $vararray)
-  {
+  public function assign_block_vars($blockname, $vararray) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -511,8 +489,7 @@ 
       // We're adding a new iteration to this block with the given
       // variable assignments.
       $str[$blocks[$blockcount]][] = $vararray;
-    }
-    else
+    } else
     {
       // Top-level block.
       $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0;
@@ -566,8 +543,7 @@ 
   * @return bool false on error, true on success
   * @access public
   */
-  public function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
-  {
+  public function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') {
     if (strpos($blockname, '.') !== false)
     {
       // Nested blocks are not supported
@@ -612,8 +588,7 @@ 
         $key = sizeof($this->_tpldata[$blockname]);
         unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
         $vararray['S_LAST_ROW'] = true;
-      }
-      else if ($key === 0)
+      } else if ($key === 0)
       {
         unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']);
         $vararray['S_FIRST_ROW'] = true;
@@ -652,8 +627,7 @@ 
   * Include a separate template
   * @access private
   */
-  public function _tpl_include($filename, $include = true)
-  {
+  public function _tpl_include($filename, $include = true) {
     $handle = $filename;
     $this->filename[$handle] = $filename;
     $this->files[$handle] = $this->root . '/' . $filename;
@@ -681,8 +655,7 @@ 
   * Include a php-file
   * @access private
   */
-  public function _php_include($filename)
-  {
+  public function _php_include($filename) {
     global $phpbb_root_path;
 
     $file = $phpbb_root_path . $filename;
@@ -700,8 +673,7 @@ 
   * Assign key variable pairs from an array with block support
   * @access public
   */
-  public function assign_recursive($values, $name = '')
-  {
+  public function assign_recursive($values, $name = '') {
     if(isset($values['.']))
     {
       $values_extra = $values['.'];
@@ -711,8 +683,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

classes/template_compile.php

Braces +34 added lines, -68 removed lines

@@ -35,8 +35,7 @@ 
 *
 * @package phpBB3
 */
-class template_compile
-{
+class template_compile {
   var $template;
 
   // Various storage arrays
@@ -46,8 +45,7 @@ 
   /**
   * constuctor
   */
-  public function template_compile(&$template)
-  {
+  public function template_compile(&$template) {
     $this->template = &$template;
   }
 
@@ -55,8 +53,7 @@ 
   * Load template source from file
   * @access private
   */
-  public function _tpl_load_file($handle, $store_in_db = false)
-  {
+  public function _tpl_load_file($handle, $store_in_db = false) {
     // Try and open template for read
     if (!file_exists($this->template->files[$handle]))
     {
@@ -64,8 +61,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -101,8 +97,7 @@ 
   * the ones that exist in zend_language_scanner.l
   * @access private
   */
-  public function remove_php_tags(&$code)
-  {
+  public function remove_php_tags(&$code) {
     // This matches the information gathered from the internal PHP lexer
     $match = array(
       '#<([\?%])=?.*?\1>#s',
@@ -117,8 +112,7 @@ 
   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
   * @access private
   */
-  public function compile($code, $no_echo = false, $echo_var = '')
-  {
+  public function compile($code, $no_echo = false, $echo_var = '') {
     if ($echo_var)
     {
       global $$echo_var;
@@ -221,15 +215,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -288,8 +280,7 @@ 
   * Compile variables
   * @access private
   */
-  public function compile_var_tags(&$text_blocks)
-  {
+  public function compile_var_tags(&$text_blocks) {
     // change template varrefs into PHP varrefs
     $varrefs = array();
 
@@ -350,8 +341,7 @@ 
   * Compile blocks
   * @access private
   */
-  public function compile_tag_block($tag_args)
-  {
+  public function compile_tag_block($tag_args) {
     $no_nesting = false;
 
     // Is the designer wanting to call another loop in a loop?
@@ -374,8 +364,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -383,17 +372,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -406,8 +392,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -417,8 +402,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -457,8 +441,7 @@ 
   * some adaptions for our block level methods
   * @access private
   */
-  public function compile_tag_if($tag_args, $elseif)
-  {
+  public function compile_tag_if($tag_args, $elseif) {
     // Tokenize args for 'if' tag.
     preg_match_all('/(?:
       "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
@@ -566,8 +549,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -583,8 +565,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -592,8 +573,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -614,8 +594,7 @@ 
   * Compile DEFINE tags
   * @access private
   */
-  public function compile_tag_define($tag_args, $op)
-  {
+  public function compile_tag_define($tag_args, $op) {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
 
     if (empty($match[2]) || (!isset($match[4]) && $op))
@@ -638,8 +617,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -667,8 +645,7 @@ 
   * Compile INCLUDE tag
   * @access private
   */
-  public function compile_tag_include($tag_args)
-  {
+  public function compile_tag_include($tag_args) {
     // Process dynamic includes
     if ($tag_args[0] == '$')
     {
@@ -682,8 +659,7 @@ 
   * Compile INCLUDE_PHP tag
   * @access private
   */
-  public function compile_tag_include_php($tag_args)
-  {
+  public function compile_tag_include_php($tag_args) {
     return "\$this->_php_include('$tag_args');";
   }
 
@@ -692,8 +668,7 @@ 
   * This is from Smarty
   * @access private
   */
-  public function _parse_is_expr($is_arg, $tokens)
-  {
+  public function _parse_is_expr($is_arg, $tokens) {
     $expr_end = 0;
     $negate_expr = false;
 
@@ -701,8 +676,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -716,8 +690,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -729,8 +702,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -764,8 +736,7 @@ 
   * NOTE: expects a trailing "." on the namespace.
   * @access private
   */
-  public function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
-  {
+  public function generate_block_varref($namespace, $varname, $echo = true, $defop = false) {
     // Strip the trailing period.
     $namespace = substr($namespace, 0, -1);
 
@@ -789,8 +760,7 @@ 
   * NOTE: does not expect a trailing "." on the blockname.
   * @access private
   */
-  public function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-  {
+  public function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) {
     // Get an array of the blocks involved.
     $blocks = explode('.', $blockname);
     $blockcount = sizeof($blocks) - 1;
@@ -812,12 +782,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }
@@ -827,8 +795,7 @@ 
   * Write compiled file to cache directory
   * @access private
   */
-  public function compile_write($handle, $data)
-  {
+  public function compile_write($handle, $data) {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
 
     $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data);
@@ -851,8 +818,7 @@ 
   /**
   * Minifies template w/i PHP code by removing extra spaces
   */
-  private function minify($html)
-  {
+  private function minify($html) {
     if(!classSupernova::$config->tpl_minifier)
     {
       return $html;

classes/Pimple/ServiceProviderInterface.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
  * @author  Fabien Potencier
  * @author  Dominik Zogg
  */
-interface ServiceProviderInterface
-{
+interface ServiceProviderInterface {
     /**
      * Registers services on the given container.
      *

classes/Pimple/Container.php

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @author  Fabien Potencier
  */
-class Container implements \ArrayAccess
-{
+class Container implements \ArrayAccess {
     private $values = array();
     private $factories;
     private $protected;
@@ -47,8 +46,7 @@ 
      *
      * @param array $values The parameters or objects.
      */
-    public function __construct(array $values = array())
-    {
+    public function __construct(array $values = array()) {
         $this->factories = new \SplObjectStorage();
         $this->protected = new \SplObjectStorage();
 
@@ -71,8 +69,7 @@ 
      *
      * @throws \RuntimeException Prevent override of a frozen service
      */
-    public function offsetSet($id, $value)
-    {
+    public function offsetSet($id, $value) {
         if (isset($this->frozen[$id])) {
             throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id));
         }
@@ -90,8 +87,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function offsetGet($id)
-    {
+    public function offsetGet($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -125,8 +121,7 @@ 
      *
      * @return bool
      */
-    public function offsetExists($id)
-    {
+    public function offsetExists($id) {
         return isset($this->keys[$id]);
     }
 
@@ -135,8 +130,7 @@ 
      *
      * @param string $id The unique identifier for the parameter or object
      */
-    public function offsetUnset($id)
-    {
+    public function offsetUnset($id) {
         if (isset($this->keys[$id])) {
             if (is_object($this->values[$id])) {
                 unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
@@ -155,8 +149,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function factory($callable)
-    {
+    public function factory($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.');
         }
@@ -177,8 +170,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function protect($callable)
-    {
+    public function protect($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Callable is not a Closure or invokable object.');
         }
@@ -197,8 +189,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function raw($id)
-    {
+    public function raw($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -223,8 +214,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined or not a service definition
      */
-    public function extend($id, $callable)
-    {
+    public function extend($id, $callable) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -256,8 +246,7 @@ 
      *
      * @return array An array of value names
      */
-    public function keys()
-    {
+    public function keys() {
         return array_keys($this->values);
     }
 
@@ -269,8 +258,7 @@ 
      *
      * @return static
      */
-    public function register(ServiceProviderInterface $provider, array $values = array())
-    {
+    public function register(ServiceProviderInterface $provider, array $values = array()) {
         $provider->register($this);
 
         foreach ($values as $key => $value) {