MyMedia / php-argument-builder

src/Validator/ArgumentBuilderTypeValidator.php

Spacing +3 added lines, -3 removed lines

@@ -31,8 +31,8 @@ 
      */
     public function __construct($name, $class)
     {
-        $this->name = $name;
-        $this->class = $class;
+        $this->name=$name;
+        $this->class=$class;
     }
 
     /**
@@ -56,7 +56,7 @@ 
             ));
         }
 
-        $refClass = new \ReflectionClass($this->class);
+        $refClass=new \ReflectionClass($this->class);
         if (!$refClass->isInstance($value)) {
             throw new Exception\InvalidArgumentException(
                 'Value of the field "'.$this->name.'" must an instance of ArgumentBuilderInterface'

src/AbstractArgumentBuilder.php

Spacing +27 added lines, -27 removed lines

@@ -14,15 +14,15 @@ 
  */
 abstract class AbstractArgumentBuilder implements ArgumentBuilderInterface
 {
-    public const ARGUMENT_TYPE_MIXED = 0;
-    public const ARGUMENT_TYPE_ARGUMENT_BUILDER = 1;
-    public const ARGUMENT_TYPE_NUMERIC = 2;
-    public const ARGUMENT_TYPE_ENUM = 3;
-    public const ARGUMENT_TYPE_BOOLEAN = 4;
+    public const ARGUMENT_TYPE_MIXED=0;
+    public const ARGUMENT_TYPE_ARGUMENT_BUILDER=1;
+    public const ARGUMENT_TYPE_NUMERIC=2;
+    public const ARGUMENT_TYPE_ENUM=3;
+    public const ARGUMENT_TYPE_BOOLEAN=4;
 
-    protected $args = array();
+    protected $args=array();
 
-    protected $fields = array(
+    protected $fields=array(
         //'arg1' => self::ARGUMENT_TYPE_MIXED,
         //'arg2' => SomeArgumentBuilder::class,
     );
@@ -46,9 +46,9 @@ 
      */
     private function camelCaseToSnakeCase($str)
     {
-        $str[0] = strtolower($str[0]);
+        $str[0]=strtolower($str[0]);
 
-        return preg_replace_callback('/([A-Z])/', function ($c) {
+        return preg_replace_callback('/([A-Z])/', function($c) {
             return '_'.strtolower($c[1]);
         }, $str);
     }
@@ -75,7 +75,7 @@ 
         foreach ($this->fields as $name => $field) {
             // Consider string value as a class name
             if (is_string($field)) {
-                $this->fields[$name] = array(
+                $this->fields[$name]=array(
                     'type' => self::ARGUMENT_TYPE_ARGUMENT_BUILDER,
                     'class' => $field,
                     'validator' => new ArgumentBuilderTypeValidator($name, $field),
@@ -83,7 +83,7 @@ 
 
             // consider numeric values as type name
             } elseif (is_int($field)) {
-                $this->fields[$name] = array(
+                $this->fields[$name]=array(
                     'type' => $field,
                     'validator' => null,
                 );
@@ -136,7 +136,7 @@ 
             return true;
         }
 
-        $validator = $this->fields[$field]['validator'];
+        $validator=$this->fields[$field]['validator'];
 
         if ($validator instanceof TypeValidatorInterface) {
             return $validator->validate($value);
@@ -189,8 +189,8 @@ 
             throw new Exception\UnmatchedCallTypeException();
         }
 
-        $field = lcfirst($matches[1]);
-        $field = $this->camelCaseToSnakeCase($field);
+        $field=lcfirst($matches[1]);
+        $field=$this->camelCaseToSnakeCase($field);
 
         if (!array_key_exists($field, $this->fields)) {
             throw new Exception\UndefinedMethodException($name);
@@ -233,11 +233,11 @@ 
             throw new Exception\UnmatchedCallTypeException();
         }
 
-        $field = $matches[1];
+        $field=$matches[1];
         if ('-' !== $field[0]) {
-            $field = lcfirst($matches[1]);
+            $field=lcfirst($matches[1]);
         }
-        $field = $this->camelCaseToSnakeCase($field);
+        $field=$this->camelCaseToSnakeCase($field);
 
         if (!array_key_exists($field, $this->fields)) {
             throw new Exception\UndefinedMethodException($name);
@@ -247,7 +247,7 @@ 
             throw new Exception\InvalidArgumentException('Method '.__CLASS__.'::'.$name.'() must take exactly 1 argument');
         }
 
-        $value = $arguments[0];
+        $value=$arguments[0];
 
         if (self::ARGUMENT_TYPE_ARGUMENT_BUILDER === $this->fields[$field]['type'] && count($arguments) > 1) {
             if (!is_string($arguments[0])) {
@@ -256,15 +256,15 @@ 
                 );
             }
 
-            $class = $this->fields[$field]['class'];
-            $value = isset($this->args[$field]) ? $this->args[$field] : new $class();
+            $class=$this->fields[$field]['class'];
+            $value=isset($this->args[$field]) ? $this->args[$field] : new $class();
 
             call_user_func_array(array($value, 'set'.$this->snakeCaseToCamelCase($arguments[0])), array_slice($arguments, 1));
         } elseif (!$this->validateFieldValue($field, $value)) {
             throw new Exception\InvalidArgumentException(sprintf('Invalid value "%s" for field "%s"', $value, $field));
         }
 
-        $this->args[$field] = $value;
+        $this->args[$field]=$value;
 
         return $this;
     }
@@ -286,11 +286,11 @@ 
             throw new Exception\UnmatchedCallTypeException();
         }
 
-        $field = $matches[1];
+        $field=$matches[1];
         if ('-' !== $field[0]) {
-            $field = lcfirst($matches[1]);
+            $field=lcfirst($matches[1]);
         }
-        $field = $this->camelCaseToSnakeCase($field);
+        $field=$this->camelCaseToSnakeCase($field);
 
         // Check if field is defined for this ArgumentBuilder
         if (!array_key_exists($field, $this->fields)) {
@@ -347,13 +347,13 @@ 
      */
     public function build()
     {
-        $result = array();
+        $result=array();
 
         foreach ($this->args as $key => $arg) {
             if ($arg instanceof ArgumentBuilderInterface) {
-                $result[$key] = $arg->build(); //@todo: missing Circular Reference check
+                $result[$key]=$arg->build(); //@todo: missing Circular Reference check
             } else {
-                $result[$key] = $this->transformValue($key, $arg);
+                $result[$key]=$this->transformValue($key, $arg);
             }
         }
 

tests/Fixtures/CustomMockArgumentBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public function __construct(array $fields)
     {
-        $this->fields = $fields;
+        $this->fields=$fields;
         parent::__construct();
     }
 }

tests/Fixtures/SubMockArgumentBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class SubMockArgumentBuilder extends AbstractArgumentBuilder
 {
-    protected $fields = array(
+    protected $fields=array(
         'subarg1' => self::ARGUMENT_TYPE_MIXED,
         'subarg2' => self::ARGUMENT_TYPE_MIXED,
         'boolarg' => self::ARGUMENT_TYPE_BOOLEAN,

tests/Fixtures/MockArgumentBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 {
     protected function load()
     {
-        $this->fields = array(
+        $this->fields=array(
             'arg1' => self::ARGUMENT_TYPE_MIXED,
             'arg2' => self::ARGUMENT_TYPE_MIXED,
             'sub1' => SubMockArgumentBuilder::class,
@@ -18,7 +18,7 @@ 
             ),
             'enum' => array(
                 'type' => self::ARGUMENT_TYPE_ENUM,
-                'validator' => function ($value) {
+                'validator' => function($value) {
                     return in_array($value, array('val1', 'val2'));
                 },
             ),

tests/Unit/AbstractArgumentBuilderTest.php

Spacing +40 added lines, -40 removed lines

@@ -18,7 +18,7 @@ 
 
     protected function setUp()
     {
-        $this->sampleData = array(
+        $this->sampleData=array(
             'arg1' => 'xxx',
             'arg2' => 'yyy',
             'sub1' => array(
@@ -34,12 +34,12 @@ 
             'enum' => 'val1',
         );
 
-        $this->sampleDataEncoded = http_build_query($this->sampleData);
+        $this->sampleDataEncoded=http_build_query($this->sampleData);
     }
 
     private function getBuilderMock()
     {
-        $builder = new MockArgumentBuilder();
+        $builder=new MockArgumentBuilder();
         $builder->setArg1('xxx');
         $builder->setArg2('yyy');
         $builder->setSub1('subarg1', 'zzz');
@@ -55,21 +55,21 @@ 
 
     public function testBuild()
     {
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
 
         $this->assertEquals($this->sampleData, $builder->build());
     }
 
     public function testToString()
     {
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
 
         $this->assertEquals($this->sampleDataEncoded, (string) $builder);
     }
 
     public function testGetFields()
     {
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
 
         $this->assertEquals('xxx', $builder->getArg1());
         $this->assertInstanceOf(SubMockArgumentBuilder::class, $builder->getSub1());
@@ -80,12 +80,12 @@ 
 
     public function testSetNullFields()
     {
-        $data = $this->sampleData;
-        $data['arg1'] = null;
-        $data['sub1'] = null;
-        $data['sub2']['subarg1'] = null;
+        $data=$this->sampleData;
+        $data['arg1']=null;
+        $data['sub1']=null;
+        $data['sub2']['subarg1']=null;
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setArg1(null);
         $builder->setSub1(null);
         $builder->setSub2('subarg1', null);
@@ -95,16 +95,16 @@ 
 
     public function testSetSubAsObject()
     {
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setSub1(new SubMockArgumentBuilder());
     }
 
     public function testUnsetFields()
     {
-        $data = $this->sampleData;
+        $data=$this->sampleData;
         unset($data['arg1'], $data['sub1'], $data['sub2']['subarg1']);
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->unsetArg1();
         $builder->unsetSub1();
         $builder->unsetSub2('subarg1');
@@ -114,13 +114,13 @@ 
 
     public function testSetFields()
     {
-        $data = $this->sampleData;
-        $data['arg1'] = 'aaa';
-        $data['sub1']['subarg1'] = 'new';
-        $data['sub1']['boolarg'] = 'true';
-        $data['sub2'] = array('subarg1' => 'good');
+        $data=$this->sampleData;
+        $data['arg1']='aaa';
+        $data['sub1']['subarg1']='new';
+        $data['sub1']['boolarg']='true';
+        $data['sub2']=array('subarg1' => 'good');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setArg1('aaa');
         $builder->setSub1('subarg1', 'new');
         $builder->setSub2((new SubMockArgumentBuilder())->setSubarg1('good'));
@@ -134,7 +134,7 @@ 
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('Field description must be either string (shortcut for class name), or int (shortcut for field type) or array (full form)');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => new \stdClass(),
         ));
         $builder->setArg1('aaa');
@@ -145,7 +145,7 @@ 
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('Field type is not defined');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => array(
             ),
         ));
@@ -157,7 +157,7 @@ 
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('Field of type ARGUMENT_TYPE_ARGUMENT_BUILDER must have class defined');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => array(
                 'type' => AbstractArgumentBuilder::ARGUMENT_TYPE_ARGUMENT_BUILDER,
             ),
@@ -170,7 +170,7 @@ 
         $this->expectException(UndefinedMethodException::class);
         $this->expectExceptionMessageRegExp('/^Call to undefined method/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->dummyCall('foo');
     }
 
@@ -179,7 +179,7 @@ 
         $this->expectException(UndefinedMethodException::class);
         $this->expectExceptionMessageRegExp('/^Call to undefined method/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setNonexistant('blah');
     }
 
@@ -188,7 +188,7 @@ 
         $this->expectException(UndefinedMethodException::class);
         $this->expectExceptionMessageRegExp('/^Call to undefined method/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->unsetNonexistant();
     }
 
@@ -200,7 +200,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Method .+ expects the first parameter to be string if you want to get sub-value$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->getSub1($value);
     }
 
@@ -209,7 +209,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/Method .+ must take exactly 0 arguments/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->getArg1('yyy');
     }
 
@@ -218,7 +218,7 @@ 
         $this->expectException(UndefinedMethodException::class);
         $this->expectExceptionMessageRegExp('/^Call to undefined method/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->getDummy();
     }
 
@@ -227,7 +227,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Value of the field ".+" must an instance of ArgumentBuilderInterface$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setSub1(new \stdClass());
     }
 
@@ -236,7 +236,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Invalid value type. Expected instance of ".+", got ".+".$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setSub1(array('xxx'));
     }
 
@@ -245,7 +245,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Method .+ must take exactly 1 argument$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setArg1('aaa', 'bbb');
     }
 
@@ -257,7 +257,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Method .+ expects the first parameter to be string$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->setSub1($value, 'bbb');
     }
 
@@ -266,7 +266,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Method .+ must take exactly 0 arguments$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->unsetArg1('bbb');
     }
 
@@ -278,7 +278,7 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Method .+ expects the first parameter to be string if you want to unset sub-value$/');
 
-        $builder = $this->getBuilderMock();
+        $builder=$this->getBuilderMock();
         $builder->unsetSub1($value);
     }
 
@@ -287,7 +287,7 @@ 
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessageRegExp('/^Class ".+" not found \(field\: ".+"\)$/');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => 'DummyNonExistantClass',
         ));
         $builder->setArg1('something');
@@ -301,7 +301,7 @@ 
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessageRegExp('/^Validator for the field ".+" is defined but is not callable$/');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => array(
                 'type' => AbstractArgumentBuilder::ARGUMENT_TYPE_MIXED,
                 'validator' => $validator,
@@ -315,7 +315,7 @@ 
      */
     public function testArgumentBuilderEmptyValidator($validator)
     {
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => array(
                 'type' => AbstractArgumentBuilder::ARGUMENT_TYPE_MIXED,
                 'validator' => $validator,
@@ -329,10 +329,10 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageRegExp('/^Invalid value ".+" for field ".+"$/');
 
-        $builder = new CustomMockArgumentBuilder(array(
+        $builder=new CustomMockArgumentBuilder(array(
             'arg1' => array(
                 'type' => AbstractArgumentBuilder::ARGUMENT_TYPE_MIXED,
-                'validator' => function () {
+                'validator' => function() {
                     return false;
                 },
             ),