spiral / framework

tests/Framework/Cycle/MigrateTest.php

Spacing +5 added lines, -5 removed lines

@@ -37,13 +37,13 @@
         $output = $this->runCommandDebug('cycle:migrate', ['-r' => true]);
         $this->assertContains('default.users', $output);
 
-        $user = file_get_contents(__DIR__ . '/../../app/src/User/User.php');
-        unlink(__DIR__ . '/../../app/src/User/User.php');
-        try {
+        $user = file_get_contents(__DIR__.'/../../app/src/User/User.php');
+        unlink(__DIR__.'/../../app/src/User/User.php');
+        try{
             $output = $this->runCommandDebug('cycle:migrate', ['-r' => true]);
             $this->assertContains('drop foreign key', $output);
-        } finally {
-            file_put_contents(__DIR__ . '/../../app/src/User/User.php', $user);
+        }finally{
+            file_put_contents(__DIR__.'/../../app/src/User/User.php', $user);
         }
     }
 }
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -39,10 +39,13 @@
 
         $user = file_get_contents(__DIR__ . '/../../app/src/User/User.php');
         unlink(__DIR__ . '/../../app/src/User/User.php');
-        try {
+        try
+        {
             $output = $this->runCommandDebug('cycle:migrate', ['-r' => true]);
             $this->assertContains('drop foreign key', $output);
-        } finally {
+        }
+        finally
+        {
             file_put_contents(__DIR__ . '/../../app/src/User/User.php', $user);
         }
     }

tests/Framework/Jobs/DispatcherTest.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "id": "1", 
                   "job": "spiral.app.job.TestJob"
@@ -66,7 +66,7 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = '{
                   "id": "1", 
                   "job": "spiral.app.job.ErrorJob"
@@ -82,7 +82,7 @@ 
         $w->shouldReceive('receive')->once()->andReturn(null);
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(0, $files);
@@ -90,7 +90,7 @@ 
         $this->app->get(JobDispatcher::class)->serve();
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(1, $files);

Braces +4 added lines, -2 removed lines

@@ -38,7 +38,8 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "id": "1", 
                   "job": "spiral.app.job.TestJob"
@@ -66,7 +67,8 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = '{
                   "id": "1", 
                   "job": "spiral.app.job.ErrorJob"

tests/app/src/Bootloader/AppBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         PermissionsInterface $rbac,
         ViewsBootloader $views,
         ValidationBootloader $validation
-    ) {
+    ){
         $rbac->addRole('user');
         $rbac->associate('user', '*');
 
@@ -40,7 +40,7 @@ 
 
         $router->setDefault($route->withDefaults(['name' => 'Dave']));
 
-        $views->addDirectory('custom', __DIR__ . '/../../views/custom/');
+        $views->addDirectory('custom', __DIR__.'/../../views/custom/');
         $views->addEngine(TestEngine::class);
 
         $validation->addAlias('aliased', 'notEmpty');

tests/app/src/Job/ErrorJob.php

Braces +3 added lines, -1 removed lines

@@ -12,8 +12,10 @@
 
 class ErrorJob extends AbstractJob
 {
-    public function do()
+    public function do{
+        ()
     {
         throw new \ErrorException("bad job");
     }
+    }
 }
\ No newline at end of file

tests/app/src/Job/TestJob.php

Braces +3 added lines, -1 removed lines

@@ -13,8 +13,10 @@
 
 class TestJob extends AbstractJob
 {
-    public function do(EnvironmentInterface $env)
+    public function do{
+        (EnvironmentInterface $env)
     {
         $env->set('FIRED', true);
     }
+    }
 }
\ No newline at end of file

src/Command/Cycle/Generator/ShowChanges.php

Spacing +18 added lines, -18 removed lines

@@ -40,11 +40,11 @@ 
         $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()){
                     $this->changes[] = [
                         'database' => $registry->getDatabase($e),
                         'table'    => $registry->getTable($e),
@@ -54,13 +54,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']);
         }
@@ -73,22 +73,22 @@ 
      */
     protected function describeChanges(AbstractTable $table)
     {
-        if (!$this->output->isVerbose()) {
+        if (!$this->output->isVerbose()){
             $this->output->writeln(sprintf(
                 ": <fg=green>%s</fg=green> change(s) detected",
                 $this->numChanges($table)
             ));
 
             return;
-        } else {
+        }else{
             $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;
         }
@@ -105,15 +105,15 @@ 
      */
     protected function describeColumns(Comparator $cmp)
     {
-        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>");
         }
@@ -124,17 +124,17 @@ 
      */
     protected function describeIndexes(Comparator $cmp)
     {
-        foreach ($cmp->addedIndexes() as $index) {
+        foreach ($cmp->addedIndexes() as $index){
             $index = join(', ', $index->getColumns());
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->droppedIndexes() as $index) {
+        foreach ($cmp->droppedIndexes() as $index){
             $index = join(', ', $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 = join(', ', $index->getColumns());
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -146,15 +146,15 @@ 
      */
     protected function describeFKs(Comparator $cmp)
     {
-        foreach ($cmp->addedForeignKeys() as $fk) {
+        foreach ($cmp->addedForeignKeys() as $fk){
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedForeignKeys() as $fk) {
+        foreach ($cmp->droppedForeignKeys() as $fk){
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredForeignKeys() as $fk) {
+        foreach ($cmp->alteredForeignKeys() as $fk){
             $fk = $fk[0];
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }

Braces +37 added lines, -18 removed lines

@@ -40,11 +40,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())
+                {
                     $this->changes[] = [
                         'database' => $registry->getDatabase($e),
                         'table'    => $registry->getTable($e),
@@ -54,13 +57,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']);
         }
@@ -73,22 +78,27 @@ 
      */
     protected function describeChanges(AbstractTable $table)
     {
-        if (!$this->output->isVerbose()) {
+        if (!$this->output->isVerbose())
+        {
             $this->output->writeln(sprintf(
                 ": <fg=green>%s</fg=green> change(s) detected",
                 $this->numChanges($table)
             ));
 
             return;
-        } else {
+        }
+        else
+        {
             $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;
         }
@@ -105,15 +115,18 @@ 
      */
     protected function describeColumns(Comparator $cmp)
     {
-        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>");
         }
@@ -124,17 +137,20 @@ 
      */
     protected function describeIndexes(Comparator $cmp)
     {
-        foreach ($cmp->addedIndexes() as $index) {
+        foreach ($cmp->addedIndexes() as $index)
+        {
             $index = join(', ', $index->getColumns());
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
         }
 
-        foreach ($cmp->droppedIndexes() as $index) {
+        foreach ($cmp->droppedIndexes() as $index)
+        {
             $index = join(', ', $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 = join(', ', $index->getColumns());
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -146,15 +162,18 @@ 
      */
     protected function describeFKs(Comparator $cmp)
     {
-        foreach ($cmp->addedForeignKeys() as $fk) {
+        foreach ($cmp->addedForeignKeys() as $fk)
+        {
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }
 
-        foreach ($cmp->droppedForeignKeys() as $fk) {
+        foreach ($cmp->droppedForeignKeys() as $fk)
+        {
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }
 
-        foreach ($cmp->alteredForeignKeys() as $fk) {
+        foreach ($cmp->alteredForeignKeys() as $fk)
+        {
             $fk = $fk[0];
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fk->getColumn()}</fg=yellow>");
         }

src/Http/Middleware/SessionMiddleware.php

Braces +15 added lines, -7 removed lines

@@ -69,14 +69,18 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try
+        {
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
-                function () use ($session, $request, $handler) {
+                function () use ($session, $request, $handler)
+                {
                     return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
                 }
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $session->abort();
             throw $e;
         }
@@ -95,14 +99,16 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted())
+        {
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) != $session->getID()) {
+        if ($this->fetchID($request) != $session->getID())
+        {
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -119,7 +125,8 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()]))
+        {
             return null;
         }
 
@@ -152,7 +159,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (static::SIGNATURE_HEADERS as $header) {
+        foreach (static::SIGNATURE_HEADERS as $header)
+        {
             $signature .= $request->getHeaderLine($header) . ';';
         }
 

Spacing +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
         CookiesConfig $cookiesConfig,
         SessionFactory $factory,
         ScopeInterface $scope
-    ) {
+    ){
         $this->config = $config;
         $this->httpConfig = $httpConfig;
         $this->cookiesConfig = $cookiesConfig;
@@ -76,14 +76,14 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try{
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
                 function () use ($session, $request, $handler) {
                     return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session));
                 }
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $session->abort();
             throw $e;
         }
@@ -102,14 +102,14 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted()){
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) != $session->getID()) {
+        if ($this->fetchID($request) != $session->getID()){
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -126,7 +126,7 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()])){
             return null;
         }
 
@@ -159,8 +159,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (static::SIGNATURE_HEADERS as $header) {
-            $signature .= $request->getHeaderLine($header) . ';';
+        foreach (static::SIGNATURE_HEADERS as $header){
+            $signature .= $request->getHeaderLine($header).';';
         }
 
         return hash('sha256', $signature);

src/GRPC/ServiceLocator.php

Spacing +4 added lines, -4 removed lines

@@ -38,15 +38,15 @@
     public function getServices(): array
     {
         $result = [];
-        foreach ($this->classes->getClasses(ServiceInterface::class) as $service) {
-            if (!$service->isInstantiable()) {
+        foreach ($this->classes->getClasses(ServiceInterface::class) as $service){
+            if (!$service->isInstantiable()){
                 continue;
             }
 
             $instance = $this->container->get($service->getName());
 
-            foreach ($service->getInterfaces() as $interface) {
-                if ($interface->isSubclassOf(ServiceInterface::class)) {
+            foreach ($service->getInterfaces() as $interface){
+                if ($interface->isSubclassOf(ServiceInterface::class)){
                     $result[$interface->getName()] = $instance;
                 }
             }

Braces +8 added lines, -4 removed lines

@@ -38,15 +38,19 @@
     public function getServices(): array
     {
         $result = [];
-        foreach ($this->classes->getClasses(ServiceInterface::class) as $service) {
-            if (!$service->isInstantiable()) {
+        foreach ($this->classes->getClasses(ServiceInterface::class) as $service)
+        {
+            if (!$service->isInstantiable())
+            {
                 continue;
             }
 
             $instance = $this->container->get($service->getName());
 
-            foreach ($service->getInterfaces() as $interface) {
-                if ($interface->isSubclassOf(ServiceInterface::class)) {
+            foreach ($service->getInterfaces() as $interface)
+            {
+                if ($interface->isSubclassOf(ServiceInterface::class))
+                {
                     $result[$interface->getName()] = $instance;
                 }
             }

src/GRPC/GRPCDispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
         EnvironmentInterface $env,
         FinalizerInterface $finalizer,
         ContainerInterface $container
-    ) {
+    ){
         $this->env = $env;
         $this->finalizer = $finalizer;
         $this->container = $container;
@@ -65,12 +65,12 @@ 
         $worker = $this->container->get(Worker::class);
         $locator = $this->container->get(LocatorInterface::class);
 
-        foreach ($locator->getServices() as $interface => $service) {
+        foreach ($locator->getServices() as $interface => $service){
             $server->registerService($interface, $service);
         }
 
-        $server->serve($worker, function (\Throwable $e = null) {
-            if ($e !== null) {
+        $server->serve($worker, function (\Throwable $e = null){
+            if ($e !== null){
                 $this->handleException($e);
             }
 
@@ -83,9 +83,9 @@ 
      */
     protected function handleException(\Throwable $e)
     {
-        try {
+        try{
             $this->container->get(SnapshotterInterface::class)->register($e);
-        } catch (\Throwable|ContainerExceptionInterface $se) {
+        }catch (\Throwable | ContainerExceptionInterface $se){
             // no need to notify when unable to register an exception
         }
     }

Braces +11 added lines, -5 removed lines

@@ -65,12 +65,15 @@ 
         $worker = $this->container->get(Worker::class);
         $locator = $this->container->get(LocatorInterface::class);
 
-        foreach ($locator->getServices() as $interface => $service) {
+        foreach ($locator->getServices() as $interface => $service)
+        {
             $server->registerService($interface, $service);
         }
 
-        $server->serve($worker, function (\Throwable $e = null) {
-            if ($e !== null) {
+        $server->serve($worker, function (\Throwable $e = null)
+        {
+            if ($e !== null)
+            {
                 $this->handleException($e);
             }
 
@@ -83,9 +86,12 @@ 
      */
     protected function handleException(\Throwable $e)
     {
-        try {
+        try
+        {
             $this->container->get(SnapshotterInterface::class)->register($e);
-        } catch (\Throwable|ContainerExceptionInterface $se) {
+        }
+        catch (\Throwable|ContainerExceptionInterface $se)
+        {
             // no need to notify when unable to register an exception
         }
     }