Apply fixes from StyleCI

Author: spawnia

src/Email.php

@@ -11,7 +11,7 @@ class Email extends StringScalar
 {
     /** @var string */
     public $description = 'A valid RFC 5321 compliant email.';
-    
+
     /**
      * Check if the given string is a valid email.
      *
@@ -21,9 +21,9 @@ class Email extends StringScalar
      */
     protected function isValid(string $stringValue): bool
     {
-        return (new EmailValidator)->isValid(
+        return (new EmailValidator())->isValid(
             $stringValue,
-            new RFCValidation
+            new RFCValidation()
         );
     }
 }

src/Regex.php

@@ -19,7 +19,7 @@ abstract class Regex extends ScalarType
      * @return string
      */
     abstract protected function regex(): string;
-    
+
     /**
      * This factory method allows you to create a Regex scalar in a one-liner.
      *
@@ -82,7 +82,7 @@ public function serialize($value): string
     public function parseValue($value): string
     {
         $stringValue = assertString($value, Error::class);
-    
+
         if (!$this->matchesRegex($stringValue)) {
             $safeValue = Utils::printSafeJson($stringValue);
 
@@ -110,7 +110,7 @@ public function parseValue($value): string
     public function parseLiteral($valueNode, array $variables = null): string
     {
         $value = assertStringLiteral($valueNode);
-    
+
         if (!$this->matchesRegex($value)) {
             $safeValue = Utils::printSafeJson($value);
 

src/StringScalar.php

@@ -20,15 +20,15 @@ abstract class StringScalar extends ScalarType
      * @return bool
      */
     abstract protected function isValid(string $stringValue): bool;
-    
+
     /**
      * @param string $name The name that the scalar type will have in the schema.
      * @param string|null $description A description for the type.
      * @param callable $isValid A function that returns a boolean whether a given string is valid.
      *
      * @return StringScalar
      */
-    public static function make(string $name, string $description = null, callable $isValid): StringScalar
+    public static function make(string $name, string $description = null, callable $isValid): self
     {
         $instance = new class() extends StringScalar {
             /**
@@ -43,14 +43,14 @@ protected function isValid(string $stringValue): bool
                 return call_user_func($this->isValid, $stringValue);
             }
         };
-    
+
         $instance->name = $name;
         $instance->description = $description;
         $instance->isValid = $isValid;
-    
+
         return $instance;
     }
-    
+
     /**
      * Serializes an internal value to include in a response.
      *
@@ -68,7 +68,7 @@ public function serialize($value): string
 
         return $stringValue;
     }
-    
+
     /**
      * Parses an externally provided value (query variable) to use as an input.
      *
@@ -81,15 +81,16 @@ public function serialize($value): string
     public function parseValue($value): string
     {
         $stringValue = assertString($value, Error::class);
-        
-        if(!$this->isValid($stringValue)) {
+
+        if (!$this->isValid($stringValue)) {
             $safeValue = Utils::printSafeJson($stringValue);
+
             throw new Error("The given string {$safeValue} is not a valid {$this->tryInferName()}.");
         }
 
         return $stringValue;
     }
-    
+
     /**
      * Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.
      *
@@ -108,9 +109,10 @@ public function parseValue($value): string
     public function parseLiteral($valueNode, array $variables = null): string
     {
         $stringValue = assertStringLiteral($valueNode);
-    
-        if(!$this->isValid($stringValue)) {
+
+        if (!$this->isValid($stringValue)) {
             $safeValue = Utils::printSafeJson($stringValue);
+
             throw new Error("The given string {$safeValue} is not a valid {$this->tryInferName()}.", $valueNode);
         }
 

src/utils.php

@@ -25,15 +25,16 @@ function canBeString($value): bool
 /**
  * @param $valueNode
  *
- * @return string
  * @throws Error
+ *
+ * @return string
  */
 function assertStringLiteral($valueNode): string
 {
     if (!$valueNode instanceof StringValueNode) {
         throw new Error("Query error: Can only parse strings got: {$valueNode->kind}", [$valueNode]);
     }
-    
+
     return $valueNode->value;
 }
 
@@ -49,9 +50,9 @@ function assertString($value, string $exceptionClass): string
 {
     if (!canBeString($value)) {
         $safeValue = Utils::printSafe($value);
-        
+
         throw new $exceptionClass("The given value {$safeValue} can not be serialized.");
     }
-    
+
     return strval($value);
 }

tests/EmailTest.php

@@ -6,11 +6,8 @@
 
 use GraphQL\Error\Error;
 use GraphQL\Error\InvariantViolation;
-use GraphQL\Language\AST\IntValueNode;
-use GraphQL\Language\AST\NodeKind;
 use GraphQL\Language\AST\StringValueNode;
 use MLL\GraphQLScalars\Email;
-use MLL\GraphQLScalars\Regex;
 
 class EmailTest extends \PHPUnit\Framework\TestCase
 {
@@ -19,7 +16,7 @@ public function testSerializeThrowsIfUnserializableValueIsGiven()
         $this->expectException(InvariantViolation::class);
         $this->expectExceptionMessageRegExp('/^The given value .* can not be serialized\./');
 
-        (new Email)->serialize(
+        (new Email())->serialize(
             new class() {
             }
         );
@@ -29,13 +26,13 @@ public function testSerializeThrowsIfEmailIsInvalid()
     {
         $this->expectException(InvariantViolation::class);
         $this->expectExceptionMessage('The given string foo is not a valid Email.');
-        
-        (new Email)->serialize('foo');
+
+        (new Email())->serialize('foo');
     }
 
     public function testSerializePassesWhenEmailIsInvalid()
     {
-        $serializedResult = (new Email)->serialize('foo@bar');
+        $serializedResult = (new Email())->serialize('foo@bar');
 
         $this->assertSame('foo@bar', $serializedResult);
     }
@@ -45,14 +42,14 @@ public function testParseValueThrowsIfEmailIsInvalid()
         $this->expectException(Error::class);
         $this->expectExceptionMessage('The given string "foo" is not a valid Email.');
 
-        (new Email)->parseValue('foo');
+        (new Email())->parseValue('foo');
     }
 
     public function testParseValuePassesIfEmailIsValid()
     {
         $this->assertSame(
             'foo@bar',
-            (new Email)->parseValue('foo@bar')
+            (new Email())->parseValue('foo@bar')
         );
     }
 
@@ -61,14 +58,14 @@ public function testParseLiteralThrowsIfNotValidEmail()
         $this->expectException(Error::class);
         $this->expectExceptionMessage('The given string "foo" is not a valid Email.');
 
-        (new Email)->parseLiteral(new StringValueNode(['value' => 'foo']));
+        (new Email())->parseLiteral(new StringValueNode(['value' => 'foo']));
     }
-    
+
     public function testParseLiteralPassesIfEmailIsValid()
     {
         $this->assertSame(
             'foo@bar',
-            (new Email)->parseLiteral(new StringValueNode(['value' => 'foo@bar']))
+            (new Email())->parseLiteral(new StringValueNode(['value' => 'foo@bar']))
         );
     }
 }