spiral / framework

src/Prototype/tests/BackwardCompatibilityTrait.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
      */
     public static function assertRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')){
             Assert::assertMatchesRegularExpression($pattern, $string, $message);
 
             return;
@@ -35,7 +35,7 @@ 
      */
     public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')){
             Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message);
 
             return;

Braces +4 added lines, -2 removed lines

@@ -19,7 +19,8 @@ 
      */
     public static function assertRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertMatchesRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertMatchesRegularExpression'))
+        {
             Assert::assertMatchesRegularExpression($pattern, $string, $message);
 
             return;
@@ -35,7 +36,8 @@ 
      */
     public static function assertNotRegExp(string $pattern, string $string, string $message = ''): void
     {
-        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression')) {
+        if (\method_exists(Assert::class, 'assertDoesNotMatchRegularExpression'))
+        {
             Assert::assertDoesNotMatchRegularExpression($pattern, $string, $message);
 
             return;

src/Prototype/tests/InjectorTest.php

Braces +12 added lines, -5 removed lines

@@ -27,7 +27,8 @@ 
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1)
+        {
             ini_set('zend.assertions', 0);
         }
     }
@@ -75,15 +76,21 @@ 
             $noPhpDoc
         );
 
-        if ($expectedTypedProperty) {
+        if ($expectedTypedProperty)
+        {
             $this->assertStringContainsString('private TestClass $testClass;', $printed);
-        } else {
+        }
+        else
+        {
             $this->assertStringNotContainsString('private TestClass $testClass;', $printed);
         }
 
-        if ($expectedPhpDoc) {
+        if ($expectedPhpDoc)
+        {
             $this->assertRegExp('/@var TestClass[\s|\r\n]/', $printed);
-        } else {
+        }
+        else
+        {
             $this->assertNotRegExp('/@var TestClass[\s|\r\n]/', $printed);
         }
     }

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 
     public function setUp(): void
     {
-        if ((string)ini_get('zend.assertions') === 1) {
+        if ((string)ini_get('zend.assertions') === 1){
             ini_set('zend.assertions', 0);
         }
     }
@@ -40,7 +40,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $printed = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -66,7 +66,7 @@ 
     ): void {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $printed = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class]),
@@ -75,15 +75,15 @@ 
             $noPhpDoc
         );
 
-        if ($expectedTypedProperty) {
+        if ($expectedTypedProperty){
             $this->assertStringContainsString('private TestClass $testClass;', $printed);
-        } else {
+        }else{
             $this->assertStringNotContainsString('private TestClass $testClass;', $printed);
         }
 
-        if ($expectedPhpDoc) {
+        if ($expectedPhpDoc){
             $this->assertRegExp('/@var TestClass[\s|\r\n]/', $printed);
-        } else {
+        }else{
             $this->assertNotRegExp('/@var TestClass[\s|\r\n]/', $printed);
         }
     }
@@ -106,7 +106,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestEmptyClass.php';
+        $filename = __DIR__.'/Fixtures/TestEmptyClass.php';
         $content = file_get_contents($filename);
         $printed = $i->injectDependencies(
             file_get_contents($filename),
@@ -124,7 +124,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -149,7 +149,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -167,7 +167,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildWithConstructorClass.php';
+        $filename = __DIR__.'/Fixtures/ChildWithConstructorClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition($filename, ['testClass' => TestClass::class])
@@ -183,7 +183,7 @@ 
      */
     public function testModifyConstructor(): void
     {
-        $filename = __DIR__ . '/Fixtures/WithConstructor.php';
+        $filename = __DIR__.'/Fixtures/WithConstructor.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -209,7 +209,7 @@ 
      */
     public function testPriorOptionalConstructorParameters(): void
     {
-        $filename = __DIR__ . '/Fixtures/OptionalConstructorArgsClass.php';
+        $filename = __DIR__.'/Fixtures/OptionalConstructorArgsClass.php';
         $extractor = new Traverse\Extractor();
 
         $parameters = $extractor->extractFromFilename($filename);
@@ -240,7 +240,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/ClassNode/ConflictResolver/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/ClassNode/ConflictResolver/Fixtures/ChildClass.php';
         $printed = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(

src/Prototype/tests/ClassNode/ConflictResolver/ConflictResolverTest.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClass.php';
+        $filename = __DIR__.'/Fixtures/TestClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -36,16 +36,16 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertRegExp('/@var Test2[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test2 $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertRegExp('/@var ATest3[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATest3 $test3', $r);
     }
@@ -57,7 +57,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/TestClassWithImports.php';
+        $filename = __DIR__.'/Fixtures/TestClassWithImports.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -70,18 +70,18 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ' as FTest;', $r);
-        $this->assertStringNotContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.' as FTest;', $r);
+        $this->assertStringNotContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var FTest[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param FTest $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as TestAlias;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as TestAlias;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertRegExp('/@var TestAlias[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param TestAlias $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATest;', $r);
-        $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.' as ATest;', $r);
+        $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertRegExp('/@var ATest[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATest $test3', $r);
     }
@@ -93,7 +93,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/ChildClass.php';
+        $filename = __DIR__.'/Fixtures/ChildClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -106,17 +106,17 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test $test', $r);
 
-        $this->assertStringContainsString(Fixtures\SubFolder\Test::class . ' as Test2;', $r);
-        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\SubFolder\Test::class.' as Test2;', $r);
+        $this->assertStringNotContainsString(Fixtures\SubFolder\Test::class.';', $r);
         $this->assertRegExp('/@var Test2[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test2 $test2', $r);
 
-        $this->assertStringContainsString(Fixtures\ATest3::class . ' as ATestAlias;', $r);
-        $this->assertStringNotContainsString(Fixtures\ATest3::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\ATest3::class.' as ATestAlias;', $r);
+        $this->assertStringNotContainsString(Fixtures\ATest3::class.';', $r);
         $this->assertRegExp('/@var ATestAlias[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param ATestAlias $test3', $r);
     }
@@ -125,7 +125,7 @@ 
     {
         $i = new Injector();
 
-        $filename = __DIR__ . '/Fixtures/DuplicatePropertyClass.php';
+        $filename = __DIR__.'/Fixtures/DuplicatePropertyClass.php';
         $r = $i->injectDependencies(
             file_get_contents($filename),
             $this->getDefinition(
@@ -136,7 +136,7 @@ 
             )
         );
 
-        $this->assertStringContainsString(Fixtures\Test::class . ';', $r);
+        $this->assertStringContainsString(Fixtures\Test::class.';', $r);
         $this->assertRegExp('/@var Test[\s|\r\n]/', $r);
         $this->assertStringContainsString('@param Test $test', $r);
         $this->assertStringContainsString('__construct(Test $test)', $r);

src/Validation/src/AbstractValidator.php

Spacing +7 added lines, -7 removed lines

@@ -112,30 +112,30 @@
      */
     final protected function validate(): void
     {
-        if ($this->errors !== []) {
+        if ($this->errors !== []){
             // already validated
             return;
         }
 
         $this->errors = [];
 
-        foreach ($this->rules as $field => $rules) {
+        foreach ($this->rules as $field => $rules){
             $hasValue = $this->hasValue($field);
             $value = $this->getValue($field);
 
-            foreach ($this->provider->getRules($rules) as $rule) {
-                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) {
+            foreach ($this->provider->getRules($rules) as $rule){
+                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()){
                     continue;
                 }
 
-                foreach ($rule->getConditions() as $condition) {
-                    if (!$condition->isMet($this, $field, $value)) {
+                foreach ($rule->getConditions() as $condition){
+                    if (!$condition->isMet($this, $field, $value)){
                         // condition is not met, skipping validation
                         continue 2;
                     }
                 }
 
-                if (!$rule->validate($this, $field, $value)) {
+                if (!$rule->validate($this, $field, $value)){
                     // got error, jump to next field
                     $this->errors[$field] = $rule->getMessage($field, $value);
                     break;

Braces +14 added lines, -7 removed lines

@@ -112,30 +112,37 @@
      */
     final protected function validate(): void
     {
-        if ($this->errors !== []) {
+        if ($this->errors !== [])
+        {
             // already validated
             return;
         }
 
         $this->errors = [];
 
-        foreach ($this->rules as $field => $rules) {
+        foreach ($this->rules as $field => $rules)
+        {
             $hasValue = $this->hasValue($field);
             $value = $this->getValue($field);
 
-            foreach ($this->provider->getRules($rules) as $rule) {
-                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) {
+            foreach ($this->provider->getRules($rules) as $rule)
+            {
+                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions())
+                {
                     continue;
                 }
 
-                foreach ($rule->getConditions() as $condition) {
-                    if (!$condition->isMet($this, $field, $value)) {
+                foreach ($rule->getConditions() as $condition)
+                {
+                    if (!$condition->isMet($this, $field, $value))
+                    {
                         // condition is not met, skipping validation
                         continue 2;
                     }
                 }
 
-                if (!$rule->validate($this, $field, $value)) {
+                if (!$rule->validate($this, $field, $value))
+                {
                     // got error, jump to next field
                     $this->errors[$field] = $rule->getMessage($field, $value);
                     break;

src/Validation/src/Validator.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     {
         $value = $this->data[$field] ?? $default;
 
-        if (is_object($value) && method_exists($value, 'getValue')) {
+        if (is_object($value) && method_exists($value, 'getValue')){
             return $value->getValue();
         }
 
@@ -67,7 +67,7 @@ 
      */
     public function hasValue(string $field): bool
     {
-        if (is_array($this->data)) {
+        if (is_array($this->data)){
             return array_key_exists($field, $this->data);
         }
 

Braces +4 added lines, -2 removed lines

@@ -55,7 +55,8 @@ 
     {
         $value = $this->data[$field] ?? $default;
 
-        if (is_object($value) && method_exists($value, 'getValue')) {
+        if (is_object($value) && method_exists($value, 'getValue'))
+        {
             return $value->getValue();
         }
 
@@ -67,7 +68,8 @@ 
      */
     public function hasValue(string $field): bool
     {
-        if (is_array($this->data)) {
+        if (is_array($this->data))
+        {
             return array_key_exists($field, $this->data);
         }
 

src/Prototype/src/Command/ListCommand.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === []){
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -30,7 +30,7 @@ 
 
         $grid = $this->table(['Class:', 'Property:', 'Target:']);
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class){
             $proto = $this->getPrototypeProperties($class, $prototyped);
 
             $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]);

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === [])
+        {
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -30,7 +31,8 @@ 
 
         $grid = $this->table(['Class:', 'Property:', 'Target:']);
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class)
+        {
             $proto = $this->getPrototypeProperties($class, $prototyped);
 
             $grid->addRow([$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)]);

src/SendIt/tests/JobTest.php

Spacing +3 added lines, -3 removed lines

@@ -75,13 +75,13 @@ 
             ['emails' => ['email@domain.com']]
         );
 
-        try {
+        try{
             $this->getHandler()->handle(
                 MailQueue::JOB_NAME,
                 'id',
                 json_encode(MessageSerializer::pack($this->getMail()))
             );
-        } catch (TransportException $e) {
+        }catch (TransportException $e){
         }
 
         $this->logger->mockery_verify();
@@ -98,7 +98,7 @@ 
     private function expectRenderer(Email $email): void
     {
         $this->renderer->expects('render')->withArgs(
-            function (Message $message) {
+            function (Message $message){
                 $this->assertSame($message->getSubject(), 'test');
                 return true;
             }

Braces +7 added lines, -3 removed lines

@@ -75,13 +75,16 @@ 
             ['emails' => ['email@domain.com']]
         );
 
-        try {
+        try
+        {
             $this->getHandler()->handle(
                 MailQueue::JOB_NAME,
                 'id',
                 json_encode(MessageSerializer::pack($this->getMail()))
             );
-        } catch (TransportException $e) {
+        }
+        catch (TransportException $e)
+        {
         }
 
         $this->logger->mockery_verify();
@@ -98,7 +101,8 @@ 
     private function expectRenderer(Email $email): void
     {
         $this->renderer->expects('render')->withArgs(
-            function (Message $message) {
+            function (Message $message)
+            {
                 $this->assertSame($message->getSubject(), 'test');
                 return true;
             }

src/Prototype/src/Command/InjectCommand.php

Braces +25 added lines, -12 removed lines

@@ -55,7 +55,8 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === [])
+        {
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -63,18 +64,23 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class)
+        {
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto))
+            {
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null)
+                {
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target)
+            {
+                if ($target instanceof \Throwable)
+                {
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -83,7 +89,8 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null)
+                {
                     continue 2;
                 }
             }
@@ -91,14 +98,17 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null)
+            {
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets))
+        {
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target)
+            {
                 $grid->addRow($target);
             }
 
@@ -109,7 +119,8 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFilename(), $proto);
-        try {
+        try
+        {
             $modified = $this->injector->injectDependencies(
                 file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -120,7 +131,9 @@ 
 
             file_put_contents($class->getFileName(), $modified);
             return null;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             return [$class->getName(), $e->getMessage(), "{$e->getFile()}:L{$e->getLine()}"];
         }
     }

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
     public function perform(): void
     {
         $prototyped = $this->locator->getTargetClasses();
-        if ($prototyped === []) {
+        if ($prototyped === []){
             $this->writeln('<comment>No prototyped classes found.</comment>');
 
             return;
@@ -59,18 +59,18 @@ 
 
         $targets = [];
 
-        foreach ($prototyped as $class) {
+        foreach ($prototyped as $class){
             $proto = $this->getPrototypeProperties($class, $prototyped);
-            if (empty($proto)) {
+            if (empty($proto)){
                 $modified = $this->modify($class, $proto);
-                if ($modified !== null) {
+                if ($modified !== null){
                     $targets[] = $modified;
                 }
                 continue;
             }
 
-            foreach ($proto as $target) {
-                if ($target instanceof \Throwable) {
+            foreach ($proto as $target){
+                if ($target instanceof \Throwable){
                     $targets[] = [
                         $class->getName(),
                         $target->getMessage(),
@@ -79,7 +79,7 @@ 
                     continue 2;
                 }
 
-                if ($target === null) {
+                if ($target === null){
                     continue 2;
                 }
             }
@@ -87,14 +87,14 @@ 
             $targets[] = [$class->getName(), $this->mergeNames($proto), $this->mergeTargets($proto)];
 
             $modified = $this->modify($class, $proto);
-            if ($modified !== null) {
+            if ($modified !== null){
                 $targets[] = $modified;
             }
         }
 
-        if (!empty($targets)) {
+        if (!empty($targets)){
             $grid = $this->table(['Class:', 'Property:', 'Target:']);
-            foreach ($targets as $target) {
+            foreach ($targets as $target){
                 $grid->addRow($target);
             }
 
@@ -105,7 +105,7 @@ 
     private function modify(\ReflectionClass $class, array $proto): ?array
     {
         $classDefinition = $this->extractor->extract($class->getFilename(), $proto);
-        try {
+        try{
             $modified = $this->injector->injectDependencies(
                 file_get_contents($class->getFileName()),
                 $classDefinition,
@@ -116,7 +116,7 @@ 
 
             file_put_contents($class->getFileName(), $modified);
             return null;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             return [$class->getName(), $e->getMessage(), "{$e->getFile()}:L{$e->getLine()}"];
         }
     }

src/DataGrid/src/GridFactory.php

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source)){
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -126,11 +126,11 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value){
+            if ($schema->hasFilter($name)){
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null){
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -142,7 +142,7 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)){
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -160,11 +160,11 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value){
+            if ($schema->hasSorter($name)){
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null){
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -176,7 +176,7 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null){
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -187,12 +187,12 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface){
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null){
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -211,7 +211,7 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             return [];
         }
 
@@ -226,7 +226,7 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option)){
             return $this->input->getValue($option);
         }
 

Braces +26 added lines, -13 removed lines

@@ -108,7 +108,8 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source))
+        {
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -126,11 +127,14 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value)
+        {
+            if ($schema->hasFilter($name))
+            {
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null)
+                {
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -142,7 +146,8 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT))
+        {
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -160,11 +165,14 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value)
+        {
+            if ($schema->hasSorter($name))
+            {
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null)
+                {
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -176,7 +184,8 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null)
+        {
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -187,12 +196,14 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -211,7 +222,8 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             return [];
         }
 
@@ -226,7 +238,8 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option))
+        {
             return $this->input->getValue($option);
         }