Apply fixes from StyleCI

Author: spawnia

src/Regex.php

@@ -20,7 +20,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.
      *
@@ -29,7 +29,7 @@ abstract protected function regex(): string;
      *
      * @return Regex
      */
-    public static function make(string $name, string $regex): Regex
+    public static function make(string $name, string $regex): self
     {
         $regexClass = new class() extends Regex {
             /**
@@ -44,13 +44,13 @@ protected function regex(): string
                 return $this->regex;
             }
         };
-        
+
         $regexClass->name = $name;
         $regexClass->regex = $regex;
-        
+
         return $regexClass;
     }
-    
+
     /**
      * Serializes an internal value to include in a response.
      *
@@ -74,7 +74,7 @@ public function serialize($value): string
 
         return $stringValue;
     }
-    
+
     /**
      * Parses an externally provided value (query variable) to use as an input.
      *
@@ -88,20 +88,21 @@ public function parseValue($value): string
     {
         if (!canBeString($value)) {
             $safeValue = Utils::printSafe($value);
-        
+
             throw new Error("The given value {$safeValue} can not be serialized.");
         }
-    
+
         $stringValue = strval($value);
-    
-        if(!$this->matchesRegex($stringValue)){
+
+        if (!$this->matchesRegex($stringValue)) {
             $safeValue = Utils::printSafeJson($stringValue);
+
             throw new Error("The given value {$safeValue} did not match the regex {$this->regex()}");
         }
 
         return $value;
     }
-    
+
     /**
      * Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.
      *
@@ -122,14 +123,15 @@ public function parseLiteral($valueNode, array $variables = null): string
         if (!$valueNode instanceof StringValueNode) {
             throw new Error("Query error: Can only parse strings got: {$valueNode->kind}", [$valueNode]);
         }
-    
+
         $value = $valueNode->value;
-        
-        if(!$this->matchesRegex($value)){
+
+        if (!$this->matchesRegex($value)) {
             $safeValue = Utils::printSafeJson($value);
+
             throw new Error("The given value {$safeValue} did not match the regex {$this->regex()}", [$valueNode]);
         }
-    
+
         return $value;
     }
 

tests/Foo.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use MLL\GraphQLScalars\Regex;

tests/RegexTest.php

@@ -17,10 +17,9 @@ public function regexClassProvider()
     {
         return [
             [
-                new class() extends Regex
-                {
+                new class() extends Regex {
                     public $name = 'Foo';
-                    
+
                     /**
                      * Return the Regex that the values are validated against.
                      *
@@ -35,98 +34,96 @@ protected function regex(): string
                 },
             ],
             [
-                new Foo
+                new Foo(),
             ],
             [
-                Regex::make('Foo', '/foo/')
-            ]
+                Regex::make('Foo', '/foo/'),
+            ],
         ];
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testCreateNamedRegexClass(Regex $regex)
     {
         $this->assertSame('Foo', $regex->name);
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testSerializeThrowsIfUnserializableValueIsGiven(Regex $regex)
     {
         $this->expectException(InvariantViolation::class);
-        
+
         $regex->serialize(
-            new class()
-            {
+            new class() {
             }
         );
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testSerializeThrowsIfRegexIsNotMatched(Regex $regex)
     {
         $this->expectException(InvariantViolation::class);
         $this->expectExceptionMessageRegExp('/did not match the regex/');
-        
+
         $regex->serialize('bar');
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testSerializePassesWhenRegexMatches(Regex $regex)
     {
         $serializedResult = $regex->serialize('foo');
-        
+
         $this->assertSame('foo', $serializedResult);
     }
-    
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testSerializePassesForStringableObject(Regex $regex)
     {
         $serializedResult = $regex->serialize(
-            new class()
-            {
+            new class() {
                 public function __toString(): string
                 {
                     return 'Contains foo right?';
                 }
             }
         );
-        
+
         $this->assertSame('Contains foo right?', $serializedResult);
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testParseValueThrowsIfValueCantBeString(Regex $regex)
     {
         $this->expectException(Error::class);
         $this->expectExceptionMessageRegExp('/can not be serialized/');
-        
-        $regex->parseValue(new class{});
+
+        $regex->parseValue(new class() {
+        });
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testParseValueThrowsIfValueDoesNotMatch(Regex $regex)
     {
         $this->expectException(Error::class);
         $this->expectExceptionMessageRegExp('/did not match the regex/');
-        
+
         $regex->parseValue('');
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
@@ -137,29 +134,29 @@ public function testParseValuePassesOnMatch(Regex $regex)
             $regex->parseValue('foo')
         );
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testParseLiteralThrowsIfNotString(Regex $regex)
     {
         $this->expectException(Error::class);
-        $this->expectExceptionMessageRegExp('/'. NodeKind::INT.'/');
-        
+        $this->expectExceptionMessageRegExp('/'.NodeKind::INT.'/');
+
         $regex->parseLiteral(new IntValueNode([]));
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */
     public function testParseLiteralThrowsIfValueDoesNotMatch(Regex $regex)
     {
         $this->expectException(Error::class);
         $this->expectExceptionMessageRegExp('/did not match the regex/');
-        
+
         $regex->parseLiteral(new StringValueNode(['value' => 'asdf']));
     }
-    
+
     /**
      * @dataProvider regexClassProvider
      */