byjg / anydataset

src/Repository/FixedTextFileIterator.php

Doc Comments +4 added lines

@@ -84,6 +84,10 @@
         }
     }
 
+    /**
+     * @param string $buffer
+     * @param FixedTextDefinition[] $fieldDefinition
+     */
     protected function processBuffer($buffer, $fieldDefinition)
     {
         $cntDef = count($fieldDefinition);

Spacing +2 added lines, -2 removed lines

@@ -92,9 +92,9 @@
             $fieldDef = $fieldDefinition[$i];
 
             $fields[$fieldDef->fieldName] = substr($buffer, $fieldDef->startPos, $fieldDef->length);
-            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[" . $fieldDef->requiredValue . "]$/",
+            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[".$fieldDef->requiredValue."]$/",
                     $fields[$fieldDef->fieldName]))) {
-                throw new IteratorException("Expected the value '" . $fieldDef->requiredValue . "' and I got '" . $fields[$fieldDef->fieldName] . "'");
+                throw new IteratorException("Expected the value '".$fieldDef->requiredValue."' and I got '".$fields[$fieldDef->fieldName]."'");
             } elseif (is_array($fieldDef->subTypes)) {
                 $fields[$fieldDef->fieldName] = $this->processBuffer($fields[$fieldDef->fieldName], $fieldDef->subTypes);
             }

src/Repository/IteratorFilter.php

Doc Comments +4 added lines, -5 removed lines

@@ -47,7 +47,6 @@ 
      * @param string $tableName
      * @param array &$params
      * @param string $returnFields
-     * @param string $paramSubstName If ended with "_" the program subst by argname;
      * @return string
      */
     public function getSql($tableName, &$params, $returnFields = "*")
@@ -72,8 +71,8 @@ 
 
     /**
      *
-     * @param $array
-     * @return unknown_type
+     * @param SingleRow[] $array
+     * @return \DOMNodeList
      */
     public function match($array)
     {
@@ -93,7 +92,7 @@ 
      *
      * @param $type use XPATH or SQL
      * @param $param
-     * @return unknown_type
+     * @return string
      */
     public function getFilter($type, &$param)
     {
@@ -242,7 +241,7 @@ 
     /**
      *
      * @param string[] $array
-     * @return string
+     * @return boolean
      */
     private function evalString($array)
     {

Switch Indentation +98 added lines, -98 removed lines

@@ -141,38 +141,38 @@ 
 
         $result = "";
         switch ($relation) {
-            case Relation::EQUAL: {
-                    $result = $field . "=" . $value;
-                    break;
-                }
-            case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $value;
-                    break;
-                }
-            case Relation::LESS_THAN: {
-                    $result = $field . "<" . $value;
-                    break;
-                }
-            case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $value;
-                    break;
-                }
-            case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $value;
-                    break;
-                }
-            case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $value;
-                    break;
-                }
-            case Relation::STARTS_WITH: {
-                    $result = " starts-with($field, $value) ";
-                    break;
-                }
-            case Relation::CONTAINS: {
-                    $result = " contains($field, $value) ";
-                    break;
-                }
+        case Relation::EQUAL: {
+                $result = $field . "=" . $value;
+                break;
+            }
+        case Relation::GREATER_THAN: {
+                $result = $field . ">" . $value;
+                break;
+            }
+        case Relation::LESS_THAN: {
+                $result = $field . "<" . $value;
+                break;
+            }
+        case Relation::GREATER_OR_EQUAL_THAN: {
+                $result = $field . ">=" . $value;
+                break;
+            }
+        case Relation::LESS_OR_EQUAL_THAN: {
+                $result = $field . "<=" . $value;
+                break;
+            }
+        case Relation::NOT_EQUAL: {
+                $result = $field . "!=" . $value;
+                break;
+            }
+        case Relation::STARTS_WITH: {
+                $result = " starts-with($field, $value) ";
+                break;
+            }
+        case Relation::CONTAINS: {
+                $result = " contains($field, $value) ";
+                break;
+            }
         }
         return $result;
     }
@@ -200,40 +200,40 @@ 
         $field = " $name ";
         $valueparam = " [[" . $paramName . "]] ";
         switch ($relation) {
-            case Relation::EQUAL: {
-                    $result = $field . "=" . $valueparam;
-                    break;
-                }
-            case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $valueparam;
-                    break;
-                }
-            case Relation::LESS_THAN: {
-                    $result = $field . "<" . $valueparam;
-                    break;
-                }
-            case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $valueparam;
-                    break;
-                }
-            case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $valueparam;
-                    break;
-                }
-            case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $valueparam;
-                    break;
-                }
-            case Relation::STARTS_WITH: {
-                    $param[$paramName] = $value . "%";
-                    $result = $field . " like " . $valueparam;
-                    break;
-                }
-            case Relation::CONTAINS: {
-                    $param[$paramName] = "%" . $value . "%";
-                    $result = $field . " like " . $valueparam;
-                    break;
-                }
+        case Relation::EQUAL: {
+                $result = $field . "=" . $valueparam;
+                break;
+            }
+        case Relation::GREATER_THAN: {
+                $result = $field . ">" . $valueparam;
+                break;
+            }
+        case Relation::LESS_THAN: {
+                $result = $field . "<" . $valueparam;
+                break;
+            }
+        case Relation::GREATER_OR_EQUAL_THAN: {
+                $result = $field . ">=" . $valueparam;
+                break;
+            }
+        case Relation::LESS_OR_EQUAL_THAN: {
+                $result = $field . "<=" . $valueparam;
+                break;
+            }
+        case Relation::NOT_EQUAL: {
+                $result = $field . "!=" . $valueparam;
+                break;
+            }
+        case Relation::STARTS_WITH: {
+                $param[$paramName] = $value . "%";
+                $result = $field . " like " . $valueparam;
+                break;
+            }
+        case Relation::CONTAINS: {
+                $param[$paramName] = "%" . $value . "%";
+                $result = $field . " like " . $valueparam;
+                break;
+            }
         }
 
         return $result;
@@ -268,38 +268,38 @@ 
 
             foreach ($field as $valueparam) {
                 switch ($relation) {
-                    case Relation::EQUAL: {
-                            $result[$pos] &= ($valueparam == $value);
-                            break;
-                        }
-                    case Relation::GREATER_THAN: {
-                            $result[$pos] &= ($valueparam > $value);
-                            break;
-                        }
-                    case Relation::LESS_THAN: {
-                            $result[$pos] &= ($valueparam < $value);
-                            break;
-                        }
-                    case Relation::GREATER_OR_EQUAL_THAN: {
-                            $result[$pos] &= ($valueparam >= $value);
-                            break;
-                        }
-                    case Relation::LESS_OR_EQUAL_THAN: {
-                            $result[$pos] &= ($valueparam <= $value);
-                            break;
-                        }
-                    case Relation::NOT_EQUAL: {
-                            $result[$pos] &= ($valueparam != $value);
-                            break;
-                        }
-                    case Relation::STARTS_WITH: {
-                            $result[$pos] &= (strpos($valueparam, $value) === 0);
-                            break;
-                        }
-                    case Relation::CONTAINS: {
-                            $result[$pos] &= (strpos($valueparam, $value) !== false);
-                            break;
-                        }
+                case Relation::EQUAL: {
+                        $result[$pos] &= ($valueparam == $value);
+                        break;
+                    }
+                case Relation::GREATER_THAN: {
+                        $result[$pos] &= ($valueparam > $value);
+                        break;
+                    }
+                case Relation::LESS_THAN: {
+                        $result[$pos] &= ($valueparam < $value);
+                        break;
+                    }
+                case Relation::GREATER_OR_EQUAL_THAN: {
+                        $result[$pos] &= ($valueparam >= $value);
+                        break;
+                    }
+                case Relation::LESS_OR_EQUAL_THAN: {
+                        $result[$pos] &= ($valueparam <= $value);
+                        break;
+                    }
+                case Relation::NOT_EQUAL: {
+                        $result[$pos] &= ($valueparam != $value);
+                        break;
+                    }
+                case Relation::STARTS_WITH: {
+                        $result[$pos] &= (strpos($valueparam, $value) === 0);
+                        break;
+                    }
+                case Relation::CONTAINS: {
+                        $result[$pos] &= (strpos($valueparam, $value) !== false);
+                        break;
+                    }
                 }
             }
         }

Braces +3 added lines, -1 removed lines

@@ -264,7 +264,9 @@
 
             $field = $array->getField($name);
 
-            if (!is_array($field)) $field = array($field);
+            if (!is_array($field)) {
+                $field = array($field);
+            }
 
             foreach ($field as $valueparam) {
                 switch ($relation) {

Spacing +20 added lines, -20 removed lines

@@ -37,7 +37,7 @@ 
         if ($xpathFilter == "") {
             return "/anydataset/row";
         } else {
-            return "/anydataset/row[" . $xpathFilter . "]";
+            return "/anydataset/row[".$xpathFilter."]";
         }
     }
 
@@ -136,33 +136,33 @@ 
     private function getStrXpathRelation($name, $relation, $value)
     {
         $str = is_numeric($value) ? "" : "'";
-        $field = "field[@name='" . $name . "'] ";
+        $field = "field[@name='".$name."'] ";
         $value = " $str$value$str ";
 
         $result = "";
         switch ($relation) {
             case Relation::EQUAL: {
-                    $result = $field . "=" . $value;
+                    $result = $field."=".$value;
                     break;
                 }
             case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $value;
+                    $result = $field.">".$value;
                     break;
                 }
             case Relation::LESS_THAN: {
-                    $result = $field . "<" . $value;
+                    $result = $field."<".$value;
                     break;
                 }
             case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $value;
+                    $result = $field.">=".$value;
                     break;
                 }
             case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $value;
+                    $result = $field."<=".$value;
                     break;
                 }
             case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $value;
+                    $result = $field."!=".$value;
                     break;
                 }
             case Relation::STARTS_WITH: {
@@ -191,47 +191,47 @@ 
         $paramName = $name;
         $i = 0;
         while (array_key_exists($paramName, $param)) {
-            $paramName = $name . ($i++);
+            $paramName = $name.($i++);
         }
 
         $param[$paramName] = $value;
 
         $result = "";
         $field = " $name ";
-        $valueparam = " [[" . $paramName . "]] ";
+        $valueparam = " [[".$paramName."]] ";
         switch ($relation) {
             case Relation::EQUAL: {
-                    $result = $field . "=" . $valueparam;
+                    $result = $field."=".$valueparam;
                     break;
                 }
             case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $valueparam;
+                    $result = $field.">".$valueparam;
                     break;
                 }
             case Relation::LESS_THAN: {
-                    $result = $field . "<" . $valueparam;
+                    $result = $field."<".$valueparam;
                     break;
                 }
             case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $valueparam;
+                    $result = $field.">=".$valueparam;
                     break;
                 }
             case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $valueparam;
+                    $result = $field."<=".$valueparam;
                     break;
                 }
             case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $valueparam;
+                    $result = $field."!=".$valueparam;
                     break;
                 }
             case Relation::STARTS_WITH: {
-                    $param[$paramName] = $value . "%";
-                    $result = $field . " like " . $valueparam;
+                    $param[$paramName] = $value."%";
+                    $result = $field." like ".$valueparam;
                     break;
                 }
             case Relation::CONTAINS: {
-                    $param[$paramName] = "%" . $value . "%";
-                    $result = $field . " like " . $valueparam;
+                    $param[$paramName] = "%".$value."%";
+                    $result = $field." like ".$valueparam;
                     break;
                 }
         }

src/Repository/JsonDataset.php

Doc Comments +1 added lines, -3 removed lines

@@ -53,9 +53,7 @@
 
     /**
      * @access public
-     * @param string $sql
-     * @param array $array
-     * @return DBIterator
+     * @return JsonIterator
      */
     public function getIterator($path = "", $throwErr = false)
     {

Switch Indentation +21 added lines, -21 removed lines

@@ -23,27 +23,27 @@
         $lastError = json_last_error();
         $lastErrorDesc = "";
         switch ($lastError) {
-            case JSON_ERROR_NONE:
-                $lastErrorDesc = 'No errors';
-                break;
-            case JSON_ERROR_DEPTH:
-                $lastErrorDesc = 'Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $lastErrorDesc = 'Underflow or the modes mismatch';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $lastErrorDesc = 'Unexpected control character found';
-                break;
-            case JSON_ERROR_SYNTAX:
-                $lastErrorDesc = 'Syntax error, malformed JSON';
-                break;
-            case JSON_ERROR_UTF8:
-                $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $lastErrorDesc = 'Unknown error';
-                break;
+        case JSON_ERROR_NONE:
+            $lastErrorDesc = 'No errors';
+            break;
+        case JSON_ERROR_DEPTH:
+            $lastErrorDesc = 'Maximum stack depth exceeded';
+            break;
+        case JSON_ERROR_STATE_MISMATCH:
+            $lastErrorDesc = 'Underflow or the modes mismatch';
+            break;
+        case JSON_ERROR_CTRL_CHAR:
+            $lastErrorDesc = 'Unexpected control character found';
+            break;
+        case JSON_ERROR_SYNTAX:
+            $lastErrorDesc = 'Syntax error, malformed JSON';
+            break;
+        case JSON_ERROR_UTF8:
+            $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            break;
+        default:
+            $lastErrorDesc = 'Unknown error';
+            break;
         }
 
         if ($lastError != JSON_ERROR_NONE) {

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         }
 
         if ($lastError != JSON_ERROR_NONE) {
-            throw new DatasetException("Invalid JSON string: " . $lastErrorDesc);
+            throw new DatasetException("Invalid JSON string: ".$lastErrorDesc);
         }
     }
 

src/Repository/SocketDataset.php

Doc Comments +2 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
      * @param type $rowsep
      * @param type $colsep
      * @param type $fieldnames
-     * @param type $port
+     * @param integer $port
      */
     public function __construct($server, $path, $rowsep, $colsep, $fieldnames, $port = 80)
     {
@@ -42,9 +42,7 @@ 
     }
 
     /**
-     * @param string $sql
-     * @param array $array
-     * @return DBIterator
+     * @return SocketIterator
      */
     public function getIterator()
     {

Spacing +2 added lines, -2 removed lines

@@ -54,8 +54,8 @@
         if (!$handle) {
             throw new DatasetException("Socket error: $errstr ($errno)");
         } else {
-            $out = "GET " . $this->_path . " HTTP/1.1\r\n";
-            $out .= "Host: " . $this->_server . "\r\n";
+            $out = "GET ".$this->_path." HTTP/1.1\r\n";
+            $out .= "Host: ".$this->_server."\r\n";
             $out .= "Connection: Close\r\n\r\n";
 
             fwrite($handle, $out);

src/Repository/SparQLDataset.php

Doc Comments +1 added lines, -4 removed lines

@@ -14,7 +14,6 @@ 
 
     /**
      *
-     * @param string $json
      */
     public function __construct($url, $namespaces = null)
     {
@@ -46,9 +45,7 @@ 
     }
 
     /**
-     * @param string $sql
-     * @param array $array
-     * @return DBIterator
+     * @return SparQLIterator
      */
     public function getIterator($sparql)
     {

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         }
 
         if (function_exists('dba_open')) {
-            $cache = sys_get_temp_dir() . "/caps.db";
+            $cache = sys_get_temp_dir()."/caps.db";
             $this->_db->capabilityCache($cache);
         }
     }

src/Repository/TextFileDataset.php

Doc Comments +1 added lines, -3 removed lines

@@ -61,9 +61,7 @@
 
     /**
      * @access public
-     * @param string $sql
-     * @param array $array
-     * @return DBIterator
+     * @return TextFileIterator|null
      */
     public function getIterator()
     {

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             $this->_source = $source;
 
             if (!file_exists($this->_source)) {
-                throw new NotFoundException("The specified file " . $this->_source . " does not exists");
+                throw new NotFoundException("The specified file ".$this->_source." does not exists");
             }
 
             $this->_sourceType = "FILE";

src/Repository/XmlDataset.php

Doc Comments +1 added lines, -3 removed lines

@@ -71,9 +71,7 @@
 
     /**
      * @access public
-     * @param string $sql
-     * @param array $array
-     * @return DBIterator
+     * @return XmlIterator
      */
     public function getIterator()
     {

src/Repository/XmlIterator.php

Doc Comments +4 added lines

@@ -32,6 +32,10 @@
     private $_current = 0;
     protected $_registerNS;
 
+    /**
+     * @param DOMNodeList $nodeList
+     * @param string[] $colNodes
+     */
     public function __construct($nodeList, $colNodes, $registerNS)
     {
         if (!($nodeList instanceof DOMNodeList)) {

src/Database/DBPDODriver.php

Braces +3 added lines, -1 removed lines

@@ -92,7 +92,9 @@
             foreach ($array as $key => $value) {
                 $stmt->bindValue(":" . SQLBind::keyAdj($key), $value);
             }
-        } else $stmt = $this->_db->prepare($sql);
+        } else {
+            $stmt = $this->_db->prepare($sql);
+        }
 
         return $stmt;
     }

Spacing +11 added lines, -11 removed lines

@@ -26,15 +26,15 @@ 
 
         if (is_null($strcnn)) {
             if ($this->_connectionManagement->getFilePath() != "") {
-                $strcnn = $this->_connectionManagement->getDriver() . ":" . $this->_connectionManagement->getFilePath();
+                $strcnn = $this->_connectionManagement->getDriver().":".$this->_connectionManagement->getFilePath();
             } else {
-                $strcnn = $this->_connectionManagement->getDriver() . ":dbname=" . $this->_connectionManagement->getDatabase();
+                $strcnn = $this->_connectionManagement->getDriver().":dbname=".$this->_connectionManagement->getDatabase();
                 if ($this->_connectionManagement->getExtraParam("unixsocket") != "") {
-                    $strcnn .= ";unix_socket=" . $this->_connectionManagement->getExtraParam("unixsocket");
+                    $strcnn .= ";unix_socket=".$this->_connectionManagement->getExtraParam("unixsocket");
                 } else {
-                    $strcnn .= ";host=" . $this->_connectionManagement->getServer();
+                    $strcnn .= ";host=".$this->_connectionManagement->getServer();
                     if ($this->_connectionManagement->getPort() != "") {
-                        $strcnn .= ";port=" . $this->_connectionManagement->getPort();
+                        $strcnn .= ";port=".$this->_connectionManagement->getPort();
                     }
                 }
             }
@@ -42,14 +42,14 @@ 
 
         // Create Connection
         $this->_db = new PDO($strcnn, $this->_connectionManagement->getUsername(),
-            $this->_connectionManagement->getPassword(), (array) $preOptions);
+            $this->_connectionManagement->getPassword(), (array)$preOptions);
         $this->_connectionManagement->setDriver($this->_db->getAttribute(PDO::ATTR_DRIVER_NAME));
 
         // Set Specific Attributes
         $this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $this->_db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 
-        foreach ((array) $postOptions as $key => $value) {
+        foreach ((array)$postOptions as $key => $value) {
             $this->_db->setAttribute($key, $value);
         }
     }
@@ -60,11 +60,11 @@ 
             throw new \ByJG\AnyDataset\Exception\NotAvailableException("Extension 'PDO' is not loaded");
         }
 
-        if (!extension_loaded('pdo_' . strtolower($connMngt->getDriver()))) {
-            throw new \ByJG\AnyDataset\Exception\NotAvailableException("Extension 'pdo_" . strtolower($connMngt->getDriver()) . "' is not loaded");
+        if (!extension_loaded('pdo_'.strtolower($connMngt->getDriver()))) {
+            throw new \ByJG\AnyDataset\Exception\NotAvailableException("Extension 'pdo_".strtolower($connMngt->getDriver())."' is not loaded");
         }
 
-        $class = '\ByJG\AnyDataset\Database\Pdo' . ucfirst($connMngt->getDriver());
+        $class = '\ByJG\AnyDataset\Database\Pdo'.ucfirst($connMngt->getDriver());
 
         if (!class_exists($class, true)) {
             return new DBPDODriver($connMngt, null, null, null);
@@ -90,7 +90,7 @@ 
             list($sql, $array) = SQLBind::parseSQL($this->_connectionManagement, $sql, $array);
             $stmt = $this->_db->prepare($sql);
             foreach ($array as $key => $value) {
-                $stmt->bindValue(":" . SQLBind::keyAdj($key), $value);
+                $stmt->bindValue(":".SQLBind::keyAdj($key), $value);
             }
         } else $stmt = $this->_db->prepare($sql);