MontealegreLuis / phuml

src/classes/processor/graphviz/digraph/digraph.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
     private function elementsToDotLanguage(): string
     {
-        $dotFormat = array_map(function (plHasDotRepresentation $element) {
+        $dotFormat = array_map(function(plHasDotRepresentation $element) {
             return $element->toDotLanguage();
         }, $this->dotElements);
 

src/classes/processor/statistics.php

Spacing +14 added lines, -14 removed lines

@@ -7,7 +7,7 @@ 
 
     public function __construct()
     {
-        $this->options   = new plProcessorOptions();
+        $this->options = new plProcessorOptions();
         $this->information = array();
     }
 
@@ -23,7 +23,7 @@ 
         return 'text/plain';
     }
 
-    public function process( $input, $type )
+    public function process($input, $type)
     {
         // Initialize the values
         $this->information['interfaceCount']           = 0;
@@ -39,38 +39,38 @@ 
         $this->information['privateTypedAttributes']   = 0;
 
         // Loop through the classes and interfaces
-        foreach ( $input as $definition )
+        foreach ($input as $definition)
         {
-            if ( $definition instanceof plPhpInterface )
+            if ($definition instanceof plPhpInterface)
             {
                 $this->information['interfaceCount']++;
             }
 
-            if ( $definition instanceof plPhpClass )
+            if ($definition instanceof plPhpClass)
             {
                 $this->information['classCount']++;
 
-                foreach( $definition->attributes as $attribute )
+                foreach ($definition->attributes as $attribute)
                 {
-                    switch ( $attribute->modifier )
+                    switch ($attribute->modifier)
                     {
                         case 'public':
                             $this->information['publicAttributeCount']++;
-                            if ( $attribute->type->isPresent() )
+                            if ($attribute->type->isPresent())
                             {
                                 $this->information['publicTypedAttributes']++;
                             }
                         break;
                         case 'protected':
                             $this->information['protectedAttributeCount']++;
-                            if ( $attribute->type->isPresent() )
+                            if ($attribute->type->isPresent())
                             {
                                 $this->information['protectedTypedAttributes']++;
                             }
                         break;
                         case 'private':
                             $this->information['privateAttributeCount']++;
-                            if ( $attribute->type->isPresent() )
+                            if ($attribute->type->isPresent())
                             {
                                 $this->information['privateTypedAttributes']++;
                             }
@@ -79,9 +79,9 @@ 
                 }
             }
 
-            foreach( $definition->functions as $function )
+            foreach ($definition->functions as $function)
             {
-                switch ( $function->modifier )
+                switch ($function->modifier)
                 {
                     case 'public':
                         $this->information['publicFunctionCount']++;
@@ -99,8 +99,8 @@ 
         $this->information['functionCount']       = $this->information['publicFunctionCount'] + $this->information['protectedFunctionCount'] + $this->information['privateFunctionCount'];
         $this->information['attributeCount']      = $this->information['publicAttributeCount'] + $this->information['protectedAttributeCount'] + $this->information['privateAttributeCount'];
         $this->information['typedAttributeCount'] = $this->information['publicTypedAttributes'] + $this->information['protectedTypedAttributes'] + $this->information['privateTypedAttributes'];
-        $this->information['attributesPerClass']  = round( $this->information['attributeCount'] / $this->information['classCount'], 2 );
-        $this->information['functionsPerClass']   = round( $this->information['functionCount'] / $this->information['classCount'], 2 );
+        $this->information['attributesPerClass']  = round($this->information['attributeCount'] / $this->information['classCount'], 2);
+        $this->information['functionsPerClass']   = round($this->information['functionCount'] / $this->information['classCount'], 2);
 
         // Generate the needed text output
         return <<<END

src/classes/processor/graphviz.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(plDigraph $digraph = null)
     {
         $this->options = new plGraphvizProcessorOptions();
-        $labelBuilder =  new plNodeLabelBuilder(new TemplateEngine(
+        $labelBuilder = new plNodeLabelBuilder(new TemplateEngine(
             new FileSystem(__DIR__ . '/../processor/graphviz/digraph/templates')
         ), new plGraphvizProcessorDefaultStyle());
         $classElements = new plClassGraphElements($this->options->createAssociations, $labelBuilder);

src/classes/php/class.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 
     public function hasConstructor(): bool
     {
-        return count(array_filter($this->functions, function (plPhpFunction $function) {
+        return count(array_filter($this->functions, function(plPhpFunction $function) {
             return $function->isConstructor();
         })) === 1;
     }
@@ -48,7 +48,7 @@ 
             return [];
         }
 
-        $constructors = array_filter($this->functions, function (plPhpFunction $function) {
+        $constructors = array_filter($this->functions, function(plPhpFunction $function) {
             return $function->isConstructor();
         });
 

src/classes/generator/tokenparser.php

Spacing +89 added lines, -89 removed lines

@@ -39,22 +39,22 @@ 
         $this->lastToken = array();
     }
 
-    public function createStructure( array $files )
+    public function createStructure(array $files)
     {
         $this->initGlobalAttributes();
 
-        foreach( $files as $file )
+        foreach ($files as $file)
         {
             $this->initParserAttributes();
-            $tokens = token_get_all( file_get_contents( $file ) );
+            $tokens = token_get_all(file_get_contents($file));
 
             // Loop through all tokens
-            foreach( $tokens as $token )
+            foreach ($tokens as $token)
             {
                 // Split into Simple and complex token
-                if ( is_array( $token ) !== true )
+                if (is_array($token) !== true)
                 {
-                    switch( $token )
+                    switch ($token)
                     {
                         case ',':
                             $this->comma();
@@ -76,80 +76,80 @@ 
                             $this->lastToken = null;
                     }
                 }
-                else if ( is_array( $token ) === true )
+                else if (is_array($token) === true)
                 {
-                    switch ( $token[0] )
+                    switch ($token[0])
                     {
                         case T_WHITESPACE:
-                            $this->t_whitespace( $token );
+                            $this->t_whitespace($token);
                         break;
 
                         case T_FUNCTION:
-                            $this->t_function( $token );
+                            $this->t_function($token);
                         break;
 
                         case T_VAR:
-                            $this->t_var( $token );
+                            $this->t_var($token);
                         break;
 
                         case T_VARIABLE:
-                            $this->t_variable( $token );
+                            $this->t_variable($token);
                         break;
 
                         case T_ARRAY:
-                            $this->t_array( $token );
+                            $this->t_array($token);
                         break;
 
                         case T_CONSTANT_ENCAPSED_STRING:
-                            $this->t_constant_encapsed_string( $token );
+                            $this->t_constant_encapsed_string($token);
                         break;
 
                         case T_LNUMBER:
-                            $this->t_lnumber( $token );
+                            $this->t_lnumber($token);
                         break;
 
                         case T_DNUMBER:
-                            $this->t_dnumber( $token );
+                            $this->t_dnumber($token);
                         break;
 
                         case T_PAAMAYIM_NEKUDOTAYIM:
-                            $this->t_paamayim_neukudotayim( $token );
+                            $this->t_paamayim_neukudotayim($token);
                         break;
 
                         case T_STRING:
-                            $this->t_string( $token );
+                            $this->t_string($token);
                         break;
 
                         case T_INTERFACE:
-                            $this->t_interface( $token );
+                            $this->t_interface($token);
                         break;
 
                         case T_CLASS:
-                            $this->t_class( $token );
+                            $this->t_class($token);
                         break;
 
                         case T_IMPLEMENTS:
-                            $this->t_implements( $token );
+                            $this->t_implements($token);
                         break;
 
                         case T_EXTENDS:
-                            $this->t_extends( $token );
+                            $this->t_extends($token);
                         break;
 
                         case T_PUBLIC:
-                            $this->t_public( $token );
+                            $this->t_public($token);
                         break;
 
                         case T_PROTECTED:
-                            $this->t_protected( $token );
+                            $this->t_protected($token);
                         break;
 
                         case T_PRIVATE:
-                            $this->t_private( $token );
+                            $this->t_private($token);
                         break;
 
                         case T_DOC_COMMENT:
-                            $this->t_doc_comment( $token );
+                            $this->t_doc_comment($token);
                         break;
 
                         default:
@@ -170,7 +170,7 @@ 
         $this->fixObjectConnections();
 
         // Return the class and interface structure
-        return array_merge( $this->classes, $this->interfaces );
+        return array_merge($this->classes, $this->interfaces);
     }
 
     private function comma()
@@ -186,7 +186,7 @@ 
 
     private function closing_bracket()
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // The function declaration has been closed
@@ -217,7 +217,7 @@ 
 
     private function equal_sign()
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the equal sign
@@ -227,14 +227,14 @@ 
         }
     }
 
-    private function t_whitespace( $token )
+    private function t_whitespace($token)
     {
         // Ignore whitespaces
     }
 
-    private function t_function( $token )
+    private function t_function($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
             case T_PUBLIC:
@@ -247,9 +247,9 @@ 
         }
     }
 
-    private function t_var( $token )
+    private function t_var($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_VAR
@@ -259,9 +259,9 @@ 
         }
     }
 
-    private function t_variable( $token )
+    private function t_variable($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_PUBLIC:
             case T_PROTECTED:
@@ -286,9 +286,9 @@ 
         }
     }
 
-    private function t_array( $token )
+    private function t_array($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_ARRAY
@@ -298,9 +298,9 @@ 
         }
     }
 
-    private function t_constant_encapsed_string( $token )
+    private function t_constant_encapsed_string($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_CONSTANT_ENCAPSED_STRING
@@ -310,9 +310,9 @@ 
         }
     }
 
-    private function t_lnumber( $token )
+    private function t_lnumber($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_LNUMBER
@@ -322,9 +322,9 @@ 
         }
     }
 
-    private function t_dnumber( $token )
+    private function t_dnumber($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_DNUMBER
@@ -334,9 +334,9 @@ 
         }
     }
 
-    private function t_paamayim_neukudotayim( $token )
+    private function t_paamayim_neukudotayim($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the T_PAAMAYIM_NEKUDOTAYIM
@@ -346,9 +346,9 @@ 
         }
     }
 
-    private function t_string( $token )
+    private function t_string($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_IMPLEMENTS:
                 // Add interface to implements array
@@ -365,7 +365,7 @@ 
             case T_FUNCTION:
                 // Add the current function only if there is no function name already
                 // Because if we know the function name already this is a type hint
-                if ( $this->parserStruct['function'] === null )
+                if ($this->parserStruct['function'] === null)
                 {
                     // Function name
                     $this->parserStruct['function'] = $token[1];
@@ -393,9 +393,9 @@ 
         }
     }
 
-    private function t_interface( $token )
+    private function t_interface($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 // New initial interface token
@@ -412,9 +412,9 @@ 
         }
     }
 
-    private function t_class( $token )
+    private function t_class($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 // New initial interface token
@@ -431,9 +431,9 @@ 
         }
     }
 
-    private function t_implements( $token )
+    private function t_implements($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken = $token[0];
@@ -443,9 +443,9 @@ 
         }
     }
 
-    private function t_extends( $token )
+    private function t_extends($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken = $token[0];
@@ -455,9 +455,9 @@ 
         }
     }
 
-    private function t_public( $token )
+    private function t_public($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -468,9 +468,9 @@ 
         }
     }
 
-    private function t_protected( $token )
+    private function t_protected($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -481,9 +481,9 @@ 
         }
     }
 
-    private function t_private( $token )
+    private function t_private($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -494,9 +494,9 @@ 
         }
     }
 
-    private function t_doc_comment( $token )
+    private function t_doc_comment($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->parserStruct['docblock'] = $token[1];
@@ -510,19 +510,19 @@ 
     private function storeClassOrInterface()
     {
         // First we need to check if we should store interface data found so far
-        if ( $this->parserStruct['interface'] !== null )
+        if ($this->parserStruct['interface'] !== null)
         {
             // Init data storage
             $functions = array();
 
             // Create the data objects
-            foreach( $this->parserStruct['functions'] as $function )
+            foreach ($this->parserStruct['functions'] as $function)
             {
                 // Create the needed parameter objects
                 $params = array();
-                foreach( $function[2] as $param)
+                foreach ($function[2] as $param)
                 {
-                    $params[] = new plPhpVariable( $param[1], $param[0] );
+                    $params[] = new plPhpVariable($param[1], $param[0]);
                 }
                 $functions[] = new plPhpFunction(
                     $function[0],
@@ -540,20 +540,20 @@ 
             $this->interfaces[$this->parserStruct['interface']] = $interface;
         }
         // If there is no interface, we maybe need to store a class
-        else if ( $this->parserStruct['class'] !== null )
+        else if ($this->parserStruct['class'] !== null)
         {
             // Init data storage
             $functions  = array();
             $attributes = array();
 
             // Create the data objects
-            foreach( $this->parserStruct['functions'] as $function )
+            foreach ($this->parserStruct['functions'] as $function)
             {
                 // Create the needed parameter objects
                 $params = array();
-                foreach( $function[2] as $param)
+                foreach ($function[2] as $param)
                 {
-                    $params[] = new plPhpVariable( $param[1], $param[0] );
+                    $params[] = new plPhpVariable($param[1], $param[0]);
                 }
                 $functions[] = new plPhpFunction(
                     $function[0],
@@ -561,21 +561,21 @@ 
                     $params
                 );
             }
-            foreach ( $this->parserStruct['attributes'] as $attribute )
+            foreach ($this->parserStruct['attributes'] as $attribute)
             {
                 $type = null;
                 // If there is a docblock try to isolate the attribute type
-                if ( $attribute[2] !== null )
+                if ($attribute[2] !== null)
                 {
                     // Regular expression that extracts types in array annotations
                     $regexp = '/^[\s*]*@var\s+array\(\s*(\w+\s*=>\s*)?(\w+)\s*\).*$/m';
-                    if ( preg_match( $regexp, $attribute[2], $matches ) )
+                    if (preg_match($regexp, $attribute[2], $matches))
                     {
                         $type = $matches[2];
                     }
-                    else if ( $return = preg_match( '/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches ) )
+                    else if ($return = preg_match('/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches))
                     {
-                        $type = trim( $matches[1] );
+                        $type = trim($matches[1]);
                     }
                 }
                 $attributes[] = new plPhpAttribute(
@@ -600,34 +600,34 @@ 
 
     private function fixObjectConnections()
     {
-        foreach( $this->classes as $class )
+        foreach ($this->classes as $class)
         {
             $implements = array();
-            foreach( $class->implements as $key => $impl )
+            foreach ($class->implements as $key => $impl)
             {
-                $implements[$key] = array_key_exists( $impl, $this->interfaces )
+                $implements[$key] = array_key_exists($impl, $this->interfaces)
                                     ? $this->interfaces[$impl]
-                                    : $this->interfaces[$impl] = new plPhpInterface( $impl );
+                                    : $this->interfaces[$impl] = new plPhpInterface($impl);
             }
             $class->implements = $implements;
 
-            if ( $class->extends === null )
+            if ($class->extends === null)
             {
                 continue;
             }
-            $class->extends = array_key_exists( $class->extends, $this->classes )
+            $class->extends = array_key_exists($class->extends, $this->classes)
                               ? $this->classes[$class->extends]
-                              : ( $this->classes[$class->extends] = new plPhpClass( $class->extends ) );
+                              : ($this->classes[$class->extends] = new plPhpClass($class->extends));
         }
-        foreach( $this->interfaces as $interface )
+        foreach ($this->interfaces as $interface)
         {
-            if ( $interface->extends === null )
+            if ($interface->extends === null)
             {
                 continue;
             }
-            $interface->extends = array_key_exists( $interface->extends, $this->interfaces )
+            $interface->extends = array_key_exists($interface->extends, $this->interfaces)
                                  ? $this->interfaces[$interface->extends]
-                                 : ( $this->interfaces[$interface->extends] = new plPhpInterface( $interface->extends ) );
+                                 : ($this->interfaces[$interface->extends] = new plPhpInterface($interface->extends));
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -75,8 +75,7 @@ 
                             // Ignore everything else
                             $this->lastToken = null;
                     }
-                }
-                else if ( is_array( $token ) === true )
+                } else if ( is_array( $token ) === true )
                 {
                     switch ( $token[0] )
                     {
@@ -369,8 +368,7 @@ 
                 {
                     // Function name
                     $this->parserStruct['function'] = $token[1];
-                }
-                else
+                } else
                 {
                     // Type hint
                     $this->parserStruct['typehint'] = $token[1];
@@ -572,8 +570,7 @@ 
                     if ( preg_match( $regexp, $attribute[2], $matches ) )
                     {
                         $type = $matches[2];
-                    }
-                    else if ( $return = preg_match( '/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches ) )
+                    } else if ( $return = preg_match( '/^[\s*]*@var\s+(\S+).*$/m', $attribute[2], $matches ) )
                     {
                         $type = trim( $matches[1] );
                     }