MontealegreLuis / phuml

src/exceptions/generator/notFound.php

Spacing +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 
 class plStructureGeneratorNotFoundException extends Exception
 {
-    public function __construct( $generator ) 
+    public function __construct($generator) 
     {
-        parent::__construct( 'The needed generator class "' . $generator . '" could not be found.' );
+        parent::__construct('The needed generator class "' . $generator . '" could not be found.');
     }
 }
 

src/exceptions/processor/externalExecution.php

Indentation +4 added lines, -4 removed lines

@@ -4,10 +4,10 @@
 {
     public function __construct( $output ) 
     {
-    	// Convert array to string if is_array
-    	if(is_array($output)) {
-    		$output = var_export($output, true);
-    	}
+        // Convert array to string if is_array
+        if(is_array($output)) {
+            $output = var_export($output, true);
+        }
         parent::__construct( 'Execution of external program failed:' . "\n" . $output );
     }
 }

Spacing +3 added lines, -3 removed lines

@@ -2,13 +2,13 @@
 
 class plProcessorExternalExecutionException extends Exception 
 {
-    public function __construct( $output ) 
+    public function __construct($output) 
     {
     	// Convert array to string if is_array
-    	if(is_array($output)) {
+    	if (is_array($output)) {
     		$output = var_export($output, true);
     	}
-        parent::__construct( 'Execution of external program failed:' . "\n" . $output );
+        parent::__construct('Execution of external program failed:' . "\n" . $output);
     }
 }
 

src/exceptions/processor/option.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
               : ( ( $type === self::UNKNOWN )
                 ? ( 'existent' )
                 : ( 'writable')
-              ) 
+                ) 
             . ' in this context.'
         );
     }

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@
     const WRITE = 2;
     const UNKNOWN = 3;
     
-    public function __construct( $key, $type ) 
+    public function __construct($key, $type) 
     {
         parent::__construct( 
             'The option "' 
             . $key 
             . '" is not '
-            . ( $type === self::READ ) 
-              ? ( 'readable' )
-              : ( ( $type === self::UNKNOWN )
-                ? ( 'existent' )
-                : ( 'writable')
+            . ($type === self::READ) 
+              ? ('readable')
+              : (($type === self::UNKNOWN)
+                ? ('existent')
+                : ('writable')
               ) 
             . ' in this context.'
         );

src/exceptions/processor/notFound.php

Spacing +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 
 class plProcessorNotFoundException extends Exception
 {
-    public function __construct( $processor ) 
+    public function __construct($processor) 
     {
-        parent::__construct( 'The needed processor class "' . $processor . '" could not be found.' );
+        parent::__construct('The needed processor class "' . $processor . '" could not be found.');
     }
 }
 

src/interfaces/processor.php

Spacing +7 added lines, -7 removed lines

@@ -2,12 +2,12 @@ 
 
 abstract class plProcessor
 {
-    public static function factory( $processor )
+    public static function factory($processor)
     {
-        $classname = 'pl' . ucfirst( $processor ) . 'Processor';
-        if ( class_exists( $classname ) === false )
+        $classname = 'pl' . ucfirst($processor) . 'Processor';
+        if (class_exists($classname) === false)
         {
-            throw new plProcessorNotFoundException( $processor );
+            throw new plProcessorNotFoundException($processor);
         }
         return new $classname();
     }
@@ -23,13 +23,13 @@ 
         return $processors;
     }
 
-    public function writeToDisk( $input, $output )
+    public function writeToDisk($input, $output)
     {
-        file_put_contents( $output, $input );
+        file_put_contents($output, $input);
     }
 
     abstract public function getInputTypes();
     abstract public function getOutputType();
-    abstract public function process( $input, $type );
+    abstract public function process($input, $type);
 
 }

src/classes/generator/tokenparser.php

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] );
                     }

Spacing +89 added lines, -89 removed lines

@@ -45,22 +45,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();
@@ -82,80 +82,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:
@@ -176,7 +176,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()
@@ -192,7 +192,7 @@ 
 
     private function closing_bracket()
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // The function declaration has been closed
@@ -223,7 +223,7 @@ 
 
     private function equal_sign()
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_FUNCTION:
                 // just ignore the equal sign
@@ -233,14 +233,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:
@@ -253,9 +253,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
@@ -265,9 +265,9 @@ 
         }
     }
 
-    private function t_variable( $token )
+    private function t_variable($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case T_PUBLIC:
             case T_PROTECTED:
@@ -292,9 +292,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
@@ -304,9 +304,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
@@ -316,9 +316,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
@@ -328,9 +328,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
@@ -340,9 +340,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
@@ -352,9 +352,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
@@ -371,7 +371,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];
@@ -399,9 +399,9 @@ 
         }
     }
 
-    private function t_interface( $token )
+    private function t_interface($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 // New initial interface token
@@ -418,9 +418,9 @@ 
         }
     }
 
-    private function t_class( $token )
+    private function t_class($token)
     {
-        switch( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 // New initial interface token
@@ -437,9 +437,9 @@ 
         }
     }
 
-    private function t_implements( $token )
+    private function t_implements($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken = $token[0];
@@ -449,9 +449,9 @@ 
         }
     }
 
-    private function t_extends( $token )
+    private function t_extends($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken = $token[0];
@@ -461,9 +461,9 @@ 
         }
     }
 
-    private function t_public( $token )
+    private function t_public($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -474,9 +474,9 @@ 
         }
     }
 
-    private function t_protected( $token )
+    private function t_protected($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -487,9 +487,9 @@ 
         }
     }
 
-    private function t_private( $token )
+    private function t_private($token)
     {
-        switch ( $this->lastToken )
+        switch ($this->lastToken)
         {
             case null:
                 $this->lastToken                 = $token[0];
@@ -500,9 +500,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];
@@ -516,19 +516,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 Variable( $param[1], $param[0] );
+                    $params[] = new Variable($param[1], $param[0]);
                 }
                 $functions[] = new Method(
                     $function[0],
@@ -546,20 +546,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 Variable( $param[1], $param[0] );
+                    $params[] = new Variable($param[1], $param[0]);
                 }
                 $functions[] = new Method(
                     $function[0],
@@ -567,21 +567,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 Attribute(
@@ -606,34 +606,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 InterfaceDefinition( $impl );
+                                    : $this->interfaces[$impl] = new InterfaceDefinition($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 ClassDefinition( $class->extends ) );
+                              : ($this->classes[$class->extends] = new ClassDefinition($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 InterfaceDefinition( $interface->extends ) );
+                                 : ($this->interfaces[$interface->extends] = new InterfaceDefinition($interface->extends));
         }
     }
 }

src/Graphviz/Digraph.php

Spacing +1 added lines, -1 removed lines

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

src/classes/processor/statistics.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
 
     public function __construct()
     {
-        $this->options   = new plProcessorOptions();
+        $this->options = new plProcessorOptions();
         $this->information = array();
     }
 
@@ -26,7 +26,7 @@ 
         return 'text/plain';
     }
 
-    public function process( $input, $type )
+    public function process($input, $type)
     {
         // Initialize the values
         $this->information['interfaceCount']           = 0;
@@ -42,38 +42,38 @@ 
         $this->information['privateTypedAttributes']   = 0;
 
         // Loop through the classes and interfaces
-        foreach ( $input as $definition )
+        foreach ($input as $definition)
         {
-            if ( $definition instanceof InterfaceDefinition )
+            if ($definition instanceof InterfaceDefinition)
             {
                 $this->information['interfaceCount']++;
             }
 
-            if ( $definition instanceof ClassDefinition )
+            if ($definition instanceof ClassDefinition)
             {
                 $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']++;
                             }
@@ -82,9 +82,9 @@ 
                 }
             }
 
-            foreach( $definition->functions as $function )
+            foreach ($definition->functions as $function)
             {
-                switch ( $function->modifier )
+                switch ($function->modifier)
                 {
                     case 'public':
                         $this->information['publicFunctionCount']++;
@@ -102,8 +102,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

@@ -18,7 +18,7 @@
     public function __construct(Digraph $digraph = null)
     {
         $this->options = new plGraphvizProcessorOptions();
-        $labelBuilder =  new NodeLabelBuilder(new TemplateEngine(
+        $labelBuilder = new NodeLabelBuilder(new TemplateEngine(
             new FileSystem(__DIR__ . '/../../Graphviz/templates')
         ), new HtmlLabelStyle());
         $classElements = new ClassGraphElements($this->options->createAssociations, $labelBuilder);