spiral / framework

src/Framework/Bootloader/Distribution/DistributionConfig.php

Spacing +27 added lines, -27 removed lines

@@ -71,8 +71,8 @@ 
      */
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -80,7 +80,7 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -100,9 +100,9 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null){
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -121,13 +121,13 @@ 
      */
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type'])){
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
         $type = $config['type'];
 
-        switch ($type) {
+        switch ($type){
             case 'static':
                 return $this->createStaticResolver($name, $config);
 
@@ -150,17 +150,17 @@ 
      */
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true)){
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options'])){
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try{
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -174,32 +174,32 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region'])){
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret'])){
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket'])){
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? '')){
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? '')){
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0)){
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -224,15 +224,15 @@ 
      */
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private'])){
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain'])){
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
@@ -250,7 +250,7 @@ 
      */
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri'])){
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -265,17 +265,17 @@ 
      */
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? '')){
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 
-        switch (true) {
+        switch (true){
             case isset($config['factory']):
                 /** @var UriFactoryInterface $factory */
                 $factory = new $config['factory']();
 
-                if (!$factory instanceof UriFactoryInterface) {
-                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 ' .
+                if (!$factory instanceof UriFactoryInterface){
+                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 '.
                         'uri factory implementation, but `%s` given';
                     throw new InvalidArgumentException(\sprintf($message, $name, $config['factory']));
                 }
@@ -289,7 +289,7 @@ 
                 return new GuzzleUri($uri);
 
             default:
-                $message = 'Can not resolve available PSR-7 UriFactory implementation; ' .
+                $message = 'Can not resolve available PSR-7 UriFactory implementation; '.
                     'Please define `factory` config section in `%s` distribution driver config';
                 throw new InvalidArgumentException(\sprintf($message, $name));
         }

src/Distribution/src/Resolver/StaticResolver.php

Spacing +1 added lines, -1 removed lines

@@ -75,6 +75,6 @@
         $prefix = \trim($this->host->getPath(), self::URI_PATH_DELIMITER);
         $file = \trim($file, self::URI_PATH_DELIMITER);
 
-        return self::URI_PATH_DELIMITER . ('' === $prefix ? '' : $prefix . self::URI_PATH_DELIMITER) . $file;
+        return self::URI_PATH_DELIMITER.('' === $prefix ? '' : $prefix.self::URI_PATH_DELIMITER).$file;
     }
 }

src/Framework/Command/Cycle/Generator/ShowChanges.php

Spacing +18 added lines, -18 removed lines

@@ -42,12 +42,12 @@ 
         $this->output->writeln('<info>Detecting schema changes:</info>');
 
         $this->changes = [];
-        foreach ($registry->getIterator() as $e) {
-            if ($registry->hasTable($e)) {
+        foreach ($registry->getIterator() as $e){
+            if ($registry->hasTable($e)){
                 $table = $registry->getTableSchema($e);
 
-                if ($table->getComparator()->hasChanges()) {
-                    $key = $registry->getDatabase($e) . ':' . $registry->getTable($e);
+                if ($table->getComparator()->hasChanges()){
+                    $key = $registry->getDatabase($e).':'.$registry->getTable($e);
                     $this->changes[$key] = [
                         'database' => $registry->getDatabase($e),
                         'table'    => $registry->getTable($e),
@@ -57,13 +57,13 @@ 
             }
         }
 
-        if ($this->changes === []) {
+        if ($this->changes === []){
             $this->output->writeln('<fg=yellow>no database changes has been detected</fg=yellow>');
 
             return $registry;
         }
 
-        foreach ($this->changes as $change) {
+        foreach ($this->changes as $change){
             $this->output->write(sprintf('• <fg=cyan>%s.%s</fg=cyan>', $change['database'], $change['table']));
             $this->describeChanges($change['schema']);
         }
@@ -84,7 +84,7 @@ 
      */
     protected function describeChanges(AbstractTable $table): void
     {
-        if (!$this->output->isVerbose()) {
+        if (!$this->output->isVerbose()){
             $this->output->writeln(
                 sprintf(
                     ': <fg=green>%s</fg=green> change(s) detected',
@@ -97,11 +97,11 @@ 
         $this->output->write("\n");
 
 
-        if (!$table->exists()) {
+        if (!$table->exists()){
             $this->output->writeln('    - create table');
         }
 
-        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED) {
+        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED){
             $this->output->writeln('    - drop table');
             return;
         }
@@ -118,15 +118,15 @@ 
      */
     protected function describeColumns(Comparator $cmp): void
     {
-        foreach ($cmp->addedColumns() as $column) {
+        foreach ($cmp->addedColumns() as $column){
             $this->output->writeln("    - add column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedColumns() as $column) {
+        foreach ($cmp->droppedColumns() as $column){
             $this->output->writeln("    - drop column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredColumns() as $column) {
+        foreach ($cmp->alteredColumns() as $column){
             $column = $column[0];
             $this->output->writeln("    - alter column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
@@ -137,17 +137,17 @@ 
      */
     protected function describeIndexes(Comparator $cmp): void
     {
-        foreach ($cmp->addedIndexes() as $index) {
+        foreach ($cmp->addedIndexes() as $index){
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->droppedIndexes() as $index) {
+        foreach ($cmp->droppedIndexes() as $index){
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - drop index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->alteredIndexes() as $index) {
+        foreach ($cmp->alteredIndexes() as $index){
             $index = $index[0];
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -159,17 +159,17 @@ 
      */
     protected function describeFKs(Comparator $cmp): void
     {
-        foreach ($cmp->addedForeignKeys() as $fk) {
+        foreach ($cmp->addedForeignKeys() as $fk){
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fkColumns}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedForeignKeys() as $fk) {
+        foreach ($cmp->droppedForeignKeys() as $fk){
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredForeignKeys() as $fk) {
+        foreach ($cmp->alteredForeignKeys() as $fk){
             $fk = $fk[0];
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fkColumns}</fg=yellow>");

Braces +34 added lines, -17 removed lines

@@ -42,11 +42,14 @@ 
         $this->output->writeln('<info>Detecting schema changes:</info>');
 
         $this->changes = [];
-        foreach ($registry->getIterator() as $e) {
-            if ($registry->hasTable($e)) {
+        foreach ($registry->getIterator() as $e)
+        {
+            if ($registry->hasTable($e))
+            {
                 $table = $registry->getTableSchema($e);
 
-                if ($table->getComparator()->hasChanges()) {
+                if ($table->getComparator()->hasChanges())
+                {
                     $key = $registry->getDatabase($e) . ':' . $registry->getTable($e);
                     $this->changes[$key] = [
                         'database' => $registry->getDatabase($e),
@@ -57,13 +60,15 @@ 
             }
         }
 
-        if ($this->changes === []) {
+        if ($this->changes === [])
+        {
             $this->output->writeln('<fg=yellow>no database changes has been detected</fg=yellow>');
 
             return $registry;
         }
 
-        foreach ($this->changes as $change) {
+        foreach ($this->changes as $change)
+        {
             $this->output->write(sprintf('• <fg=cyan>%s.%s</fg=cyan>', $change['database'], $change['table']));
             $this->describeChanges($change['schema']);
         }
@@ -84,7 +89,8 @@ 
      */
     protected function describeChanges(AbstractTable $table): void
     {
-        if (!$this->output->isVerbose()) {
+        if (!$this->output->isVerbose())
+        {
             $this->output->writeln(
                 sprintf(
                     ': <fg=green>%s</fg=green> change(s) detected',
@@ -97,11 +103,13 @@ 
         $this->output->write("\n");
 
 
-        if (!$table->exists()) {
+        if (!$table->exists())
+        {
             $this->output->writeln('    - create table');
         }
 
-        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED) {
+        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED)
+        {
             $this->output->writeln('    - drop table');
             return;
         }
@@ -118,15 +126,18 @@ 
      */
     protected function describeColumns(Comparator $cmp): void
     {
-        foreach ($cmp->addedColumns() as $column) {
+        foreach ($cmp->addedColumns() as $column)
+        {
             $this->output->writeln("    - add column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedColumns() as $column) {
+        foreach ($cmp->droppedColumns() as $column)
+        {
             $this->output->writeln("    - drop column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredColumns() as $column) {
+        foreach ($cmp->alteredColumns() as $column)
+        {
             $column = $column[0];
             $this->output->writeln("    - alter column <fg=yellow>{$column->getName()}</fg=yellow>");
         }
@@ -137,17 +148,20 @@ 
      */
     protected function describeIndexes(Comparator $cmp): void
     {
-        foreach ($cmp->addedIndexes() as $index) {
+        foreach ($cmp->addedIndexes() as $index)
+        {
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->droppedIndexes() as $index) {
+        foreach ($cmp->droppedIndexes() as $index)
+        {
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - drop index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->alteredIndexes() as $index) {
+        foreach ($cmp->alteredIndexes() as $index)
+        {
             $index = $index[0];
             $index = implode(', ', $index->getColumns());
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -159,17 +173,20 @@ 
      */
     protected function describeFKs(Comparator $cmp): void
     {
-        foreach ($cmp->addedForeignKeys() as $fk) {
+        foreach ($cmp->addedForeignKeys() as $fk)
+        {
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fkColumns}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedForeignKeys() as $fk) {
+        foreach ($cmp->droppedForeignKeys() as $fk)
+        {
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredForeignKeys() as $fk) {
+        foreach ($cmp->alteredForeignKeys() as $fk)
+        {
             $fk = $fk[0];
             $fkColumns = implode(', ', $fk->getColumns());
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fkColumns}</fg=yellow>");