MontealegreLuis / phuml

src/classes/processor/options.php

Spacing +13 added lines, -13 removed lines

@@ -8,20 +8,20 @@ 
 
     protected $properties = array();    
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plProcessorOptionException( $key, plProcessorOptionException::READ );
+            throw new plProcessorOptionException($key, plProcessorOptionException::READ);
         }
         return $this->properties[$key]['data'];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plProcessorOptionException( $key, plProcessorOptionException::WRITE );
+            throw new plProcessorOptionException($key, plProcessorOptionException::WRITE);
         }
         $this->properties[$key]['data'] = $val;            
     }
@@ -29,27 +29,27 @@ 
     public function getOptions() 
     {
         $options = array();
-        foreach( $this->properties as $key => $property ) 
+        foreach ($this->properties as $key => $property) 
         {
             $options[] = $key;
         }
         return $options;
     }
 
-    public function getOptionDescription( $option ) 
+    public function getOptionDescription($option) 
     {
-        if ( !array_key_exists( $option, $this->properties ) ) 
+        if (!array_key_exists($option, $this->properties)) 
         {
-            throw new plProcessorOptionException( $option, plProcessorOptionException::UNKNOWN );
+            throw new plProcessorOptionException($option, plProcessorOptionException::UNKNOWN);
         }
         return $this->properties[$option]['description'];
     }
 
-    public function getOptionType( $option ) 
+    public function getOptionType($option) 
     {
-        if ( !array_key_exists( $option, $this->properties ) ) 
+        if (!array_key_exists($option, $this->properties)) 
         {
-            throw new plProcessorOptionException( $option, plProcessorOptionException::UNKNOWN );
+            throw new plProcessorOptionException($option, plProcessorOptionException::UNKNOWN);
         }
         return $this->properties[$option]['type'];
     }

src/classes/processor/graphviz.php

Spacing +73 added lines, -73 removed lines

@@ -30,24 +30,24 @@ 
         return 'text/dot';
     }
 
-    public function process( $input, $type ) 
+    public function process($input, $type) 
     {
         $this->structure = $input;
 
-        $this->output  = 'digraph "' . sha1( mt_rand() ) . '" {' . "\n";
+        $this->output  = 'digraph "' . sha1(mt_rand()) . '" {' . "\n";
         $this->output .= 'splines = true;' . "\n";
         $this->output .= 'overlap = false;' . "\n";
         $this->output .= 'mindist = 0.6;' . "\n";
 
-        foreach( $this->structure as $object ) 
+        foreach ($this->structure as $object) 
         {
-            if ( $object instanceof plPhpClass ) 
+            if ($object instanceof plPhpClass) 
             {
-                $this->output .= $this->getClassDefinition( $object );
+                $this->output .= $this->getClassDefinition($object);
             } 
-            else if ( $object instanceof plPhpInterface ) 
+            else if ($object instanceof plPhpInterface) 
             {
-                $this->output .= $this->getInterfaceDefinition( $object );
+                $this->output .= $this->getInterfaceDefinition($object);
             }
         }
 
@@ -56,7 +56,7 @@ 
         return $this->output;
     }
 
-    private function getClassDefinition( $o ) 
+    private function getClassDefinition($o) 
     {
         $def = '';
 
@@ -65,61 +65,61 @@ 
         
         $attributes = array();
         $associations = array();
-        foreach( $o->attributes as $attribute ) 
+        foreach ($o->attributes as $attribute) 
         {
-            $attributes[] = $this->getModifierRepresentation( $attribute->modifier ) . $attribute->name;
+            $attributes[] = $this->getModifierRepresentation($attribute->modifier) . $attribute->name;
 
             // Association creation is optional
-            if ( $this->options->createAssociations === false ) 
+            if ($this->options->createAssociations === false) 
             {
                 continue;
             }
 
             // Create associations if the attribute type is set
-            if ( $attribute->type !== null && array_key_exists( $attribute->type, $this->structure ) && !array_key_exists( strtolower( $attribute->type ), $associations ) ) 
+            if ($attribute->type !== null && array_key_exists($attribute->type, $this->structure) && !array_key_exists(strtolower($attribute->type), $associations)) 
             {
                 $def .= $this->createNodeRelation( 
-                    $this->getUniqueId( $this->structure[$attribute->type] ),
-                    $this->getUniqueId( $o ),
+                    $this->getUniqueId($this->structure[$attribute->type]),
+                    $this->getUniqueId($o),
                     array( 
                         'dir'       => 'back',
                         'arrowtail' => 'none',
                         'style'     => 'dashed',
                     )
                 );
-                $associations[strtolower( $attribute->type )] = true;
+                $associations[strtolower($attribute->type)] = true;
             }
         }
 
         $functions = array();
-        foreach( $o->functions as $function ) 
+        foreach ($o->functions as $function) 
         {
-            $functions[] = $this->getModifierRepresentation( $function->modifier ) . $function->name . $this->getParamRepresentation( $function->params );
+            $functions[] = $this->getModifierRepresentation($function->modifier) . $function->name . $this->getParamRepresentation($function->params);
 
             // Association creation is optional
-            if ( $this->options->createAssociations === false ) 
+            if ($this->options->createAssociations === false) 
             {
                 continue;
             }
 
             // Create association if the function is the constructor and takes
             // other classes as parameters
-            if ( strtolower( $function->name ) === '__construct' ) 
+            if (strtolower($function->name) === '__construct') 
             {
-                foreach( $function->params as $param ) 
+                foreach ($function->params as $param) 
                 {
-                    if ( $param->type !== null && array_key_exists( $param->type, $this->structure ) && !array_key_exists( strtolower( $param->type ), $associations ) ) 
+                    if ($param->type !== null && array_key_exists($param->type, $this->structure) && !array_key_exists(strtolower($param->type), $associations)) 
                     {
                         $def .= $this->createNodeRelation( 
-                            $this->getUniqueId( $this->structure[$param->type] ),
-                            $this->getUniqueId( $o ),
+                            $this->getUniqueId($this->structure[$param->type]),
+                            $this->getUniqueId($o),
                             array( 
                                 'dir'       => 'back',
                                 'arrowtail' => 'none',
                                 'style'     => 'dashed',
                             )
                         );
-                        $associations[strtolower( $param->type )] = true;
+                        $associations[strtolower($param->type)] = true;
                     }
                 }
             }
@@ -127,25 +127,25 @@ 
         
         // Create the node
         $def .= $this->createNode( 
-            $this->getUniqueId( $o ),
+            $this->getUniqueId($o),
             array(
-                'label' => $this->createClassLabel( $name, $attributes, $functions ),
+                'label' => $this->createClassLabel($name, $attributes, $functions),
                 'shape' => 'plaintext',
             )
         );
 
         // Create class inheritance relation
-        if ( $o->extends !== null ) 
+        if ($o->extends !== null) 
         {
             // Check if we need an "external" class node
-            if ( in_array( $o->extends, $this->structure ) !== true ) 
+            if (in_array($o->extends, $this->structure) !== true) 
             {
-                $def .= $this->getClassDefinition( $o->extends );
+                $def .= $this->getClassDefinition($o->extends);
             }
 
             $def .= $this->createNodeRelation( 
-                $this->getUniqueId( $o->extends ),
-                $this->getUniqueId( $o ),
+                $this->getUniqueId($o->extends),
+                $this->getUniqueId($o),
                 array( 
                     'dir'       => 'back',
                     'arrowtail' => 'empty',
@@ -155,17 +155,17 @@ 
         }
 
         // Create class implements relation
-        foreach( $o->implements as $interface ) 
+        foreach ($o->implements as $interface) 
         {
             // Check if we need an "external" interface node
-            if ( in_array( $interface, $this->structure ) !== true ) 
+            if (in_array($interface, $this->structure) !== true) 
             {
-                $def .= $this->getInterfaceDefinition( $interface );
+                $def .= $this->getInterfaceDefinition($interface);
             }
 
             $def .= $this->createNodeRelation( 
-                $this->getUniqueId( $interface ),
-                $this->getUniqueId( $o ),
+                $this->getUniqueId($interface),
+                $this->getUniqueId($o),
                 array( 
                     'dir'       => 'back',
                     'arrowtail' => 'normal',
@@ -177,7 +177,7 @@ 
         return $def;
     }
 
-    private function getInterfaceDefinition( $o ) 
+    private function getInterfaceDefinition($o) 
     {
         $def = '';
 
@@ -185,32 +185,32 @@ 
         $name = $o->name;
         
         $functions = array();
-        foreach( $o->functions as $function ) 
+        foreach ($o->functions as $function) 
         {
-            $functions[] = $this->getModifierRepresentation( $function->modifier ) . $function->name . $this->getParamRepresentation( $function->params );
+            $functions[] = $this->getModifierRepresentation($function->modifier) . $function->name . $this->getParamRepresentation($function->params);
         }
         
         // Create the node
         $def .= $this->createNode( 
-            $this->getUniqueId( $o ),
+            $this->getUniqueId($o),
             array(
-                'label' => $this->createInterfaceLabel( $name, array(), $functions ),
+                'label' => $this->createInterfaceLabel($name, array(), $functions),
                 'shape' => 'plaintext',
             )
         );
 
         // Create interface inheritance relation        
-        if ( $o->extends !== null ) 
+        if ($o->extends !== null) 
         {
             // Check if we need an "external" interface node
-            if ( in_array( $o->extends, $this->structure ) !== true ) 
+            if (in_array($o->extends, $this->structure) !== true) 
             {
-                $def .= $this->getInterfaceDefinition( $o->extends );
+                $def .= $this->getInterfaceDefinition($o->extends);
             }
 
             $def .= $this->createNodeRelation( 
-                $this->getUniqueId( $o->extends ),
-                $this->getUniqueId( $o ),
+                $this->getUniqueId($o->extends),
+                $this->getUniqueId($o),
                 array( 
                     'dir'       => 'back',
                     'arrowtail' => 'empty',
@@ -222,32 +222,32 @@ 
         return $def;
     }
 
-    private function getModifierRepresentation( $modifier ) 
+    private function getModifierRepresentation($modifier) 
     {
-        return ( $modifier === 'public' )
-               ? ( '+' )
-               : ( ( $modifier === 'protected' )
-                 ? ( '#' )
-                 : ( '-' ) );
+        return ($modifier === 'public')
+               ? ('+')
+               : (($modifier === 'protected')
+                 ? ('#')
+                 : ('-'));
     }
 
-    private function getParamRepresentation( $params ) 
+    private function getParamRepresentation($params) 
     {
-        if ( count( $params ) === 0 ) 
+        if (count($params) === 0) 
         {
             return '()';
         }
 
         $representation = '( ';
-        for( $i = 0; $i<count( $params ); $i++ ) 
+        for ($i = 0; $i < count($params); $i++) 
         {
-            if ( $params[$i]->type !== null ) 
+            if ($params[$i]->type !== null) 
             {
                 $representation .= $params[$i]->type . ' ';
             }
 
             $representation .= $params[$i]->name;
-            if ( $i < count( $params ) - 1 ) 
+            if ($i < count($params) - 1) 
             {
                 $representation .= ', ';
             }
@@ -257,15 +257,15 @@ 
         return $representation;
     }
 
-    private function getUniqueId( $object ) 
+    private function getUniqueId($object) 
     {
-        return '"' . spl_object_hash( $object ) . '"';
+        return '"' . spl_object_hash($object) . '"';
     }
 
-    private function createNode( $name, $options ) 
+    private function createNode($name, $options) 
     {
         $node = $name . " [";
-        foreach( $options as $key => $value ) 
+        foreach ($options as $key => $value) 
         {
             $node .= $key . '=' . $value . ' ';
         }
@@ -273,10 +273,10 @@ 
         return $node;
     }
 
-    private function createNodeRelation( $node1, $node2, $options ) 
+    private function createNodeRelation($node1, $node2, $options) 
     {
         $relation = $node1 . ' -> ' . $node2 . ' [';
-        foreach( $options as $key => $value ) 
+        foreach ($options as $key => $value) 
         {
             $relation .= $key . '=' . $value . ' ';
         }
@@ -284,7 +284,7 @@ 
         return $relation;
     }
 
-    private function createInterfaceLabel( $name, $attributes, $functions )     
+    private function createInterfaceLabel($name, $attributes, $functions)     
     {
         // Start the table
         $label = '<<TABLE CELLSPACING="0" BORDER="0" ALIGN="LEFT">';
@@ -294,11 +294,11 @@ 
 
         // The attributes block
         $label .= '<TR><TD BORDER="' . $this->options->style->interfaceTableBorder . '" ALIGN="LEFT" BGCOLOR="' . $this->options->style->interfaceAttributesBackground . '">';
-        if ( count( $attributes ) === 0 ) 
+        if (count($attributes) === 0) 
         {
             $label .= ' ';
         }
-        foreach( $attributes as $attribute ) 
+        foreach ($attributes as $attribute) 
         {
             $label .= '<FONT COLOR="' . $this->options->style->interfaceAttributesColor . '" FACE="' . $this->options->style->interfaceAttributesFont . '" POINT-SIZE="' . $this->options->style->interfaceAttributesFontsize . '">' . $attribute . '</FONT><BR ALIGN="LEFT"/>';
         }
@@ -306,11 +306,11 @@ 
 
         // The function block
         $label .= '<TR><TD BORDER="' . $this->options->style->interfaceTableBorder . '" ALIGN="LEFT" BGCOLOR="' . $this->options->style->interfaceFunctionsBackground . '">';
-        if ( count( $functions ) === 0 ) 
+        if (count($functions) === 0) 
         {
             $label .= ' ';
         }
-        foreach( $functions as $function ) 
+        foreach ($functions as $function) 
         {
             $label .= '<FONT COLOR="' . $this->options->style->interfaceFunctionsColor . '" FACE="' . $this->options->style->interfaceFunctionsFont . '" POINT-SIZE="' . $this->options->style->interfaceFunctionsFontsize . '">' . $function . '</FONT><BR ALIGN="LEFT"/>';
         }
@@ -322,7 +322,7 @@ 
         return $label;
     }
 
-    private function createClassLabel( $name, $attributes, $functions )     
+    private function createClassLabel($name, $attributes, $functions)     
     {
         // Start the table
         $label = '<<TABLE CELLSPACING="0" BORDER="0" ALIGN="LEFT">';
@@ -332,11 +332,11 @@ 
 
         // The attributes block
         $label .= '<TR><TD BORDER="' . $this->options->style->classTableBorder . '" ALIGN="LEFT" BGCOLOR="' . $this->options->style->classAttributesBackground . '">';
-        if ( count( $attributes ) === 0 ) 
+        if (count($attributes) === 0) 
         {
             $label .= ' ';
         }
-        foreach( $attributes as $attribute ) 
+        foreach ($attributes as $attribute) 
         {
             $label .= '<FONT COLOR="' . $this->options->style->classAttributesColor . '" FACE="' . $this->options->style->classAttributesFont . '" POINT-SIZE="' . $this->options->style->classAttributesFontsize . '">' . $attribute . '</FONT><BR ALIGN="LEFT"/>';
         }
@@ -344,11 +344,11 @@ 
 
         // The function block
         $label .= '<TR><TD BORDER="' . $this->options->style->classTableBorder . '" ALIGN="LEFT" BGCOLOR="' . $this->options->style->classFunctionsBackground . '">';
-        if ( count( $functions ) === 0 ) 
+        if (count($functions) === 0) 
         {
             $label .= ' ';
         }
-        foreach( $functions as $function ) 
+        foreach ($functions as $function) 
         {
             $label .= '<FONT COLOR="' . $this->options->style->classFunctionsColor . '" FACE="' . $this->options->style->classFunctionsFont . '" POINT-SIZE="' . $this->options->style->classFunctionsFontsize . '">' . $function . '</FONT><BR ALIGN="LEFT"/>';
         }

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
             if ( $object instanceof plPhpClass ) 
             {
                 $this->output .= $this->getClassDefinition( $object );
-            } 
-            else if ( $object instanceof plPhpInterface ) 
+            } else if ( $object instanceof plPhpInterface ) 
             {
                 $this->output .= $this->getInterfaceDefinition( $object );
             }

src/classes/processor/neato.php

Spacing +4 added lines, -4 removed lines

@@ -21,17 +21,17 @@
         return 'image/png';
     }
 
-    public function execute( $infile, $outfile, $type ) 
+    public function execute($infile, $outfile, $type) 
     {
         exec(
-            'neato -Tpng -o ' . escapeshellarg( $outfile ) . ' ' . escapeshellarg( $infile ),
+            'neato -Tpng -o ' . escapeshellarg($outfile) . ' ' . escapeshellarg($infile),
             $output,
             $return
         );
 
-        if ( $return !== 0 ) 
+        if ($return !== 0) 
         {
-            throw new plProcessorExternalExecutionException( $output );
+            throw new plProcessorExternalExecutionException($output);
         }
     }
 }

src/classes/php/attribute.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 {
     private $properties;
 
-    public function __construct( $name, $modifier = 'public', $type = null ) 
+    public function __construct($name, $modifier = 'public', $type = null) 
     {
         $this->properties = array( 
             'name'      =>  $name,
@@ -13,20 +13,20 @@ 
         );
     }
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::READ );
+            throw new plBasePropertyException($key, plBasePropertyException::READ);
         }
         return $this->properties[$key];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::WRITE );
+            throw new plBasePropertyException($key, plBasePropertyException::WRITE);
         }
         $this->properties[$key] = $val;            
     }

src/classes/php/class.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 {
     private $properties;
 
-    public function __construct( $name, $attributes = array(), $functions = array(), $implements = array(), $extends = null ) 
+    public function __construct($name, $attributes = array(), $functions = array(), $implements = array(), $extends = null) 
     {
         $this->properties = array( 
             'name'          =>  $name,
@@ -15,20 +15,20 @@ 
         );
     }
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::READ );
+            throw new plBasePropertyException($key, plBasePropertyException::READ);
         }
         return $this->properties[$key];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::WRITE );
+            throw new plBasePropertyException($key, plBasePropertyException::WRITE);
         }
         $this->properties[$key] = $val;            
     }

src/classes/php/function.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 {
     private $properties;
 
-    public function __construct( $name, $modifier = 'public', $params = array() ) 
+    public function __construct($name, $modifier = 'public', $params = array()) 
     {
         $this->properties = array( 
             'name'      =>  $name,
@@ -13,20 +13,20 @@ 
         );
     }
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::READ );
+            throw new plBasePropertyException($key, plBasePropertyException::READ);
         }
         return $this->properties[$key];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::WRITE );
+            throw new plBasePropertyException($key, plBasePropertyException::WRITE);
         }
         $this->properties[$key] = $val;            
     }

src/classes/php/functionParameter.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 {
     private $properties;
 
-    public function __construct( $name, $type = null ) 
+    public function __construct($name, $type = null) 
     {
         $this->properties = array( 
             'name'      =>  $name,
@@ -12,20 +12,20 @@ 
         );
     }
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::READ );
+            throw new plBasePropertyException($key, plBasePropertyException::READ);
         }
         return $this->properties[$key];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::WRITE );
+            throw new plBasePropertyException($key, plBasePropertyException::WRITE);
         }
         $this->properties[$key] = $val;            
     }

src/classes/php/interface.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 {
     private $properties;
 
-    public function __construct( $name, $functions = array(), $extends = null ) 
+    public function __construct($name, $functions = array(), $extends = null) 
     {
         $this->properties = array( 
             'name'      =>  $name,
@@ -13,20 +13,20 @@ 
         );
     }
 
-    public function __get( $key )
+    public function __get($key)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::READ );
+            throw new plBasePropertyException($key, plBasePropertyException::READ);
         }
         return $this->properties[$key];
     }
 
-    public function __set( $key, $val )
+    public function __set($key, $val)
     {
-        if ( !array_key_exists( $key, $this->properties ) )
+        if (!array_key_exists($key, $this->properties))
         {
-            throw new plBasePropertyException( $key, plBasePropertyException::WRITE );
+            throw new plBasePropertyException($key, plBasePropertyException::WRITE);
         }
         $this->properties[$key] = $val;            
     }

src/classes/base.php

Spacing +9 added lines, -9 removed lines

@@ -5,24 +5,24 @@ 
     private static $autoload = array();
     private static $autoloadDirectory = array();
 
-    public static function autoload( $classname )
+    public static function autoload($classname)
     {
-        if ( isset( self::$autoload[$classname] ) ) 
+        if (isset(self::$autoload[$classname])) 
         {
-            include_once( self::$autoload[$classname] );
+            include_once(self::$autoload[$classname]);
         }
     }
 
-    public static function addAutoloadDirectory( $directory ) 
+    public static function addAutoloadDirectory($directory) 
     {
-        if ( !in_array( $directory, self::$autoloadDirectory ) && is_dir( $directory ) && is_readable( $directory ) )
+        if (!in_array($directory, self::$autoloadDirectory) && is_dir($directory) && is_readable($directory))
         {
             self::$autoloadDirectory[] = $directory;
-            foreach( $glob = glob( $directory."/*.php" ) as $file )
+            foreach ($glob = glob($directory . "/*.php") as $file)
             {
-                if ( is_array( $autoload = include( $file ) ) ) 
+                if (is_array($autoload = include($file))) 
                 {
-                    self::$autoload = array_merge( $autoload, self::$autoload );
+                    self::$autoload = array_merge($autoload, self::$autoload);
                 }
             }
         }
@@ -30,7 +30,7 @@ 
 
     public static function getAutoloadClasses() 
     {
-        return array_keys( self::$autoload );
+        return array_keys(self::$autoload);
     }
 }