spiral / framework

src/Prototype/src/Annotation/Line.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      */
     public function is(array $type): bool
     {
-        if ($this->type === null) {
+        if ($this->type === null){
             return false;
         }
 

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
      */
     public function is(array $type): bool
     {
-        if ($this->type === null) {
+        if ($this->type === null)
+        {
             return false;
         }
 

src/Prototype/src/Annotation/Parser.php

Spacing +7 added lines, -7 removed lines

@@ -26,22 +26,22 @@ 
     {
         $lines = explode("\n", $comment);
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line){
             // strip up comment prefix
             $line = preg_replace('/[\t ]*[\/]?\*[\/]? ?/', '', $line);
 
-            if (preg_match('/ *@([^ ]+) (.*)/iu', $line, $matches)) {
+            if (preg_match('/ *@([^ ]+) (.*)/iu', $line, $matches)){
                 $this->lines[] = new Line($matches[2], $matches[1]);
-            } else {
+            }else{
                 $this->lines[] = new Line($line);
             }
         }
 
-        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()) {
+        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()){
             array_shift($this->lines);
         }
 
-        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()) {
+        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()){
             array_pop($this->lines);
         }
     }
@@ -55,8 +55,8 @@ 
         $result[] = '/**';
 
         // skip first and last tokens
-        foreach ($this->lines as $line) {
-            if ($line->type === null) {
+        foreach ($this->lines as $line){
+            if ($line->type === null){
                 $result[] = sprintf(' * %s', $line->value);
                 continue;
             }

Braces +15 added lines, -7 removed lines

@@ -26,22 +26,28 @@ 
     {
         $lines = explode("\n", $comment);
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line)
+        {
             // strip up comment prefix
             $line = preg_replace('/[\t ]*[\/]?\*[\/]? ?/', '', $line);
 
-            if (preg_match('/ *@([^ ]+) (.*)/iu', $line, $matches)) {
+            if (preg_match('/ *@([^ ]+) (.*)/iu', $line, $matches))
+            {
                 $this->lines[] = new Line($matches[2], $matches[1]);
-            } else {
+            }
+            else
+            {
                 $this->lines[] = new Line($line);
             }
         }
 
-        if (isset($this->lines[0]) && $this->lines[0]->isEmpty()) {
+        if (isset($this->lines[0]) && $this->lines[0]->isEmpty())
+        {
             array_shift($this->lines);
         }
 
-        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty()) {
+        if (isset($this->lines[count($this->lines) - 1]) && $this->lines[count($this->lines) - 1]->isEmpty())
+        {
             array_pop($this->lines);
         }
     }
@@ -55,8 +61,10 @@ 
         $result[] = '/**';
 
         // skip first and last tokens
-        foreach ($this->lines as $line) {
-            if ($line->type === null) {
+        foreach ($this->lines as $line)
+        {
+            if ($line->type === null)
+            {
                 $result[] = sprintf(' * %s', $line->value);
                 continue;
             }

src/Prototype/src/Bootloader/PrototypeBootloader.php

Spacing +16 added lines, -16 removed lines

@@ -137,8 +137,8 @@ 
     public function initAnnotations(ContainerInterface $container, bool $reset = false): void
     {
         $prototyped = $this->memory->loadData('prototyped');
-        if (!$reset && $prototyped !== null) {
-            foreach ($prototyped as $property => $class) {
+        if (!$reset && $prototyped !== null){
+            foreach ($prototyped as $property => $class){
                 $this->bindProperty($property, $class);
             }
 
@@ -149,7 +149,7 @@ 
         $locator = $container->get(AnnotationLocator::class);
 
         $prototyped = [];
-        foreach ($locator->findClasses(Prototyped::class) as $class) {
+        foreach ($locator->findClasses(Prototyped::class) as $class){
             $prototyped[$class->getAnnotation()->property] = $class->getClass()->getName();
             $this->bindProperty($class->getAnnotation()->property, $class->getClass()->getName());
         }
@@ -162,19 +162,19 @@ 
      */
     public function initCycle(ContainerInterface $container): void
     {
-        if (!$container->has(ORM\SchemaInterface::class)) {
+        if (!$container->has(ORM\SchemaInterface::class)){
             return;
         }
 
         /** @var ORM\SchemaInterface|null $schema */
         $schema = $container->get(ORM\SchemaInterface::class);
-        if ($schema === null) {
+        if ($schema === null){
             return;
         }
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role){
             $repository = $schema->define($role, ORM\SchemaInterface::REPOSITORY);
-            if ($repository === ORM\Select\Repository::class || $repository === null) {
+            if ($repository === ORM\Select\Repository::class || $repository === null){
                 // default repository can not be wired
                 continue;
             }
@@ -188,23 +188,23 @@ 
      */
     private function initDefaults(ContainerInterface $container): void
     {
-        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut) {
-            if (is_array($shortcut) && isset($shortcut['resolve'])) {
-                if (isset($shortcut['with'])) {
+        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut){
+            if (is_array($shortcut) && isset($shortcut['resolve'])){
+                if (isset($shortcut['with'])){
                     // check dependencies
-                    foreach ($shortcut['with'] as $dep) {
-                        if (!class_exists($dep, true) && !interface_exists($dep, true)) {
+                    foreach ($shortcut['with'] as $dep){
+                        if (!class_exists($dep, true) && !interface_exists($dep, true)){
                             continue 2;
                         }
                     }
                 }
 
-                try {
+                try{
                     $target = $container->get($shortcut['resolve']);
-                    if (is_object($target)) {
+                    if (is_object($target)){
                         $this->bindProperty($property, get_class($target));
                     }
-                } catch (ContainerExceptionInterface $e) {
+                }catch (ContainerExceptionInterface $e){
                     continue;
                 }
 
@@ -215,7 +215,7 @@ 
                 is_string($shortcut)
                 && (class_exists($shortcut, true)
                     || interface_exists($shortcut, true))
-            ) {
+            ){
                 $this->bindProperty($property, $shortcut);
             }
         }

Braces +31 added lines, -15 removed lines

@@ -137,8 +137,10 @@ 
     public function initAnnotations(ContainerInterface $container, bool $reset = false): void
     {
         $prototyped = $this->memory->loadData('prototyped');
-        if (!$reset && $prototyped !== null) {
-            foreach ($prototyped as $property => $class) {
+        if (!$reset && $prototyped !== null)
+        {
+            foreach ($prototyped as $property => $class)
+            {
                 $this->bindProperty($property, $class);
             }
 
@@ -149,7 +151,8 @@ 
         $locator = $container->get(AnnotationLocator::class);
 
         $prototyped = [];
-        foreach ($locator->findClasses(Prototyped::class) as $class) {
+        foreach ($locator->findClasses(Prototyped::class) as $class)
+        {
             $prototyped[$class->getAnnotation()->property] = $class->getClass()->getName();
             $this->bindProperty($class->getAnnotation()->property, $class->getClass()->getName());
         }
@@ -162,19 +165,23 @@ 
      */
     public function initCycle(ContainerInterface $container): void
     {
-        if (!$container->has(ORM\SchemaInterface::class)) {
+        if (!$container->has(ORM\SchemaInterface::class))
+        {
             return;
         }
 
         /** @var ORM\SchemaInterface|null $schema */
         $schema = $container->get(ORM\SchemaInterface::class);
-        if ($schema === null) {
+        if ($schema === null)
+        {
             return;
         }
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role)
+        {
             $repository = $schema->define($role, ORM\SchemaInterface::REPOSITORY);
-            if ($repository === ORM\Select\Repository::class || $repository === null) {
+            if ($repository === ORM\Select\Repository::class || $repository === null)
+            {
                 // default repository can not be wired
                 continue;
             }
@@ -188,23 +195,32 @@ 
      */
     private function initDefaults(ContainerInterface $container): void
     {
-        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut) {
-            if (is_array($shortcut) && isset($shortcut['resolve'])) {
-                if (isset($shortcut['with'])) {
+        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut)
+        {
+            if (is_array($shortcut) && isset($shortcut['resolve']))
+            {
+                if (isset($shortcut['with']))
+                {
                     // check dependencies
-                    foreach ($shortcut['with'] as $dep) {
-                        if (!class_exists($dep, true) && !interface_exists($dep, true)) {
+                    foreach ($shortcut['with'] as $dep)
+                    {
+                        if (!class_exists($dep, true) && !interface_exists($dep, true))
+                        {
                             continue 2;
                         }
                     }
                 }
 
-                try {
+                try
+                {
                     $target = $container->get($shortcut['resolve']);
-                    if (is_object($target)) {
+                    if (is_object($target))
+                    {
                         $this->bindProperty($property, get_class($target));
                     }
-                } catch (ContainerExceptionInterface $e) {
+                }
+                catch (ContainerExceptionInterface $e)
+                {
                     continue;
                 }
 

src/Prototype/src/NodeExtractor.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
         ConflictResolver\Names $namesResolver,
         ConflictResolver\Namespaces $namespacesResolver,
         Parser $parser = null
-    ) {
+    ){
         $this->namesResolver = $namesResolver;
         $this->namespacesResolver = $namespacesResolver;
         $this->parser = $parser ?? (new ParserFactory())->create(ParserFactory::ONLY_PHP7);
@@ -81,11 +81,11 @@ 
         $declarator = new DeclareClass();
         $this->traverse($filename, $declarator);
 
-        if (empty($declarator->getClass())) {
+        if (empty($declarator->getClass())){
             throw new ClassNotDeclaredException($filename);
         }
 
-        if ($declarator->getNamespace()) {
+        if ($declarator->getNamespace()){
             return ClassNode::createWithNamespace($declarator->getClass(), $declarator->getNamespace());
         }
 
@@ -100,7 +100,7 @@ 
     {
         $tr = new NodeTraverser();
 
-        foreach ($visitors as $visitor) {
+        foreach ($visitors as $visitor){
             $tr->addVisitor($visitor);
         }
 
@@ -113,7 +113,7 @@ 
      */
     private function fillStmts(ClassNode $definition, array $imports): void
     {
-        foreach ($imports as $import) {
+        foreach ($imports as $import){
             $definition->addImportUsage($import['name'], $import['alias']);
         }
     }
@@ -128,10 +128,10 @@ 
         $reflection = new \ReflectionClass("{$definition->namespace}\\{$definition->class}");
 
         $constructor = $reflection->getConstructor();
-        if ($constructor !== null) {
+        if ($constructor !== null){
             $definition->hasConstructor = $constructor->getDeclaringClass()->getName() === $reflection->getName();
 
-            foreach ($reflection->getConstructor()->getParameters() as $parameter) {
+            foreach ($reflection->getConstructor()->getParameters() as $parameter){
                 $definition->addParam($parameter);
             }
         }
@@ -146,8 +146,8 @@ 
      */
     private function fillConstructorVars(array $vars, ClassNode $definition): void
     {
-        foreach ($vars as $k => $var) {
-            if (isset($definition->constructorParams[$var])) {
+        foreach ($vars as $k => $var){
+            if (isset($definition->constructorParams[$var])){
                 unset($vars[$k]);
             }
         }

Braces +16 added lines, -8 removed lines

@@ -81,11 +81,13 @@ 
         $declarator = new DeclareClass();
         $this->traverse($filename, $declarator);
 
-        if (empty($declarator->getClass())) {
+        if (empty($declarator->getClass()))
+        {
             throw new ClassNotDeclaredException($filename);
         }
 
-        if ($declarator->getNamespace()) {
+        if ($declarator->getNamespace())
+        {
             return ClassNode::createWithNamespace($declarator->getClass(), $declarator->getNamespace());
         }
 
@@ -100,7 +102,8 @@ 
     {
         $tr = new NodeTraverser();
 
-        foreach ($visitors as $visitor) {
+        foreach ($visitors as $visitor)
+        {
             $tr->addVisitor($visitor);
         }
 
@@ -113,7 +116,8 @@ 
      */
     private function fillStmts(ClassNode $definition, array $imports): void
     {
-        foreach ($imports as $import) {
+        foreach ($imports as $import)
+        {
             $definition->addImportUsage($import['name'], $import['alias']);
         }
     }
@@ -128,10 +132,12 @@ 
         $reflection = new \ReflectionClass("{$definition->namespace}\\{$definition->class}");
 
         $constructor = $reflection->getConstructor();
-        if ($constructor !== null) {
+        if ($constructor !== null)
+        {
             $definition->hasConstructor = $constructor->getDeclaringClass()->getName() === $reflection->getName();
 
-            foreach ($reflection->getConstructor()->getParameters() as $parameter) {
+            foreach ($reflection->getConstructor()->getParameters() as $parameter)
+            {
                 $definition->addParam($parameter);
             }
         }
@@ -146,8 +152,10 @@ 
      */
     private function fillConstructorVars(array $vars, ClassNode $definition): void
     {
-        foreach ($vars as $k => $var) {
-            if (isset($definition->constructorParams[$var])) {
+        foreach ($vars as $k => $var)
+        {
+            if (isset($definition->constructorParams[$var]))
+            {
                 unset($vars[$k]);
             }
         }

src/Prototype/src/Injector.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct(Lexer $lexer = null, PrettyPrinterAbstract $printer = null)
     {
-        if ($lexer === null) {
+        if ($lexer === null){
             $lexer = new Lexer\Emulative([
                 'usedAttributes' => [
                     'comments',
@@ -79,14 +79,14 @@ 
      */
     public function injectDependencies(string $code, ClassNode $node, bool $removeTrait = false): string
     {
-        if (empty($node->dependencies)) {
+        if (empty($node->dependencies)){
             return $code;
         }
 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait){
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

Braces +6 added lines, -3 removed lines

@@ -47,7 +47,8 @@ 
      */
     public function __construct(Lexer $lexer = null, PrettyPrinterAbstract $printer = null)
     {
-        if ($lexer === null) {
+        if ($lexer === null)
+        {
             $lexer = new Lexer\Emulative([
                 'usedAttributes' => [
                     'comments',
@@ -79,14 +80,16 @@ 
      */
     public function injectDependencies(string $code, ClassNode $node, bool $removeTrait = false): string
     {
-        if (empty($node->dependencies)) {
+        if (empty($node->dependencies))
+        {
             return $code;
         }
 
         $tr = new NodeTraverser();
         $tr->addVisitor(new AddUse($node));
 
-        if ($removeTrait) {
+        if ($removeTrait)
+        {
             $tr->addVisitor(new RemoveUse());
             $tr->addVisitor(new RemoveTrait());
         }

src/Prototype/src/ClassNode/ConflictResolver/AbstractEntity.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public function fullName(): string
     {
         $name = $this->name;
-        if ($this->sequence > 0) {
+        if ($this->sequence > 0){
             $name .= $this->sequence;
         }
 

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
     public function fullName(): string
     {
         $name = $this->name;
-        if ($this->sequence > 0) {
+        if ($this->sequence > 0)
+        {
             $name .= $this->sequence;
         }
 

src/Prototype/src/ClassNode/ConflictResolver/Names.php

Spacing +11 added lines, -11 removed lines

@@ -45,11 +45,11 @@ 
     private function getConstructorReservedNames(ClassNode $definition): array
     {
         $names = [];
-        foreach ($definition->constructorVars as $name) {
+        foreach ($definition->constructorVars as $name){
             $names[] = $name;
         }
 
-        foreach ($definition->constructorParams as $param) {
+        foreach ($definition->constructorParams as $param){
             $names[] = $param->name;
         }
 
@@ -63,12 +63,12 @@ 
     private function initiateCounters(array $names): array
     {
         $counters = [];
-        foreach ($names as $name) {
+        foreach ($names as $name){
             $name = $this->parseName($name);
 
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name])){
                 $counters[$name->name][$name->sequence] = $name->fullName();
-            } else {
+            }else{
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -82,18 +82,18 @@ 
      */
     private function addPostfixes(ClassNode $definition, array $counters): void
     {
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency){
             $name = $this->parseName($dependency->var);
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name])){
                 $sequence = $this->sequences->find(array_keys($counters[$name->name]), $name->sequence);
-                if ($sequence !== $name->sequence) {
+                if ($sequence !== $name->sequence){
                     $name->sequence = $sequence;
 
                     $dependency->var = $name->fullName();
                 }
 
                 $counters[$name->name][$sequence] = $name->fullName();
-            } else {
+            }else{
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -105,9 +105,9 @@ 
      */
     private function parseName(string $name): NameEntity
     {
-        if (preg_match("/\d+$/", $name, $match)) {
+        if (preg_match("/\d+$/", $name, $match)){
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0){
                 return NameEntity::createWithSequence(Utils::trimTrailingDigits($name, $sequence), $sequence);
             }
         }

Braces +24 added lines, -11 removed lines

@@ -45,11 +45,13 @@ 
     private function getConstructorReservedNames(ClassNode $definition): array
     {
         $names = [];
-        foreach ($definition->constructorVars as $name) {
+        foreach ($definition->constructorVars as $name)
+        {
             $names[] = $name;
         }
 
-        foreach ($definition->constructorParams as $param) {
+        foreach ($definition->constructorParams as $param)
+        {
             $names[] = $param->name;
         }
 
@@ -63,12 +65,16 @@ 
     private function initiateCounters(array $names): array
     {
         $counters = [];
-        foreach ($names as $name) {
+        foreach ($names as $name)
+        {
             $name = $this->parseName($name);
 
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name]))
+            {
                 $counters[$name->name][$name->sequence] = $name->fullName();
-            } else {
+            }
+            else
+            {
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -82,18 +88,23 @@ 
      */
     private function addPostfixes(ClassNode $definition, array $counters): void
     {
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency)
+        {
             $name = $this->parseName($dependency->var);
-            if (isset($counters[$name->name])) {
+            if (isset($counters[$name->name]))
+            {
                 $sequence = $this->sequences->find(array_keys($counters[$name->name]), $name->sequence);
-                if ($sequence !== $name->sequence) {
+                if ($sequence !== $name->sequence)
+                {
                     $name->sequence = $sequence;
 
                     $dependency->var = $name->fullName();
                 }
 
                 $counters[$name->name][$sequence] = $name->fullName();
-            } else {
+            }
+            else
+            {
                 $counters[$name->name] = [$name->sequence => $name->fullName()];
             }
         }
@@ -105,9 +116,11 @@ 
      */
     private function parseName(string $name): NameEntity
     {
-        if (preg_match("/\d+$/", $name, $match)) {
+        if (preg_match("/\d+$/", $name, $match))
+        {
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0)
+            {
                 return NameEntity::createWithSequence(Utils::trimTrailingDigits($name, $sequence), $sequence);
             }
         }

src/Prototype/src/ClassNode/ConflictResolver/Namespaces.php

Spacing +23 added lines, -23 removed lines

@@ -58,8 +58,8 @@ 
      */
     private function getReservedNamespacesWithAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if (!$stmt->alias) {
+        foreach ($definition->getStmts() as $stmt){
+            if (!$stmt->alias){
                 continue;
             }
 
@@ -76,8 +76,8 @@ 
      */
     private function getReservedNamespacesWithoutAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if ($stmt->alias || isset($namespaces[$stmt->shortName])) {
+        foreach ($definition->getStmts() as $stmt){
+            if ($stmt->alias || isset($namespaces[$stmt->shortName])){
                 continue;
             }
 
@@ -94,12 +94,12 @@ 
     private function initiateCounters(array $namespaces): array
     {
         $counters = [];
-        foreach ($namespaces as $shortName => $fullName) {
+        foreach ($namespaces as $shortName => $fullName){
             $namespace = $this->parseNamespace($shortName, $fullName);
 
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name])){
                 $counters[$namespace->name][$namespace->sequence] = $namespace;
-            } else {
+            }else{
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -113,52 +113,52 @@ 
      */
     private function resolveImportsNamespaces(ClassNode $definition, array $counters): void
     {
-        if (!$definition->hasConstructor && $definition->constructorParams) {
-            foreach ($definition->constructorParams as $param) {
+        if (!$definition->hasConstructor && $definition->constructorParams){
+            foreach ($definition->constructorParams as $param){
                 //no type (or type is internal), do nothing
-                if (empty($param->type) || $param->isBuiltIn()) {
+                if (empty($param->type) || $param->isBuiltIn()){
                     continue;
                 }
 
                 $namespace = $this->parseNamespaceFromType($param->type);
-                if (isset($counters[$namespace->name])) {
-                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)) {
+                if (isset($counters[$namespace->name])){
+                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)){
                         continue;
                     }
 
                     $sequence = $this->sequences->find(array_keys($counters[$namespace->name]), $namespace->sequence);
-                    if ($sequence !== $namespace->sequence) {
+                    if ($sequence !== $namespace->sequence){
                         $namespace->sequence = $sequence;
 
                         $param->type->alias = $namespace->fullName();
                     }
 
                     $counters[$namespace->name][$sequence] = $namespace;
-                } else {
+                }else{
                     $counters[$namespace->name] = [$namespace->sequence => $namespace];
                 }
             }
         }
 
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency){
             $namespace = $this->parseNamespaceFromType($dependency->type);
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name])){
                 $alreadyImported = $this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace);
-                if ($alreadyImported !== null) {
+                if ($alreadyImported !== null){
                     $dependency->type->alias = $alreadyImported->fullName();
 
                     continue;
                 }
 
                 $sequence = $this->sequences->find(array_keys($counters[$namespace->name]), $namespace->sequence);
-                if ($sequence !== $namespace->sequence) {
+                if ($sequence !== $namespace->sequence){
                     $namespace->sequence = $sequence;
 
                     $dependency->type->alias = $namespace->fullName();
                 }
 
                 $counters[$namespace->name][$sequence] = $namespace;
-            } else {
+            }else{
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -171,8 +171,8 @@ 
      */
     private function getAlreadyImportedNamespace(array $counters, NamespaceEntity $namespace): ?NamespaceEntity
     {
-        foreach ($counters as $counter) {
-            if ($counter->equals($namespace)) {
+        foreach ($counters as $counter){
+            if ($counter->equals($namespace)){
                 return $counter;
             }
         }
@@ -196,9 +196,9 @@ 
      */
     private function parseNamespace(string $shortName, string $fullName): NamespaceEntity
     {
-        if (preg_match("/\d+$/", $shortName, $match)) {
+        if (preg_match("/\d+$/", $shortName, $match)){
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0){
                 return NamespaceEntity::createWithSequence(
                     Utils::trimTrailingDigits($shortName, $sequence),
                     $fullName,

Braces +49 added lines, -23 removed lines

@@ -58,8 +58,10 @@ 
      */
     private function getReservedNamespacesWithAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if (!$stmt->alias) {
+        foreach ($definition->getStmts() as $stmt)
+        {
+            if (!$stmt->alias)
+            {
                 continue;
             }
 
@@ -76,8 +78,10 @@ 
      */
     private function getReservedNamespacesWithoutAlias(ClassNode $definition, array $namespaces): array
     {
-        foreach ($definition->getStmts() as $stmt) {
-            if ($stmt->alias || isset($namespaces[$stmt->shortName])) {
+        foreach ($definition->getStmts() as $stmt)
+        {
+            if ($stmt->alias || isset($namespaces[$stmt->shortName]))
+            {
                 continue;
             }
 
@@ -94,12 +98,16 @@ 
     private function initiateCounters(array $namespaces): array
     {
         $counters = [];
-        foreach ($namespaces as $shortName => $fullName) {
+        foreach ($namespaces as $shortName => $fullName)
+        {
             $namespace = $this->parseNamespace($shortName, $fullName);
 
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name]))
+            {
                 $counters[$namespace->name][$namespace->sequence] = $namespace;
-            } else {
+            }
+            else
+            {
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -113,52 +121,66 @@ 
      */
     private function resolveImportsNamespaces(ClassNode $definition, array $counters): void
     {
-        if (!$definition->hasConstructor && $definition->constructorParams) {
-            foreach ($definition->constructorParams as $param) {
+        if (!$definition->hasConstructor && $definition->constructorParams)
+        {
+            foreach ($definition->constructorParams as $param)
+            {
                 //no type (or type is internal), do nothing
-                if (empty($param->type) || $param->isBuiltIn()) {
+                if (empty($param->type) || $param->isBuiltIn())
+                {
                     continue;
                 }
 
                 $namespace = $this->parseNamespaceFromType($param->type);
-                if (isset($counters[$namespace->name])) {
-                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace)) {
+                if (isset($counters[$namespace->name]))
+                {
+                    if ($this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace))
+                    {
                         continue;
                     }
 
                     $sequence = $this->sequences->find(array_keys($counters[$namespace->name]), $namespace->sequence);
-                    if ($sequence !== $namespace->sequence) {
+                    if ($sequence !== $namespace->sequence)
+                    {
                         $namespace->sequence = $sequence;
 
                         $param->type->alias = $namespace->fullName();
                     }
 
                     $counters[$namespace->name][$sequence] = $namespace;
-                } else {
+                }
+                else
+                {
                     $counters[$namespace->name] = [$namespace->sequence => $namespace];
                 }
             }
         }
 
-        foreach ($definition->dependencies as $dependency) {
+        foreach ($definition->dependencies as $dependency)
+        {
             $namespace = $this->parseNamespaceFromType($dependency->type);
-            if (isset($counters[$namespace->name])) {
+            if (isset($counters[$namespace->name]))
+            {
                 $alreadyImported = $this->getAlreadyImportedNamespace($counters[$namespace->name], $namespace);
-                if ($alreadyImported !== null) {
+                if ($alreadyImported !== null)
+                {
                     $dependency->type->alias = $alreadyImported->fullName();
 
                     continue;
                 }
 
                 $sequence = $this->sequences->find(array_keys($counters[$namespace->name]), $namespace->sequence);
-                if ($sequence !== $namespace->sequence) {
+                if ($sequence !== $namespace->sequence)
+                {
                     $namespace->sequence = $sequence;
 
                     $dependency->type->alias = $namespace->fullName();
                 }
 
                 $counters[$namespace->name][$sequence] = $namespace;
-            } else {
+            }
+            else
+            {
                 $counters[$namespace->name] = [$namespace->sequence => $namespace];
             }
         }
@@ -171,8 +193,10 @@ 
      */
     private function getAlreadyImportedNamespace(array $counters, NamespaceEntity $namespace): ?NamespaceEntity
     {
-        foreach ($counters as $counter) {
-            if ($counter->equals($namespace)) {
+        foreach ($counters as $counter)
+        {
+            if ($counter->equals($namespace))
+            {
                 return $counter;
             }
         }
@@ -196,9 +220,11 @@ 
      */
     private function parseNamespace(string $shortName, string $fullName): NamespaceEntity
     {
-        if (preg_match("/\d+$/", $shortName, $match)) {
+        if (preg_match("/\d+$/", $shortName, $match))
+        {
             $sequence = (int)$match[0];
-            if ($sequence > 0) {
+            if ($sequence > 0)
+            {
                 return NamespaceEntity::createWithSequence(
                     Utils::trimTrailingDigits($shortName, $sequence),
                     $fullName,

src/Prototype/src/ClassNode/ConflictResolver/Sequences.php

Spacing +6 added lines, -6 removed lines

@@ -24,21 +24,21 @@ 
      */
     public function find(array $sequences, int $originSequence): int
     {
-        if (empty($sequences) || $originSequence > max($sequences)) {
+        if (empty($sequences) || $originSequence > max($sequences)){
             return $originSequence;
         }
 
         $gaps = $this->skippedSequences($sequences);
 
-        if (isset($gaps[$originSequence])) {
+        if (isset($gaps[$originSequence])){
             return $originSequence;
         }
 
         //we do not add "1" as postfix: $var, $var2, $var3, etc
         unset($gaps[1]);
-        if (empty($gaps)) {
+        if (empty($gaps)){
             $max = max($sequences);
-            if ($max === 0) {
+            if ($max === 0){
                 return 2;
             }
 
@@ -56,8 +56,8 @@ 
     {
         $skipped = [];
         $max = max($sequences);
-        for ($i = 0; $i < $max; $i++) {
-            if (!in_array($i, $sequences, true)) {
+        for ($i = 0; $i < $max; $i++){
+            if (!in_array($i, $sequences, true)){
                 $skipped[$i] = $i;
             }
         }

Braces +12 added lines, -6 removed lines

@@ -24,21 +24,25 @@ 
      */
     public function find(array $sequences, int $originSequence): int
     {
-        if (empty($sequences) || $originSequence > max($sequences)) {
+        if (empty($sequences) || $originSequence > max($sequences))
+        {
             return $originSequence;
         }
 
         $gaps = $this->skippedSequences($sequences);
 
-        if (isset($gaps[$originSequence])) {
+        if (isset($gaps[$originSequence]))
+        {
             return $originSequence;
         }
 
         //we do not add "1" as postfix: $var, $var2, $var3, etc
         unset($gaps[1]);
-        if (empty($gaps)) {
+        if (empty($gaps))
+        {
             $max = max($sequences);
-            if ($max === 0) {
+            if ($max === 0)
+            {
                 return 2;
             }
 
@@ -56,8 +60,10 @@ 
     {
         $skipped = [];
         $max = max($sequences);
-        for ($i = 0; $i < $max; $i++) {
-            if (!in_array($i, $sequences, true)) {
+        for ($i = 0; $i < $max; $i++)
+        {
+            if (!in_array($i, $sequences, true))
+            {
                 $skipped[$i] = $i;
             }
         }