OriHoch / tableschema-php

src/SchemaValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
     /**
      * @param integer $code
-     * @param mixed $extraDetails
+     * @param string $extraDetails
      */
     protected function addError($code, $extraDetails=null)
     {

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      * @param integer $code
      * @param mixed $extraDetails
      */
-    protected function addError($code, $extraDetails=null)
+    protected function addError($code, $extraDetails = null)
     {
         $this->errors[] = new SchemaValidationError($code, $extraDetails);
     }
@@ -53,7 +53,7 @@ 
         $this->applyForeignKeysResourceHack($descriptor);
         $validator->validate(
             $descriptor,
-            (object)['$ref' => 'file://' . realpath(dirname(__FILE__)).'/schemas/table-schema.json']
+            (object)['$ref' => 'file://' . realpath(dirname(__FILE__)) . '/schemas/table-schema.json']
         );
         if (!$validator->isValid()) {
             foreach ($validator->getErrors() as $error) {

src/DataSources/BaseDataSource.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  */
 abstract class BaseDataSource implements DataSourceInterface
 {
-    public function __construct($dataSource, $options=null)
+    public function __construct($dataSource, $options = null)
     {
         $this->dataSource = $dataSource;
         $this->options = empty($options) ? (object)[] : $options;
@@ -27,7 +27,7 @@ 
     protected $dataSource;
     protected $options;
 
-    protected function getOption($name, $default=null)
+    protected function getOption($name, $default = null)
     {
         if (isset($this->options->{$name})) {
             return $this->options->{$name};

src/Exceptions/SchemaValidationFailedException.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validationErrors)
     {
-        parent::__construct("Schema failed validation: ".SchemaValidationError::getErrorMessages($validationErrors));
+        parent::__construct("Schema failed validation: " . SchemaValidationError::getErrorMessages($validationErrors));
         $this->validationErrors = $validationErrors;
     }
 }

src/Exceptions/DataSourceException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 class DataSourceException extends \Exception
 {
-    public function __construct($message, $rowNum=0)
+    public function __construct($message, $rowNum = 0)
     {
         if (!empty($rowNum)) $message = "row {$rowNum}: {$message}";
         parent::__construct($message);

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 {
     public function __construct($message, $rowNum=0)
     {
-        if (!empty($rowNum)) $message = "row {$rowNum}: {$message}";
+        if (!empty($rowNum)) {
+            $message = "row {$rowNum}: {$message}";
+        }
         parent::__construct($message);
     }
 }

src/Exceptions/SchemaLoadException.php

Spacing +4 added lines, -4 removed lines

@@ -14,12 +14,12 @@
     public function __construct($descriptor, $descriptorSource, $errorMessage)
     {
         if (!empty($descriptor) && empty($descriptorSource)) {
-            $message = "error decoding descriptor ".json_encode($descriptor).": {$errorMessage}";
+            $message = "error decoding descriptor " . json_encode($descriptor) . ": {$errorMessage}";
         } elseif (!empty($descriptor) && !empty($descriptorSource)) {
-            $message = "error decoding descriptor from source ".json_encode($descriptorSource)
-                ." - ".json_encode($descriptor).": {$errorMessage}";
+            $message = "error decoding descriptor from source " . json_encode($descriptorSource)
+                ." - " . json_encode($descriptor) . ": {$errorMessage}";
         } elseif (empty($descriptor) && !empty($descriptorSource)) {
-            $message = "error loading descriptor from source ".json_encode($descriptorSource)
+            $message = "error loading descriptor from source " . json_encode($descriptorSource)
                 .": {$errorMessage}";
         } else {
             $message = "unexpected load error: {$errorMessage}";

src/SchemaValidationError.php

Spacing +7 added lines, -7 removed lines

@@ -3,11 +3,11 @@ 
 
 class SchemaValidationError
 {
-    const LOAD_FAILED=1;
-    const SCHEMA_VIOLATION=8;
-    const FIELD_VALIDATION=21;
-    const ROW_FIELD_VALIDATION=22;
-    const ROW_VALIDATION=23;
+    const LOAD_FAILED = 1;
+    const SCHEMA_VIOLATION = 8;
+    const FIELD_VALIDATION = 21;
+    const ROW_FIELD_VALIDATION = 22;
+    const ROW_VALIDATION = 23;
 
     public $code;
     public $extraDetails;
@@ -16,7 +16,7 @@ 
      * @param integer $code
      * @param mixed $extraDetails
      */
-    public function __construct($code, $extraDetails=null)
+    public function __construct($code, $extraDetails = null)
     {
         $this->code = $code;
         $this->extraDetails = $extraDetails;
@@ -61,7 +61,7 @@ 
      */
     public static function getErrorMessages($validationErrors)
     {
-        return implode(", ", array_map(function($validationError){
+        return implode(", ", array_map(function($validationError) {
             /** @var SchemaValidationError $validationError */
             return $validationError->getMessage();
         }, $validationErrors));

src/Table.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
      * @param int $numPeekRows
      * @return array of validation errors
      */
-    public static function validate($dataSource, $schema, $numPeekRows=10)
+    public static function validate($dataSource, $schema, $numPeekRows = 10)
     {
         try {
             $table = new static($dataSource, $schema);
@@ -49,7 +49,7 @@ 
                 // validation error in one of the fields
                 return array_map(function($validationError) use ($i) {
                     return new SchemaValidationError(SchemaValidationError::ROW_FIELD_VALIDATION, [
-                        "row" => $i+1,
+                        "row" => $i + 1,
                         "field" => $validationError->extraDetails["field"],
                         "error" => $validationError->extraDetails["error"],
                         "value" => $validationError->extraDetails["value"],
@@ -73,11 +73,11 @@ 
 
     // not interesting, standard iterator functions
     // to simplify we prevent rewinding - so you can only iterate once
-    public function __destruct() {$this->dataSource->close();}
-    public function rewind() {if ($this->currentLine == 0) {$this->currentLine = 1;} else {throw new \Exception("rewind is not supported");}}
-    public function key() {return $this->currentLine;}
-    public function next() {$this->currentLine++;}
-    public function valid() {return !$this->dataSource->isEof();}
+    public function __destruct() {$this->dataSource->close(); }
+    public function rewind() {if ($this->currentLine == 0) {$this->currentLine = 1; } else {throw new \Exception("rewind is not supported"); }}
+    public function key() {return $this->currentLine; }
+    public function next() {$this->currentLine++; }
+    public function valid() {return !$this->dataSource->isEof(); }
 
     protected $currentLine = 0;
     protected $dataSource;

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
             $i = 0;
             try {
                 foreach ($table as $row) {
-                    if (++$i > $numPeekRows) break;
+                    if (++$i > $numPeekRows) {
+                        break;
+                    }
                 }
             } catch (Exceptions\DataSourceException $e) {
                 // general error in getting the next row from the data source

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace frictionlessdata\tableschema;
 use frictionlessdata\tableschema\Exceptions\DataSourceException;
-use frictionlessdata\tableschema\Fields\BaseField;
 
 /**
  * represents a data source which validates against a table schema

src/Fields/FieldsFactory.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
         throw new FieldValidationException([
             new SchemaValidationError(
                 SchemaValidationError::SCHEMA_VIOLATION,
-                "Could not find a valid field for descriptor: ".json_encode($descriptor))
+                "Could not find a valid field for descriptor: " . json_encode($descriptor))
         ]);
     }
 
@@ -43,7 +43,7 @@ 
      * @return mixed
      * @throws FieldValidationException
      */
-    public static function infer($val, $descriptor=null, $lenient=false)
+    public static function infer($val, $descriptor = null, $lenient = false)
     {
         foreach (static::$fieldClasses as $fieldClass) {
             /** @var BaseField $fieldClass */
@@ -54,7 +54,7 @@ 
         throw new FieldValidationException([
             new SchemaValidationError(
                 SchemaValidationError::SCHEMA_VIOLATION,
-                "Could not find a valid field for value: ".json_encode($val))
+                "Could not find a valid field for value: " . json_encode($val))
         ]);
     }
 }
\ No newline at end of file

src/Fields/FieldsInferrer.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     /**
      * @param null|array $rows optional initial rows to infer by, each row is an array of field name => field value
      */
-    public function __construct($rows=null, $lenient=false)
+    public function __construct($rows = null, $lenient = false)
     {
         $this->lenient = $lenient;
         if (!empty($rows)) {

Braces +3 added lines, -1 removed lines

@@ -116,7 +116,9 @@
             try {
                 $rowNum = 0;
                 foreach ($this->inputRows as $inputRow) {
-                    if (!array_key_exists($rowNum, $this->castRows)) $this->castRows[$rowNum] = [];
+                    if (!array_key_exists($rowNum, $this->castRows)) {
+                        $this->castRows[$rowNum] = [];
+                    }
                     $this->castRows[$rowNum][$fieldName] = $inferredField->castValue($inputRow[$fieldName]);
                     $rowNum++;
                 }