spiral / framework

src/Queue/src/ContainerRegistry.php

Spacing +4 added lines, -4 removed lines

@@ -24,13 +24,13 @@ 
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try{
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface){
             throw new JobException("Unable to resolve job handler for `{$jobType}`");
         }
 
@@ -40,7 +40,7 @@ 
     private function className(string $jobType): string
     {
         $names = explode('.', $jobType);
-        $names = array_map(function (string $value) {
+        $names = array_map(function (string $value){
             return $this->inflector->classify($value);
         }, $names);
 

Braces +9 added lines, -4 removed lines

@@ -24,13 +24,17 @@ 
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try
+        {
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface)
+        {
             throw new JobException("Unable to resolve job handler for `{$jobType}`");
         }
 
@@ -40,7 +44,8 @@ 
     private function className(string $jobType): string
     {
         $names = explode('.', $jobType);
-        $names = array_map(function (string $value) {
+        $names = array_map(function (string $value)
+        {
             return $this->inflector->classify($value);
         }, $names);
 

src/Queue/src/Bootloader/QueueBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
             $registry = $container->get(HandlerRegistryInterface::class);
             $config = $container->get(QueueConfig::class);
 
-            foreach ($config->getRegistryHandlers() as $jobType => $handler) {
+            foreach ($config->getRegistryHandlers() as $jobType => $handler){
                 $registry->setHandler($jobType, $handler);
             }
         });
@@ -83,7 +83,7 @@ 
 
     private function registerJobsSerializer(Container $container): void
     {
-        $container->bindSingleton(SerializerInterface::class, static function () {
+        $container->bindSingleton(SerializerInterface::class, static function (){
             return new DefaultSerializer();
         });
     }

Braces +4 added lines, -2 removed lines

@@ -57,7 +57,8 @@ 
             $registry = $container->get(HandlerRegistryInterface::class);
             $config = $container->get(QueueConfig::class);
 
-            foreach ($config->getRegistryHandlers() as $jobType => $handler) {
+            foreach ($config->getRegistryHandlers() as $jobType => $handler)
+            {
                 $registry->setHandler($jobType, $handler);
             }
         });
@@ -83,7 +84,8 @@ 
 
     private function registerJobsSerializer(Container $container): void
     {
-        $container->bindSingleton(SerializerInterface::class, static function () {
+        $container->bindSingleton(SerializerInterface::class, static function ()
+        {
             return new DefaultSerializer();
         });
     }

src/Queue/src/DefaultSerializer.php

Spacing +4 added lines, -4 removed lines

@@ -16,9 +16,9 @@ 
      */
     public function serialize(array $payload): string
     {
-        try {
+        try{
             return \Opis\Closure\serialize($payload);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new SerializationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -28,9 +28,9 @@ 
      */
     public function deserialize(string $payload): array
     {
-        try {
+        try{
             return (array)\Opis\Closure\unserialize($payload);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new SerializationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }

Braces +10 added lines, -4 removed lines

@@ -16,9 +16,12 @@ 
      */
     public function serialize(array $payload): string
     {
-        try {
+        try
+        {
             return \Opis\Closure\serialize($payload);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new SerializationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -28,9 +31,12 @@ 
      */
     public function deserialize(string $payload): array
     {
-        try {
+        try
+        {
             return (array)\Opis\Closure\unserialize($payload);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new SerializationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }

src/AuthHttp/src/Middleware/AuthMiddleware.php

Braces +12 added lines, -6 removed lines

@@ -65,7 +65,8 @@ 
 
         $response = $this->scope->runScope(
             [AuthContextInterface::class => $authContext],
-            static function () use ($request, $handler, $authContext) {
+            static function () use ($request, $handler, $authContext)
+            {
                 return $handler->handle($request->withAttribute(self::ATTRIBUTE, $authContext));
             }
         );
@@ -75,14 +76,17 @@ 
 
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
     {
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
+        foreach ($this->transportRegistry->getTransports() as $name => $transport)
+        {
             $tokenID = $transport->fetchToken($request);
-            if ($tokenID === null) {
+            if ($tokenID === null)
+            {
                 continue;
             }
 
             $token = $this->tokenStorage->load($tokenID);
-            if ($token === null) {
+            if ($token === null)
+            {
                 continue;
             }
 
@@ -96,13 +100,15 @@ 
 
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if ($authContext->getToken() === null) {
+        if ($authContext->getToken() === null)
+        {
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed())
+        {
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(

src/Validation/src/Config/ValidatorConfig.php

Spacing +10 added lines, -10 removed lines

@@ -34,7 +34,7 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases'])){
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -50,12 +50,12 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name)){
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -69,12 +69,12 @@ 
 
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name)){
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null){
             return $instance;
         }
 
@@ -90,9 +90,9 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function)){
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false){
                 $function = explode(':', $function);
             }
         }
@@ -102,11 +102,11 @@ 
 
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name])){
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class'])){
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []
@@ -123,7 +123,7 @@ 
      */
     private function normalizeAliases(array $aliases): array
     {
-        return array_map(static function ($value) {
+        return array_map(static function ($value){
             return str_replace('::', ':', $value);
         }, $aliases);
     }

Braces +20 added lines, -10 removed lines

@@ -34,7 +34,8 @@ 
     public function __construct(array $config = [])
     {
         parent::__construct($config);
-        if (!empty($this->config['aliases'])) {
+        if (!empty($this->config['aliases']))
+        {
             $this->config['aliases'] = $this->normalizeAliases($this->config['aliases']);
         }
     }
@@ -50,12 +51,14 @@ 
      */
     public function getChecker(string $name): Autowire
     {
-        if (!$this->hasChecker($name)) {
+        if (!$this->hasChecker($name))
+        {
             throw new ValidationException("Undefined checker `{$name}``.");
         }
 
         $instance = $this->wire('checkers', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -69,12 +72,14 @@ 
 
     public function getCondition(string $name): Autowire
     {
-        if (!$this->hasCondition($name)) {
+        if (!$this->hasCondition($name))
+        {
             throw new ValidationException("Undefined condition `{$name}`.");
         }
 
         $instance = $this->wire('conditions', $name);
-        if ($instance !== null) {
+        if ($instance !== null)
+        {
             return $instance;
         }
 
@@ -90,9 +95,11 @@ 
      */
     public function mapFunction($function)
     {
-        if (is_string($function)) {
+        if (is_string($function))
+        {
             $function = $this->resolveAlias($function);
-            if (strpos($function, ':') !== false) {
+            if (strpos($function, ':') !== false)
+            {
                 $function = explode(':', $function);
             }
         }
@@ -102,11 +109,13 @@ 
 
     private function wire(string $section, string $name): ?Autowire
     {
-        if (is_string($this->config[$section][$name])) {
+        if (is_string($this->config[$section][$name]))
+        {
             return new Autowire($this->config[$section][$name]);
         }
 
-        if (isset($this->config[$section][$name]['class'])) {
+        if (isset($this->config[$section][$name]['class']))
+        {
             return new Autowire(
                 $this->config[$section][$name]['class'],
                 $this->config[$section][$name]['options'] ?? []
@@ -123,7 +132,8 @@ 
      */
     private function normalizeAliases(array $aliases): array
     {
-        return array_map(static function ($value) {
+        return array_map(static function ($value)
+        {
             return str_replace('::', ':', $value);
         }, $aliases);
     }

src/Http/src/Header/AcceptHeader.php

Spacing +17 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item){
             $this->addItem($item);
         }
     }
@@ -51,9 +51,9 @@ 
         $header = new static();
 
         $parts = explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part){
             $part = trim($part);
-            if ($part !== '') {
+            if ($part !== ''){
                 $header->addItem($part);
             }
         }
@@ -87,11 +87,11 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted){
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b){
                 return self::compare($a, $b) * -1;
             });
 
@@ -108,12 +108,12 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item)){
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
         /** @var AcceptHeaderItem|array $item  */
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem){
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -122,7 +122,7 @@ 
         }
 
         $value = strtolower($item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)){
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -137,9 +137,9 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality()){
             // If quality are same value with more params has more weight.
-            if (count($a->getParams()) === count($b->getParams())) {
+            if (count($a->getParams()) === count($b->getParams())){
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -158,11 +158,11 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false){
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB){
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -174,23 +174,23 @@ 
 
     private static function compareAtomic(string $a, string $b): int
     {
-        if (mb_strpos($a, '*/') === 0) {
+        if (mb_strpos($a, '*/') === 0){
             $a = '*';
         }
 
-        if (mb_strpos($b, '*/') === 0) {
+        if (mb_strpos($b, '*/') === 0){
             $b = '*';
         }
 
-        if (strtolower($a) === strtolower($b)) {
+        if (strtolower($a) === strtolower($b)){
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*'){
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*'){
             return 1;
         }
 

Braces +34 added lines, -17 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $this->addItem($item);
         }
     }
@@ -51,9 +52,11 @@ 
         $header = new static();
 
         $parts = explode(',', $raw);
-        foreach ($parts as $part) {
+        foreach ($parts as $part)
+        {
             $part = trim($part);
-            if ($part !== '') {
+            if ($part !== '')
+            {
                 $header->addItem($part);
             }
         }
@@ -87,11 +90,13 @@ 
      */
     public function getAll(): array
     {
-        if (!$this->sorted) {
+        if (!$this->sorted)
+        {
             /**
              * Sort item in descending order.
              */
-            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
+            uasort($this->items, static function (AcceptHeaderItem $a, AcceptHeaderItem $b)
+            {
                 return self::compare($a, $b) * -1;
             });
 
@@ -108,12 +113,14 @@ 
      */
     private function addItem($item): void
     {
-        if (is_scalar($item)) {
+        if (is_scalar($item))
+        {
             $item = AcceptHeaderItem::fromString((string)$item);
         }
 
         /** @var AcceptHeaderItem|array $item  */
-        if (!$item instanceof AcceptHeaderItem) {
+        if (!$item instanceof AcceptHeaderItem)
+        {
             throw new AcceptHeaderException(sprintf(
                 'Accept Header item expected to be an instance of `%s` or a string, got `%s`',
                 AcceptHeaderItem::class,
@@ -122,7 +129,8 @@ 
         }
 
         $value = strtolower($item->getValue());
-        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
+        if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1))
+        {
             $this->sorted = false;
             $this->items[$value] = $item;
         }
@@ -137,9 +145,11 @@ 
      */
     private static function compare(AcceptHeaderItem $a, AcceptHeaderItem $b): int
     {
-        if ($a->getQuality() === $b->getQuality()) {
+        if ($a->getQuality() === $b->getQuality())
+        {
             // If quality are same value with more params has more weight.
-            if (count($a->getParams()) === count($b->getParams())) {
+            if (count($a->getParams()) === count($b->getParams()))
+            {
                 // If quality and params then check for specific type or subtype.
                 // Means */* or * has less weight.
                 return static::compareValue($a->getValue(), $b->getValue());
@@ -158,11 +168,13 @@ 
     private static function compareValue(string $a, string $b): int
     {
         // Check "Accept" headers values with it is type and subtype.
-        if (strpos($a, '/') !== false && strpos($b, '/') !== false) {
+        if (strpos($a, '/') !== false && strpos($b, '/') !== false)
+        {
             [$typeA, $subtypeA] = explode('/', $a, 2);
             [$typeB, $subtypeB] = explode('/', $b, 2);
 
-            if ($typeA === $typeB) {
+            if ($typeA === $typeB)
+            {
                 return static::compareAtomic($subtypeA, $subtypeB);
             }
 
@@ -174,23 +186,28 @@ 
 
     private static function compareAtomic(string $a, string $b): int
     {
-        if (mb_strpos($a, '*/') === 0) {
+        if (mb_strpos($a, '*/') === 0)
+        {
             $a = '*';
         }
 
-        if (mb_strpos($b, '*/') === 0) {
+        if (mb_strpos($b, '*/') === 0)
+        {
             $b = '*';
         }
 
-        if (strtolower($a) === strtolower($b)) {
+        if (strtolower($a) === strtolower($b))
+        {
             return 0;
         }
 
-        if ($a === '*') {
+        if ($a === '*')
+        {
             return -1;
         }
 
-        if ($b === '*') {
+        if ($b === '*')
+        {
             return 1;
         }
 

src/Attributes/src/Internal/FallbackAttributeReader/AttributeParser.php

Spacing +13 added lines, -13 removed lines

@@ -105,8 +105,8 @@ 
     {
         $eval = new ConstExprEvaluator($this->evaluator($file, $context));
 
-        foreach ($groups as $group) {
-            foreach ($group->attrs as $attr) {
+        foreach ($groups as $group){
+            foreach ($group->attrs as $attr){
                 $arguments = $this->parseAttributeArguments($attr, $file, $eval);
 
                 yield new AttributePrototype($attr->name->toString(), $arguments);
@@ -123,8 +123,8 @@ 
 
     private function read(string $file): string
     {
-        if (!\is_readable($file)) {
-            throw new \InvalidArgumentException('Unable to read file "' . $file . '"');
+        if (!\is_readable($file)){
+            throw new \InvalidArgumentException('Unable to read file "'.$file.'"');
         }
 
         return \file_get_contents($file);
@@ -133,7 +133,7 @@ 
     private function evaluator(string $file, array $context): \Closure
     {
         return static function (Expr $expr) use ($file, $context) {
-            switch (\get_class($expr)) {
+            switch (\get_class($expr)){
                 case Scalar\MagicConst\File::class:
                     return $file;
 
@@ -147,19 +147,19 @@ 
                     $namespace = $context[self::CTX_NAMESPACE] ?? '';
                     $function = $context[self::CTX_FUNCTION] ?? '';
 
-                    return \ltrim($namespace . '\\' . $function, '\\');
+                    return \ltrim($namespace.'\\'.$function, '\\');
 
                 case Expr\ClassConstFetch::class:
                     $constant = $expr->name->toString();
                     $class = $expr->class->toString();
 
-                    if (\strtolower($constant) === 'class') {
+                    if (\strtolower($constant) === 'class'){
                         return $class;
                     }
 
-                    $definition = $class . '::' . $constant;
+                    $definition = $class.'::'.$constant;
 
-                    if (!\defined($definition)) {
+                    if (!\defined($definition)){
                         $exception = new \ParseError(\sprintf(self::ERROR_BAD_CONSTANT, $definition));
                         throw Exception::withLocation($exception, $file, $expr->getStartLine());
                     }
@@ -167,7 +167,7 @@ 
                     return \constant($definition);
             }
 
-            if ($expr instanceof Scalar\MagicConst) {
+            if ($expr instanceof Scalar\MagicConst){
                 return $context[$expr->getName()] ?? '';
             }
 
@@ -185,13 +185,13 @@ 
         $hasNamedArguments = false;
         $arguments = [];
 
-        foreach ($attr->args as $argument) {
+        foreach ($attr->args as $argument){
             $value = $eval->evaluateDirectly($argument->value);
 
-            if ($argument->name === null) {
+            if ($argument->name === null){
                 $arguments[] = $value;
 
-                if ($hasNamedArguments) {
+                if ($hasNamedArguments){
                     $exception = new \ParseError(self::ERROR_NAMED_ARGUMENTS_ORDER);
                     throw Exception::withLocation($exception, $file, $argument->getStartLine());
                 }

Braces +22 added lines, -11 removed lines

@@ -105,8 +105,10 @@ 
     {
         $eval = new ConstExprEvaluator($this->evaluator($file, $context));
 
-        foreach ($groups as $group) {
-            foreach ($group->attrs as $attr) {
+        foreach ($groups as $group)
+        {
+            foreach ($group->attrs as $attr)
+            {
                 $arguments = $this->parseAttributeArguments($attr, $file, $eval);
 
                 yield new AttributePrototype($attr->name->toString(), $arguments);
@@ -123,7 +125,8 @@ 
 
     private function read(string $file): string
     {
-        if (!\is_readable($file)) {
+        if (!\is_readable($file))
+        {
             throw new \InvalidArgumentException('Unable to read file "' . $file . '"');
         }
 
@@ -132,8 +135,10 @@ 
 
     private function evaluator(string $file, array $context): \Closure
     {
-        return static function (Expr $expr) use ($file, $context) {
-            switch (\get_class($expr)) {
+        return static function (Expr $expr) use ($file, $context)
+        {
+            switch (\get_class($expr))
+            {
                 case Scalar\MagicConst\File::class:
                     return $file;
 
@@ -153,13 +158,15 @@ 
                     $constant = $expr->name->toString();
                     $class = $expr->class->toString();
 
-                    if (\strtolower($constant) === 'class') {
+                    if (\strtolower($constant) === 'class')
+                    {
                         return $class;
                     }
 
                     $definition = $class . '::' . $constant;
 
-                    if (!\defined($definition)) {
+                    if (!\defined($definition))
+                    {
                         $exception = new \ParseError(\sprintf(self::ERROR_BAD_CONSTANT, $definition));
                         throw Exception::withLocation($exception, $file, $expr->getStartLine());
                     }
@@ -167,7 +174,8 @@ 
                     return \constant($definition);
             }
 
-            if ($expr instanceof Scalar\MagicConst) {
+            if ($expr instanceof Scalar\MagicConst)
+            {
                 return $context[$expr->getName()] ?? '';
             }
 
@@ -185,13 +193,16 @@ 
         $hasNamedArguments = false;
         $arguments = [];
 
-        foreach ($attr->args as $argument) {
+        foreach ($attr->args as $argument)
+        {
             $value = $eval->evaluateDirectly($argument->value);
 
-            if ($argument->name === null) {
+            if ($argument->name === null)
+            {
                 $arguments[] = $value;
 
-                if ($hasNamedArguments) {
+                if ($hasNamedArguments)
+                {
                     $exception = new \ParseError(self::ERROR_NAMED_ARGUMENTS_ORDER);
                     throw Exception::withLocation($exception, $file, $argument->getStartLine());
                 }

src/Attributes/src/Internal/FallbackAttributeReader/AttributeFinderVisitor.php

Spacing +18 added lines, -18 removed lines

@@ -140,23 +140,23 @@ 
     {
         $this->updateContext($node);
 
-        if ($node instanceof Node\Stmt\ClassLike) {
-            foreach ($this->parse($node->attrGroups) as $prototype) {
+        if ($node instanceof Node\Stmt\ClassLike){
+            foreach ($this->parse($node->attrGroups) as $prototype){
                 $this->classes[$node->namespacedName->toString()][] = $prototype;
             }
 
             return null;
         }
 
-        if ($node instanceof Node\FunctionLike) {
+        if ($node instanceof Node\FunctionLike){
             $line = $node->getEndLine();
 
-            foreach ($this->parse($node->getAttrGroups()) as $prototype) {
+            foreach ($this->parse($node->getAttrGroups()) as $prototype){
                 $this->functions[$line][] = $prototype;
             }
 
-            foreach ($node->getParams() as $param) {
-                foreach ($this->parse($param->attrGroups) as $prototype) {
+            foreach ($node->getParams() as $param){
+                foreach ($this->parse($param->attrGroups) as $prototype){
                     assert(\is_string($param->var->name), 'Function parameter name should be an identifier');
 
                     $this->parameters[$line][$param->var->name][] = $prototype;
@@ -166,11 +166,11 @@ 
             return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
-        if ($node instanceof Node\Stmt\ClassConst) {
+        if ($node instanceof Node\Stmt\ClassConst){
             $class = $this->fqn();
 
-            foreach ($this->parse($node->attrGroups) as $prototype) {
-                foreach ($node->consts as $const) {
+            foreach ($this->parse($node->attrGroups) as $prototype){
+                foreach ($node->consts as $const){
                     $this->constants[$class][$this->name($const->name)][] = $prototype;
                 }
             }
@@ -178,11 +178,11 @@ 
             return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
-        if ($node instanceof Property) {
+        if ($node instanceof Property){
             $class = $this->fqn();
 
-            foreach ($this->parse($node->attrGroups) as $prototype) {
-                foreach ($node->props as $property) {
+            foreach ($this->parse($node->attrGroups) as $prototype){
+                foreach ($node->props as $property){
                     $this->properties[$class][$this->name($property->name)][] = $prototype;
                 }
             }
@@ -195,27 +195,27 @@ 
 
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\Namespace_) {
+        if ($node instanceof Node\Stmt\Namespace_){
             $this->context[AttributeParser::CTX_NAMESPACE] = '';
 
             return;
         }
 
-        if ($node instanceof Node\Stmt\ClassLike) {
+        if ($node instanceof Node\Stmt\ClassLike){
             $this->context[AttributeParser::CTX_CLASS] = '';
             $this->context[AttributeParser::CTX_TRAIT] = '';
 
             return;
         }
 
-        if ($node instanceof Node\FunctionLike) {
+        if ($node instanceof Node\FunctionLike){
             $this->context[AttributeParser::CTX_FUNCTION] = '';
         }
     }
 
     private function updateContext(Node $node): void
     {
-        switch (true) {
+        switch (true){
             case $node instanceof Node\Stmt\Namespace_:
                 $this->context[AttributeParser::CTX_NAMESPACE] = $this->name($node->name);
                 break;
@@ -240,7 +240,7 @@ 
      */
     private function name($name): string
     {
-        if ($name === null) {
+        if ($name === null){
             return '';
         }
 
@@ -262,6 +262,6 @@ 
         $namespace = $this->context[AttributeParser::CTX_NAMESPACE] ?? '';
         $class = $this->context[AttributeParser::CTX_CLASS] ?? '';
 
-        return \trim($namespace . '\\' . $class, '\\');
+        return \trim($namespace.'\\'.$class, '\\');
     }
 }

Braces +34 added lines, -17 removed lines

@@ -140,23 +140,29 @@ 
     {
         $this->updateContext($node);
 
-        if ($node instanceof Node\Stmt\ClassLike) {
-            foreach ($this->parse($node->attrGroups) as $prototype) {
+        if ($node instanceof Node\Stmt\ClassLike)
+        {
+            foreach ($this->parse($node->attrGroups) as $prototype)
+            {
                 $this->classes[$node->namespacedName->toString()][] = $prototype;
             }
 
             return null;
         }
 
-        if ($node instanceof Node\FunctionLike) {
+        if ($node instanceof Node\FunctionLike)
+        {
             $line = $node->getEndLine();
 
-            foreach ($this->parse($node->getAttrGroups()) as $prototype) {
+            foreach ($this->parse($node->getAttrGroups()) as $prototype)
+            {
                 $this->functions[$line][] = $prototype;
             }
 
-            foreach ($node->getParams() as $param) {
-                foreach ($this->parse($param->attrGroups) as $prototype) {
+            foreach ($node->getParams() as $param)
+            {
+                foreach ($this->parse($param->attrGroups) as $prototype)
+                {
                     assert(\is_string($param->var->name), 'Function parameter name should be an identifier');
 
                     $this->parameters[$line][$param->var->name][] = $prototype;
@@ -166,11 +172,14 @@ 
             return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
-        if ($node instanceof Node\Stmt\ClassConst) {
+        if ($node instanceof Node\Stmt\ClassConst)
+        {
             $class = $this->fqn();
 
-            foreach ($this->parse($node->attrGroups) as $prototype) {
-                foreach ($node->consts as $const) {
+            foreach ($this->parse($node->attrGroups) as $prototype)
+            {
+                foreach ($node->consts as $const)
+                {
                     $this->constants[$class][$this->name($const->name)][] = $prototype;
                 }
             }
@@ -178,11 +187,14 @@ 
             return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
         }
 
-        if ($node instanceof Property) {
+        if ($node instanceof Property)
+        {
             $class = $this->fqn();
 
-            foreach ($this->parse($node->attrGroups) as $prototype) {
-                foreach ($node->props as $property) {
+            foreach ($this->parse($node->attrGroups) as $prototype)
+            {
+                foreach ($node->props as $property)
+                {
                     $this->properties[$class][$this->name($property->name)][] = $prototype;
                 }
             }
@@ -195,27 +207,31 @@ 
 
     public function leaveNode(Node $node): void
     {
-        if ($node instanceof Node\Stmt\Namespace_) {
+        if ($node instanceof Node\Stmt\Namespace_)
+        {
             $this->context[AttributeParser::CTX_NAMESPACE] = '';
 
             return;
         }
 
-        if ($node instanceof Node\Stmt\ClassLike) {
+        if ($node instanceof Node\Stmt\ClassLike)
+        {
             $this->context[AttributeParser::CTX_CLASS] = '';
             $this->context[AttributeParser::CTX_TRAIT] = '';
 
             return;
         }
 
-        if ($node instanceof Node\FunctionLike) {
+        if ($node instanceof Node\FunctionLike)
+        {
             $this->context[AttributeParser::CTX_FUNCTION] = '';
         }
     }
 
     private function updateContext(Node $node): void
     {
-        switch (true) {
+        switch (true)
+        {
             case $node instanceof Node\Stmt\Namespace_:
                 $this->context[AttributeParser::CTX_NAMESPACE] = $this->name($node->name);
                 break;
@@ -240,7 +256,8 @@ 
      */
     private function name($name): string
     {
-        if ($name === null) {
+        if ($name === null)
+        {
             return '';
         }
 

src/Prototype/src/NodeVisitors/UpdateConstructor.php

Spacing +26 added lines, -26 removed lines

@@ -38,13 +38,13 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_){
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams){
             $this->addParentConstructorCall($constructor);
         }
 
@@ -60,7 +60,7 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             array_unshift($constructor->params, $this->buildConstructorParam($dependency));
             array_unshift(
                 $constructor->stmts,
@@ -83,34 +83,34 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param){
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type)){
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable){
                     $type = "?$type";
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef){
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic){
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault){
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies) {
+        if ($parentConstructorDependencies){
             array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -140,18 +140,18 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             $params[] = new Annotation\Line(
                 sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor){
+            foreach ($this->definition->constructorParams as $param){
+                if (!empty($param->type)){
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable){
                         $type = "$type|null";
                     }
 
@@ -159,7 +159,7 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }else{
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -170,12 +170,12 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line){
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return'])){
                 // insert before given node
                 $placementID--;
                 break;
@@ -184,7 +184,7 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty()){
             $placementID++;
         }
 
@@ -195,9 +195,9 @@ 
 
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $dependency->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
@@ -208,15 +208,15 @@ 
 
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $param->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias){
             return $param->type->alias;
         }
 

Braces +53 added lines, -26 removed lines

@@ -38,13 +38,15 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_)
+        {
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams)
+        {
             $this->addParentConstructorCall($constructor);
         }
 
@@ -60,7 +62,8 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             array_unshift($constructor->params, $this->buildConstructorParam($dependency));
             array_unshift(
                 $constructor->stmts,
@@ -83,34 +86,41 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param)
+        {
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type))
+            {
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable)
+                {
                     $type = "?$type";
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef)
+            {
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic)
+            {
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault)
+            {
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies) {
+        if ($parentConstructorDependencies)
+        {
             array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -140,18 +150,23 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             $params[] = new Annotation\Line(
                 sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor)
+        {
+            foreach ($this->definition->constructorParams as $param)
+            {
+                if (!empty($param->type))
+                {
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable)
+                    {
                         $type = "$type|null";
                     }
 
@@ -159,7 +174,9 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }
+                else
+                {
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -170,12 +187,14 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line)
+        {
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return']))
+            {
                 // insert before given node
                 $placementID--;
                 break;
@@ -184,7 +203,8 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty())
+        {
             $placementID++;
         }
 
@@ -195,9 +215,12 @@ 
 
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $dependency->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
@@ -208,15 +231,19 @@ 
 
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $param->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias)
+        {
             return $param->type->alias;
         }