spiral / framework

src/AnnotatedRoutes/src/Bootloader/AnnotatedRoutesBootloader.php

Spacing +3 added lines, -3 removed lines

@@ -67,14 +67,14 @@ 
         AnnotationRegistry::registerLoader('class_exists');
 
         $schema = $this->memory->loadData(self::MEMORY_SECTION);
-        if (empty($schema) || !$cached) {
+        if (empty($schema) || !$cached){
             $schema = $locator->findDeclarations();
             $this->memory->saveData(self::MEMORY_SECTION, $schema);
         }
 
         $this->configureRoutes($schema);
 
-        foreach ($this->groups as $group) {
+        foreach ($this->groups as $group){
             $group->flushRoutes();
         }
     }
@@ -92,7 +92,7 @@ 
      */
     private function configureRoutes(array $routes): void
     {
-        foreach ($routes as $name => $schema) {
+        foreach ($routes as $name => $schema){
             $this->groups
                 ->getGroup($schema['group'])
                 ->registerRoute(

Braces +6 added lines, -3 removed lines

@@ -67,14 +67,16 @@ 
         AnnotationRegistry::registerLoader('class_exists');
 
         $schema = $this->memory->loadData(self::MEMORY_SECTION);
-        if (empty($schema) || !$cached) {
+        if (empty($schema) || !$cached)
+        {
             $schema = $locator->findDeclarations();
             $this->memory->saveData(self::MEMORY_SECTION, $schema);
         }
 
         $this->configureRoutes($schema);
 
-        foreach ($this->groups as $group) {
+        foreach ($this->groups as $group)
+        {
             $group->flushRoutes();
         }
     }
@@ -92,7 +94,8 @@ 
      */
     private function configureRoutes(array $routes): void
     {
-        foreach ($routes as $name => $schema) {
+        foreach ($routes as $name => $schema)
+        {
             $this->groups
                 ->getGroup($schema['group'])
                 ->registerRoute(

src/AnnotatedRoutes/src/RouteGroup.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
         ContainerInterface $container,
         RouterInterface $router,
         Pipeline $pipeline
-    ) {
+    ){
         $this->container = $container;
         $this->router = $router;
         $this->pipeline = $pipeline;
@@ -78,7 +78,7 @@ 
      */
     public function setCore($core): self
     {
-        if (!$core instanceof CoreInterface) {
+        if (!$core instanceof CoreInterface){
             $core = $this->container->get($core);
         }
         $this->core = $core;
@@ -95,7 +95,7 @@ 
      */
     public function addMiddleware($middleware): self
     {
-        if (!$middleware instanceof MiddlewareInterface) {
+        if (!$middleware instanceof MiddlewareInterface){
             $middleware = $this->container->get($middleware);
         }
 
@@ -126,7 +126,7 @@ 
         array $verbs,
         array $defaults,
         array $middleware
-    ) {
+    ){
         $this->routes[$name] = [
             'pattern'    => $pattern,
             'controller' => $controller,
@@ -142,10 +142,10 @@ 
      */
     public function flushRoutes()
     {
-        foreach ($this->routes as $name => $schema) {
+        foreach ($this->routes as $name => $schema){
             $route = $this->createRoute($schema['pattern'], $schema['controller'], $schema['action']);
 
-            if ($schema['defaults'] !== []) {
+            if ($schema['defaults'] !== []){
                 $route = $route->withDefaults($schema['defaults']);
             }
 
@@ -165,11 +165,11 @@ 
     public function createRoute(string $pattern, string $controller, string $action): Route
     {
         $action = new Action($controller, $action);
-        if ($this->core !== null) {
+        if ($this->core !== null){
             $action = $action->withCore($this->core);
         }
 
-        $route = new Route($this->prefix . $pattern, $action);
+        $route = new Route($this->prefix.$pattern, $action);
 
         // all routes within group share the same middleware pipeline
         $route = $route->withMiddleware($this->pipeline);

Braces +10 added lines, -5 removed lines

@@ -78,7 +78,8 @@ 
      */
     public function setCore($core): self
     {
-        if (!$core instanceof CoreInterface) {
+        if (!$core instanceof CoreInterface)
+        {
             $core = $this->container->get($core);
         }
         $this->core = $core;
@@ -95,7 +96,8 @@ 
      */
     public function addMiddleware($middleware): self
     {
-        if (!$middleware instanceof MiddlewareInterface) {
+        if (!$middleware instanceof MiddlewareInterface)
+        {
             $middleware = $this->container->get($middleware);
         }
 
@@ -142,10 +144,12 @@ 
      */
     public function flushRoutes()
     {
-        foreach ($this->routes as $name => $schema) {
+        foreach ($this->routes as $name => $schema)
+        {
             $route = $this->createRoute($schema['pattern'], $schema['controller'], $schema['action']);
 
-            if ($schema['defaults'] !== []) {
+            if ($schema['defaults'] !== [])
+            {
                 $route = $route->withDefaults($schema['defaults']);
             }
 
@@ -165,7 +169,8 @@ 
     public function createRoute(string $pattern, string $controller, string $action): Route
     {
         $action = new Action($controller, $action);
-        if ($this->core !== null) {
+        if ($this->core !== null)
+        {
             $action = $action->withCore($this->core);
         }
 

src/AnnotatedRoutes/src/RouteLocator.php

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
     public function findDeclarations(): array
     {
         $result = [];
-        foreach ($this->locator->findMethods(RouteAnnotation::class) as $match) {
+        foreach ($this->locator->findMethods(RouteAnnotation::class) as $match)
+        {
             /** @var RouteAnnotation $route */
             $route = $match->getAnnotation();
 

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
     public function findDeclarations(): array
     {
         $result = [];
-        foreach ($this->locator->findMethods(RouteAnnotation::class) as $match) {
+        foreach ($this->locator->findMethods(RouteAnnotation::class) as $match){
             /** @var RouteAnnotation $route */
             $route = $match->getAnnotation();
 
@@ -42,9 +42,9 @@ 
                 'controller' => $match->getClass()->getName(),
                 'action'     => $match->getMethod()->getName(),
                 'group'      => $route->group,
-                'verbs'      => (array) $route->methods,
+                'verbs'      => (array)$route->methods,
                 'defaults'   => $route->defaults,
-                'middleware' => (array) $route->middleware,
+                'middleware' => (array)$route->middleware,
             ];
         }
 

src/AnnotatedRoutes/src/GroupRegistry.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function getGroup(string $name): RouteGroup
     {
-        if (!isset($this->groups[$name])) {
+        if (!isset($this->groups[$name])){
             $this->groups[$name] = $this->factory->make(RouteGroup::class);
         }
 

Braces +2 added lines, -1 removed lines

@@ -39,7 +39,8 @@
      */
     public function getGroup(string $name): RouteGroup
     {
-        if (!isset($this->groups[$name])) {
+        if (!isset($this->groups[$name]))
+        {
             $this->groups[$name] = $this->factory->make(RouteGroup::class);
         }
 

src/AnnotatedRoutes/tests/TestCase.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     protected function makeApp(array $env): App
     {
         $config = [
-            'root' => __DIR__ . '/App',
-            'app'  => __DIR__ . '/App',
+            'root' => __DIR__.'/App',
+            'app'  => __DIR__.'/App',
         ];
 
         return App::init($config, new Environment($env), false);

src/AnnotatedRoutes/tests/IntegrationTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v){
             $r = $r->withAttribute($k, $v);
         }
 
@@ -95,7 +95,7 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line){
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v)
+        {
             $r = $r->withAttribute($k, $v);
         }
 
@@ -95,7 +96,8 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line)
+        {
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

src/AnnotatedRoutes/tests/CacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -28,11 +28,11 @@
 
     public function testCache(): void
     {
-        $this->assertFileExists(__DIR__ . '/App/runtime/cache/routes.php');
-        $this->assertCount(2, include __DIR__ . '/App/runtime/cache/routes.php');
+        $this->assertFileExists(__DIR__.'/App/runtime/cache/routes.php');
+        $this->assertCount(2, include __DIR__.'/App/runtime/cache/routes.php');
 
         $this->app->getConsole()->run('route:reset');
 
-        $this->assertSame(null, include __DIR__ . '/App/runtime/cache/routes.php');
+        $this->assertSame(null, include __DIR__.'/App/runtime/cache/routes.php');
     }
 }

src/AnnotatedRoutes/tests/App/runtime/cache/routes.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@ 
 <?php return array (
-  'index' => 
-  array (
+    'index' => 
+    array (
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'index',
     'group' => 'default',
     'verbs' => 
     array (
-      0 => 'GET',
+        0 => 'GET',
     ),
     'defaults' => 
     array (
@@ -15,16 +15,16 @@ 
     'middleware' => 
     array (
     ),
-  ),
-  'method' => 
-  array (
+    ),
+    'method' => 
+    array (
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'method',
     'group' => 'default',
     'verbs' => 
     array (
-      0 => 'POST',
+        0 => 'POST',
     ),
     'defaults' => 
     array (
@@ -32,5 +32,5 @@ 
     'middleware' => 
     array (
     ),
-  ),
+    ),
 );
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -1,36 +1,36 @@
-<?php return array (
+<?php return array(
   'index' => 
-  array (
+  array(
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'index',
     'group' => 'default',
     'verbs' => 
-    array (
+    array(
       0 => 'GET',
     ),
     'defaults' => 
-    array (
+    array(
     ),
     'middleware' => 
-    array (
+    array(
     ),
   ),
   'method' => 
-  array (
+  array(
     'pattern' => '/',
     'controller' => 'Spiral\\Tests\\Router\\App\\Controller\\HomeController',
     'action' => 'method',
     'group' => 'default',
     'verbs' => 
-    array (
+    array(
       0 => 'POST',
     ),
     'defaults' => 
-    array (
+    array(
     ),
     'middleware' => 
-    array (
+    array(
     ),
   ),
 );
\ No newline at end of file

src/Scaffolder/src/Command/Database/EntityCommand.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
         ['name', InputArgument::REQUIRED, 'Entity name'],
         ['format', InputArgument::OPTIONAL, 'Declaration format (annotated, xml?, yaml?, php?)', 'annotated'],
     ];
-    protected const OPTIONS     = [
+    protected const OPTIONS = [
         [
             'role',
             'r',
@@ -108,7 +108,7 @@ 
         $declaration = $this->createDeclaration();
 
         $repository = trimPostfix((string)$this->argument('name'), 'repository');
-        if ($this->option('repository')) {
+        if ($this->option('repository')){
             $repositoryClass = $config->className(RepositoryCommand::ELEMENT, $repository);
             $repositoryNamespace = $config->classNamespace(RepositoryCommand::ELEMENT, $repository);
             $declaration->setRepository("\\$repositoryNamespace\\$repositoryClass");
@@ -120,8 +120,8 @@ 
         $declaration->setDatabase((string)$this->option('database'));
         $declaration->setInflection((string)$this->option('inflection'));
 
-        foreach ($this->option('field') as $field) {
-            if (strpos($field, ':') === false) {
+        foreach ($this->option('field') as $field){
+            if (strpos($field, ':') === false){
                 throw new ScaffolderException("Field definition must in 'name:type' or 'name:type' form");
             }
 
@@ -135,7 +135,7 @@ 
 
         $this->writeDeclaration($declaration);
 
-        if ($this->option('repository')) {
+        if ($this->option('repository')){
             $console->run('create:repository', [
                 'name' => $repository ?? $this->argument('name'),
             ]);
@@ -162,7 +162,7 @@ 
             AbstractDeclaration::ACCESS_PROTECTED,
             AbstractDeclaration::ACCESS_PRIVATE,
             ], true)
-        ) {
+        ){
             throw new ScaffolderException("Invalid accessibility value `$accessibility`");
         }
     }

Braces +8 added lines, -4 removed lines

@@ -108,7 +108,8 @@ 
         $declaration = $this->createDeclaration();
 
         $repository = trimPostfix((string)$this->argument('name'), 'repository');
-        if ($this->option('repository')) {
+        if ($this->option('repository'))
+        {
             $repositoryClass = $config->className(RepositoryCommand::ELEMENT, $repository);
             $repositoryNamespace = $config->classNamespace(RepositoryCommand::ELEMENT, $repository);
             $declaration->setRepository("\\$repositoryNamespace\\$repositoryClass");
@@ -120,8 +121,10 @@ 
         $declaration->setDatabase((string)$this->option('database'));
         $declaration->setInflection((string)$this->option('inflection'));
 
-        foreach ($this->option('field') as $field) {
-            if (strpos($field, ':') === false) {
+        foreach ($this->option('field') as $field)
+        {
+            if (strpos($field, ':') === false)
+            {
                 throw new ScaffolderException("Field definition must in 'name:type' or 'name:type' form");
             }
 
@@ -135,7 +138,8 @@ 
 
         $this->writeDeclaration($declaration);
 
-        if ($this->option('repository')) {
+        if ($this->option('repository'))
+        {
             $console->run('create:repository', [
                 'name' => $repository ?? $this->argument('name'),
             ]);