Apply fixes from StyleCI

spawnia · StyleCIBot · commit 3f9dbebbe490 · 2018-09-30T21:05:00.000Z
diff --git a/src/Regex.php b/src/Regex.php
@@ -24,8 +24,7 @@ abstract class Regex extends ScalarType
      */
     public static function make(string $name, string $description = null, string $regex): self
     {
-        $regexClass = new class() extends Regex
-        {
+        $regexClass = new class() extends Regex {
             /**
              * Return the Regex that the values are validated against.
              *
@@ -38,21 +37,21 @@ protected function regex(): string
                 return $this->regex;
             }
         };
-        
+
         $regexClass->name = $name;
         $regexClass->description = $description;
         $regexClass->regex = $regex;
-        
+
         return $regexClass;
     }
-    
+
     /**
      * Return the Regex that the values are validated against.
      *
      * @return string
      */
     abstract protected function regex(): string;
-    
+
     /**
      * Serializes an internal value to include in a response.
      *
@@ -63,16 +62,16 @@ abstract protected function regex(): string;
     public function serialize($value): string
     {
         $stringValue = assertString($value, InvariantViolation::class);
-        
+
         if (!$this->matchesRegex($stringValue)) {
             throw new InvariantViolation(
                 $this->unmatchedRegexMessage($stringValue)
             );
         }
-        
+
         return $stringValue;
     }
-    
+
     /**
      * @param string $value
      *
@@ -85,7 +84,7 @@ protected function matchesRegex(string $value): bool
             $value
         )->hasMatch();
     }
-    
+
     /**
      * Parses an externally provided value (query variable) to use as an input.
      *
@@ -98,16 +97,16 @@ protected function matchesRegex(string $value): bool
     public function parseValue($value): string
     {
         $stringValue = assertString($value, Error::class);
-        
+
         if (!$this->matchesRegex($stringValue)) {
             throw new Error(
                 $this->unmatchedRegexMessage($stringValue)
             );
         }
-        
+
         return $value;
     }
-    
+
     /**
      * Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.
      *
@@ -121,17 +120,17 @@ public function parseValue($value): string
     public function parseLiteral($valueNode, array $variables = null): string
     {
         $value = assertStringLiteral($valueNode);
-        
+
         if (!$this->matchesRegex($value)) {
             throw new Error(
                 $this->unmatchedRegexMessage($value),
                 [$valueNode]
             );
         }
-        
+
         return $value;
     }
-    
+
     /**
      * @param string $value
      *
@@ -140,7 +139,7 @@ public function parseLiteral($valueNode, array $variables = null): string
     public function unmatchedRegexMessage(string $value): string
     {
         $safeValue = Utils::printSafeJson($value);
-        
+
         return "The given value {$safeValue} did not match the regex {$this->regex()}";
     }
 }
diff --git a/src/StringScalar.php b/src/StringScalar.php
@@ -21,8 +21,7 @@ abstract class StringScalar extends ScalarType
      */
     public static function make(string $name, string $description = null, callable $isValid): self
     {
-        $instance = new class() extends StringScalar
-        {
+        $instance = new class() extends StringScalar {
             /**
              * Check if the given string is a valid email.
              *
@@ -35,14 +34,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;
     }
-    
+
     /**
      * Check if the given string is a valid email.
      *
@@ -51,7 +50,7 @@ protected function isValid(string $stringValue): bool
      * @return bool
      */
     abstract protected function isValid(string $stringValue): bool;
-    
+
     /**
      * Serializes an internal value to include in a response.
      *
@@ -62,16 +61,16 @@ abstract protected function isValid(string $stringValue): bool;
     public function serialize($value): string
     {
         $stringValue = assertString($value, InvariantViolation::class);
-        
+
         if (!$this->isValid($stringValue)) {
             throw new InvariantViolation(
                 $this->invalidStringMessage($stringValue)
             );
         }
-        
+
         return $stringValue;
     }
-    
+
     /**
      * @param string $stringValue
      *
@@ -80,10 +79,10 @@ public function serialize($value): string
     public function invalidStringMessage(string $stringValue): string
     {
         $safeValue = Utils::printSafeJson($stringValue);
-        
+
         return "The given string {$safeValue} is not a valid {$this->tryInferName()}.";
     }
-    
+
     /**
      * Parses an externally provided value (query variable) to use as an input.
      *
@@ -96,16 +95,16 @@ public function invalidStringMessage(string $stringValue): string
     public function parseValue($value): string
     {
         $stringValue = assertString($value, Error::class);
-        
+
         if (!$this->isValid($stringValue)) {
             throw new Error(
                 $this->invalidStringMessage($stringValue)
             );
         }
-        
+
         return $stringValue;
     }
-    
+
     /**
      * Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.
      *
@@ -124,14 +123,14 @@ public function parseValue($value): string
     public function parseLiteral($valueNode, array $variables = null): string
     {
         $stringValue = assertStringLiteral($valueNode);
-        
+
         if (!$this->isValid($stringValue)) {
             throw new Error(
                 $this->invalidStringMessage($stringValue),
                 $valueNode
             );
         }
-        
+
         return $stringValue;
     }
 }
diff --git a/tests/MixedTest.php b/tests/MixedTest.php
@@ -9,7 +9,6 @@
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Schema;
 use GraphQL\Type\SchemaConfig;
-use GraphQL\Utils\SchemaPrinter;
 use MLL\GraphQLScalars\Mixed;
 
 class MixedTest extends \PHPUnit\Framework\TestCase
@@ -170,7 +169,7 @@ protected function executeQueryWithLiteral(string $literal): ExecutionResult
             foo(bar: {$literal})
         }
         ";
-        
+
         return GraphQL::executeQuery(
             $this->schema,
             $query
diff --git a/tests/MyStringScalar.php b/tests/MyStringScalar.php
@@ -9,7 +9,7 @@
 class MyStringScalar extends StringScalar
 {
     public $description = 'Bar';
-    
+
     /**
      * Check if the given string is a valid email.
      *
diff --git a/tests/StringScalarTest.php b/tests/StringScalarTest.php
@@ -21,7 +21,7 @@ public function stringClassProvider()
                     public $name = 'MyStringScalar';
 
                     public $description = 'Bar';
-    
+
                     /**
                      * Check if the given string is a valid email.
                      *
@@ -57,7 +57,7 @@ protected function isValid(string $stringValue): bool
                 StringScalar::make(
                     'MyStringScalar',
                     'Bar',
-                    function(string $string){
+                    function (string $string) {
                         return $string === 'foo';
                     }
                 ),

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ abstract class Regex extends ScalarType`
`24`	`24`	`*/`
`25`	`25`	`public static function make(string $name, string $description = null, string $regex): self`
`26`	`26`	`{`
`27`		`- $regexClass = new class() extends Regex`
`28`		`- {`
	`27`	`+ $regexClass = new class() extends Regex {`
`29`	`28`	`/**`
`30`	`29`	`* Return the Regex that the values are validated against.`
`31`	`30`	`*`
`@@ -38,21 +37,21 @@ protected function regex(): string`
`38`	`37`	`return $this->regex;`
`39`	`38`	`}`
`40`	`39`	`};`
`41`		`-`
	`40`	`+`
`42`	`41`	`$regexClass->name = $name;`
`43`	`42`	`$regexClass->description = $description;`
`44`	`43`	`$regexClass->regex = $regex;`
`45`		`-`
	`44`	`+`
`46`	`45`	`return $regexClass;`
`47`	`46`	`}`
`48`		`-`
	`47`	`+`
`49`	`48`	`/**`
`50`	`49`	`* Return the Regex that the values are validated against.`
`51`	`50`	`*`
`52`	`51`	`* @return string`
`53`	`52`	`*/`
`54`	`53`	`abstract protected function regex(): string;`
`55`		`-`
	`54`	`+`
`56`	`55`	`/**`
`57`	`56`	`* Serializes an internal value to include in a response.`
`58`	`57`	`*`
`@@ -63,16 +62,16 @@ abstract protected function regex(): string;`
`63`	`62`	`public function serialize($value): string`
`64`	`63`	`{`
`65`	`64`	`$stringValue = assertString($value, InvariantViolation::class);`
`66`		`-`
	`65`	`+`
`67`	`66`	`if (!$this->matchesRegex($stringValue)) {`
`68`	`67`	`throw new InvariantViolation(`
`69`	`68`	`$this->unmatchedRegexMessage($stringValue)`
`70`	`69`	`);`
`71`	`70`	`}`
`72`		`-`
	`71`	`+`
`73`	`72`	`return $stringValue;`
`74`	`73`	`}`
`75`		`-`
	`74`	`+`
`76`	`75`	`/**`
`77`	`76`	`* @param string $value`
`78`	`77`	`*`
`@@ -85,7 +84,7 @@ protected function matchesRegex(string $value): bool`
`85`	`84`	`$value`
`86`	`85`	`)->hasMatch();`
`87`	`86`	`}`
`88`		`-`
	`87`	`+`
`89`	`88`	`/**`
`90`	`89`	`* Parses an externally provided value (query variable) to use as an input.`
`91`	`90`	`*`
`@@ -98,16 +97,16 @@ protected function matchesRegex(string $value): bool`
`98`	`97`	`public function parseValue($value): string`
`99`	`98`	`{`
`100`	`99`	`$stringValue = assertString($value, Error::class);`
`101`		`-`
	`100`	`+`
`102`	`101`	`if (!$this->matchesRegex($stringValue)) {`
`103`	`102`	`throw new Error(`
`104`	`103`	`$this->unmatchedRegexMessage($stringValue)`
`105`	`104`	`);`
`106`	`105`	`}`
`107`		`-`
	`106`	`+`
`108`	`107`	`return $value;`
`109`	`108`	`}`
`110`		`-`
	`109`	`+`
`111`	`110`	`/**`
`112`	`111`	`* Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.`
`113`	`112`	`*`
`@@ -121,17 +120,17 @@ public function parseValue($value): string`
`121`	`120`	`public function parseLiteral($valueNode, array $variables = null): string`
`122`	`121`	`{`
`123`	`122`	`$value = assertStringLiteral($valueNode);`
`124`		`-`
	`123`	`+`
`125`	`124`	`if (!$this->matchesRegex($value)) {`
`126`	`125`	`throw new Error(`
`127`	`126`	`$this->unmatchedRegexMessage($value),`
`128`	`127`	`[$valueNode]`
`129`	`128`	`);`
`130`	`129`	`}`
`131`		`-`
	`130`	`+`
`132`	`131`	`return $value;`
`133`	`132`	`}`
`134`		`-`
	`133`	`+`
`135`	`134`	`/**`
`136`	`135`	`* @param string $value`
`137`	`136`	`*`
`@@ -140,7 +139,7 @@ public function parseLiteral($valueNode, array $variables = null): string`
`140`	`139`	`public function unmatchedRegexMessage(string $value): string`
`141`	`140`	`{`
`142`	`141`	`$safeValue = Utils::printSafeJson($value);`
`143`		`-`
	`142`	`+`
`144`	`143`	`return "The given value {$safeValue} did not match the regex {$this->regex()}";`
`145`	`144`	`}`
`146`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ abstract class StringScalar extends ScalarType`
`21`	`21`	`*/`
`22`	`22`	`public static function make(string $name, string $description = null, callable $isValid): self`
`23`	`23`	`{`
`24`		`- $instance = new class() extends StringScalar`
`25`		`- {`
	`24`	`+ $instance = new class() extends StringScalar {`
`26`	`25`	`/**`
`27`	`26`	`* Check if the given string is a valid email.`
`28`	`27`	`*`
`@@ -35,14 +34,14 @@ protected function isValid(string $stringValue): bool`
`35`	`34`	`return call_user_func($this->isValid, $stringValue);`
`36`	`35`	`}`
`37`	`36`	`};`
`38`		`-`
	`37`	`+`
`39`	`38`	`$instance->name = $name;`
`40`	`39`	`$instance->description = $description;`
`41`	`40`	`$instance->isValid = $isValid;`
`42`		`-`
	`41`	`+`
`43`	`42`	`return $instance;`
`44`	`43`	`}`
`45`		`-`
	`44`	`+`
`46`	`45`	`/**`
`47`	`46`	`* Check if the given string is a valid email.`
`48`	`47`	`*`
`@@ -51,7 +50,7 @@ protected function isValid(string $stringValue): bool`
`51`	`50`	`* @return bool`
`52`	`51`	`*/`
`53`	`52`	`abstract protected function isValid(string $stringValue): bool;`
`54`		`-`
	`53`	`+`
`55`	`54`	`/**`
`56`	`55`	`* Serializes an internal value to include in a response.`
`57`	`56`	`*`
`@@ -62,16 +61,16 @@ abstract protected function isValid(string $stringValue): bool;`
`62`	`61`	`public function serialize($value): string`
`63`	`62`	`{`
`64`	`63`	`$stringValue = assertString($value, InvariantViolation::class);`
`65`		`-`
	`64`	`+`
`66`	`65`	`if (!$this->isValid($stringValue)) {`
`67`	`66`	`throw new InvariantViolation(`
`68`	`67`	`$this->invalidStringMessage($stringValue)`
`69`	`68`	`);`
`70`	`69`	`}`
`71`		`-`
	`70`	`+`
`72`	`71`	`return $stringValue;`
`73`	`72`	`}`
`74`		`-`
	`73`	`+`
`75`	`74`	`/**`
`76`	`75`	`* @param string $stringValue`
`77`	`76`	`*`
`@@ -80,10 +79,10 @@ public function serialize($value): string`
`80`	`79`	`public function invalidStringMessage(string $stringValue): string`
`81`	`80`	`{`
`82`	`81`	`$safeValue = Utils::printSafeJson($stringValue);`
`83`		`-`
	`82`	`+`
`84`	`83`	`return "The given string {$safeValue} is not a valid {$this->tryInferName()}.";`
`85`	`84`	`}`
`86`		`-`
	`85`	`+`
`87`	`86`	`/**`
`88`	`87`	`* Parses an externally provided value (query variable) to use as an input.`
`89`	`88`	`*`
`@@ -96,16 +95,16 @@ public function invalidStringMessage(string $stringValue): string`
`96`	`95`	`public function parseValue($value): string`
`97`	`96`	`{`
`98`	`97`	`$stringValue = assertString($value, Error::class);`
`99`		`-`
	`98`	`+`
`100`	`99`	`if (!$this->isValid($stringValue)) {`
`101`	`100`	`throw new Error(`
`102`	`101`	`$this->invalidStringMessage($stringValue)`
`103`	`102`	`);`
`104`	`103`	`}`
`105`		`-`
	`104`	`+`
`106`	`105`	`return $stringValue;`
`107`	`106`	`}`
`108`		`-`
	`107`	`+`
`109`	`108`	`/**`
`110`	`109`	`* Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.`
`111`	`110`	`*`
`@@ -124,14 +123,14 @@ public function parseValue($value): string`
`124`	`123`	`public function parseLiteral($valueNode, array $variables = null): string`
`125`	`124`	`{`
`126`	`125`	`$stringValue = assertStringLiteral($valueNode);`
`127`		`-`
	`126`	`+`
`128`	`127`	`if (!$this->isValid($stringValue)) {`
`129`	`128`	`throw new Error(`
`130`	`129`	`$this->invalidStringMessage($stringValue),`
`131`	`130`	`$valueNode`
`132`	`131`	`);`
`133`	`132`	`}`
`134`		`-`
	`133`	`+`
`135`	`134`	`return $stringValue;`
`136`	`135`	`}`
`137`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class MyStringScalar extends StringScalar`
`10`	`10`	`{`
`11`	`11`	`public $description = 'Bar';`
`12`		`-`
	`12`	`+`
`13`	`13`	`/**`
`14`	`14`	`* Check if the given string is a valid email.`
`15`	`15`	`*`