spiral / framework

src/Prototype/tests/Commands/AbstractCommandsTest.php

Spacing +4 added lines, -4 removed lines

@@ -39,13 +39,13 @@ 
 
     public function __construct($name = null, array $data = [], $dataName = '')
     {
-        $this->storage = new Storage($this->dir() . '/Fixtures/');
+        $this->storage = new Storage($this->dir().'/Fixtures/');
         parent::__construct($name, $data, $dataName);
     }
 
     public function setUp(): void
     {
-        if (!\class_exists(Kernel::class)) {
+        if (!\class_exists(Kernel::class)){
             $this->markTestSkipped('A "spiral/framework" dependency is required to run these tests');
         }
 
@@ -56,14 +56,14 @@ 
             'cache'  => sys_get_temp_dir()
         ], null, false);
 
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name){
             $this->storage->store($name);
         }
     }
 
     public function tearDown(): void
     {
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name){
             $this->storage->restore($name);
         }
     }

Braces +6 added lines, -3 removed lines

@@ -45,7 +45,8 @@ 
 
     public function setUp(): void
     {
-        if (!\class_exists(Kernel::class)) {
+        if (!\class_exists(Kernel::class))
+        {
             $this->markTestSkipped('A "spiral/framework" dependency is required to run these tests');
         }
 
@@ -56,14 +57,16 @@ 
             'cache'  => sys_get_temp_dir()
         ], null, false);
 
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name)
+        {
             $this->storage->store($name);
         }
     }
 
     public function tearDown(): void
     {
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name)
+        {
             $this->storage->restore($name);
         }
     }

src/Prototype/tests/Commands/InjectCommandTest.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         $source = file_get_contents($filename);
         $this->assertStringContainsString('use PrototypeTrait;', $source);
 
-        try {
+        try{
             $this->app->bindApp();
 
             $inp = new ArrayInput(['--remove' => true]);
@@ -37,7 +37,7 @@ 
             $this->app->get(Console::class)->run('prototype:inject', $inp, $out);
 
             $this->assertStringNotContainsString('use PrototypeTrait;', file_get_contents($filename));
-        } finally {
+        }finally{
             file_put_contents($filename, $source);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
         $source = file_get_contents($filename);
         $this->assertStringContainsString('use PrototypeTrait;', $source);
 
-        try {
+        try
+        {
             $this->app->bindApp();
 
             $inp = new ArrayInput(['--remove' => true]);
@@ -37,7 +38,9 @@ 
             $this->app->get(Console::class)->run('prototype:inject', $inp, $out);
 
             $this->assertStringNotContainsString('use PrototypeTrait;', file_get_contents($filename));
-        } finally {
+        }
+        finally
+        {
             file_put_contents($filename, $source);
         }
     }

src/SendIt/views/builder.dark.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
  */
 $_msg_->subject(\Spiral\SendIt\Renderer\ViewRenderer::escapeSubject(inject('subject')));
 
-if (injected('from')) {
+if (injected('from')){
     $_msg_->from(\Symfony\Component\Mime\Address::create(inject('from')));
 }
 
@@ -19,13 +19,13 @@ 
 
 ob_start(); ?>${html}<?php $_html_ = ob_get_clean();
 
-if (!empty($_html_)) {
+if (!empty($_html_)){
     $_msg_->html($_html_);
 }
 
 ob_start(); ?>${text}<?php $_text_ = ob_get_clean();
 
-if (!empty($_text_)) {
+if (!empty($_text_)){
     $_msg_->text($_text_);
 }
 ?>

Braces +6 added lines, -3 removed lines

@@ -7,7 +7,8 @@ 
  */
 $_msg_->subject(\Spiral\SendIt\Renderer\ViewRenderer::escapeSubject(inject('subject')));
 
-if (injected('from')) {
+if (injected('from'))
+{
     $_msg_->from(\Symfony\Component\Mime\Address::create(inject('from')));
 }
 
@@ -19,13 +20,15 @@ 
 
 ob_start(); ?>${html}<?php $_html_ = ob_get_clean();
 
-if (!empty($_html_)) {
+if (!empty($_html_))
+{
     $_msg_->html($_html_);
 }
 
 ob_start(); ?>${text}<?php $_text_ = ob_get_clean();
 
-if (!empty($_text_)) {
+if (!empty($_text_))
+{
     $_msg_->text($_text_);
 }
 ?>

src/Config/tests/fixtures/broken.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  * @author    Anton Titov (Wolfy-J)
  */
 
-return ;
+return;

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);
         }