cmpayments / json-schema-validator

src/CMPayments/SchemaValidator/SchemaValidator.php

Spacing +14 added lines, -14 removed lines

@@ -67,7 +67,7 @@ 
         $filename = $cache->getFilename();
         if (empty($filename)) {
 
-            $cache->setFilename(md5(json_encode($schema)) . '.php');
+            $cache->setFilename(md5(json_encode($schema)).'.php');
         }
 
         // if cache file exists, require it, if not, validate the schema
@@ -149,7 +149,7 @@ 
                     || (!isset($schema->additionalProperties) && (isset($this->rootSchema->additionalProperties) && !$this->rootSchema->additionalProperties))
                 ) {
                     // $schema->additionalProperties says NO, log that a fields is missing
-                    $this->addError(ValidateException::ERROR_USER_DATA_PROPERTY_IS_NOT_AN_ALLOWED_PROPERTY, [$path . '/' . $property]);
+                    $this->addError(ValidateException::ERROR_USER_DATA_PROPERTY_IS_NOT_AN_ALLOWED_PROPERTY, [$path.'/'.$property]);
                 }
             }
             // Everything else
@@ -172,10 +172,10 @@ 
     public function validate($schema, $property, $data, $path)
     {
         // check if the expected $schema->type matches gettype($data)
-        $type = $this->validateType($schema, $data, ((substr($path, -1) !== '/') ? $path . '/' . $property : $path . $property));
+        $type = $this->validateType($schema, $data, ((substr($path, -1) !== '/') ? $path.'/'.$property : $path.$property));
 
         // append /$property to $path
-        $path .= (substr($path, 0, 1) !== '/') ? '/' . $property : $property;
+        $path .= (substr($path, 0, 1) !== '/') ? '/'.$property : $property;
 
         // if $type is an object
         if ($type === BaseValidator::OBJECT) {
@@ -186,7 +186,7 @@ 
             && ($schema->type === $type)
         ) { // everything else except boolean
 
-            $method = 'validate' . ucfirst($type);
+            $method = 'validate'.ucfirst($type);
             $this->$method($data, $schema, $path);
 
             // check for format property on schema
@@ -248,12 +248,12 @@ 
             // check if the given schema is not empty
             if (empty($schemaPropertiesInArray)) {
 
-                throw new ValidateSchemaException(ValidateSchemaException::ERROR_SCHEMA_CANNOT_BE_EMPTY_IN_PATH, [$path . '/properties']);
+                throw new ValidateSchemaException(ValidateSchemaException::ERROR_SCHEMA_CANNOT_BE_EMPTY_IN_PATH, [$path.'/properties']);
             }
 
             foreach ($schema->properties as $property => $childSchema) {
 
-                $subPath = $path . '.properties';
+                $subPath = $path.'.properties';
 
                 // when an object key is empty it becomes '_empty_' by json_decode(), catch it since this is not valid
                 if ($property === '_empty_') {
@@ -270,12 +270,12 @@ 
                             'Schema',
                             $this->getPreposition(gettype($childSchema)),
                             gettype($childSchema),
-                            (' in ' . $subPath)
+                            (' in '.$subPath)
                         ]);
                 }
 
                 // do recursion
-                $schema->properties->$property = $this->validateSchema($childSchema, ($subPath . '.' . $property));
+                $schema->properties->$property = $this->validateSchema($childSchema, ($subPath.'.'.$property));
             }
 
             // check if the optional property 'required' is set on $schema
@@ -287,7 +287,7 @@ 
         } elseif ($schema->type === BaseValidator::_ARRAY) {
 
             // do recursion
-            $schema->items = $this->validateSchema($schema->items, ($path . '.items'));
+            $schema->items = $this->validateSchema($schema->items, ($path.'.items'));
         }
 
         return $schema;
@@ -463,7 +463,7 @@ 
         }
 
         // check if $expected contains the $property
-        $values = (array) $schema->$property;
+        $values = (array)$schema->$property;
         foreach ($values as $value) {
             if (!in_array($value, $expected)) {
 
@@ -514,7 +514,7 @@ 
      */
     private function validateSchemaRequiredAgainstProperties($schema, $path)
     {
-        $requiredPath = $path . '.required';
+        $requiredPath = $path.'.required';
 
         // $schema->required must be an array
         if (!is_array($schema->required)) {
@@ -696,7 +696,7 @@ 
 
         // check if given type matches the expected type, if not add verbose error
         $type = strtolower($type);
-        $types = (array) $schema->type;
+        $types = (array)$schema->type;
         if (!in_array($type, $types)) {
 
             $msg    = ValidateException::ERROR_USER_DATA_VALUE_DOES_NOT_MATCH_CORRECT_TYPE_1;
@@ -710,7 +710,7 @@ 
 
                     $data = str_replace("\n", '', $data);
                     $data = preg_replace("/\r|\n/", '', $data);
-                    $data = (strlen($data) < 25) ? $data : substr($data, 0, 25) . ' [...]';
+                    $data = (strlen($data) < 25) ? $data : substr($data, 0, 25).' [...]';
                 }
 
                 $params[] = $data;

src/CMPayments/SchemaValidator/Validators/ErrorTrait.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
      */
     public function getPreposition($type)
     {
-        $types = (array) $type;
+        $types = (array)$type;
         $type = strtolower($types[0]);
 
         if (!isset($this->prepositions[$type])) {
@@ -140,9 +140,9 @@ 
     {
         if (in_array(($lastDigit = (int)substr($number, -1)), [1, 2, 3])) {
 
-            return $number . $this->stringifiedOrdinals[$lastDigit];
+            return $number.$this->stringifiedOrdinals[$lastDigit];
         }
 
-        return $number . $this->stringifiedOrdinals[0];
+        return $number.$this->stringifiedOrdinals[0];
     }
 }