byjg / anydataset

src/Database/DBOci8Driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
 
     /**
      *
-     * @return handle
+     * @return resource|null
      */
     public function getDbConnection()
     {

Spacing +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@
 
         $host = $connMngt->getServer();
 
-        $tns = "(DESCRIPTION = " .
-            "	(ADDRESS = (PROTOCOL = $protocol)(HOST = $host)(PORT = $port)) " .
-            "		(CONNECT_DATA = (SERVICE_NAME = $svcName)) " .
+        $tns = "(DESCRIPTION = ".
+            "	(ADDRESS = (PROTOCOL = $protocol)(HOST = $host)(PORT = $port)) ".
+            "		(CONNECT_DATA = (SERVICE_NAME = $svcName)) ".
             ")";
 
         return $tns;

src/Database/DBPgsqlFunctions.php

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
     /**
      * Return if the database provider have a top or similar function
-     * @return unknown_type
+     * @return boolean
      */
     function hasTop()
     {

Switch Indentation +53 added lines, -53 removed lines

@@ -76,59 +76,59 @@
         for ($i = 0; $i < $len; $i++) {
             $ch = $fmt[$i];
             switch ($ch) {
-                case 'Y':
-                case 'y':
-                    $s .= 'YYYY';
-                    break;
-                case 'Q':
-                case 'q':
-                    $s .= 'Q';
-                    break;
-
-                case 'M':
-                    $s .= 'Mon';
-                    break;
-
-                case 'm':
-                    $s .= 'MM';
-                    break;
-                case 'D':
-                case 'd':
-                    $s .= 'DD';
-                    break;
-
-                case 'H':
-                    $s.= 'HH24';
-                    break;
-
-                case 'h':
-                    $s .= 'HH';
-                    break;
-
-                case 'i':
-                    $s .= 'MI';
-                    break;
-
-                case 's':
-                    $s .= 'SS';
-                    break;
-
-                case 'a':
-                case 'A':
-                    $s .= 'AM';
-                    break;
-
-                default:
-                    // handle escape characters...
-                    if ($ch == '\\') {
-                        $i++;
-                        $ch = substr($fmt, $i, 1);
-                    }
-                    if (strpos('-/.:;, ', $ch) !== false) {
-                        $s .= $ch;
-                    } else {
-                        $s .= '"' . $ch . '"';
-                    }
+            case 'Y':
+            case 'y':
+                $s .= 'YYYY';
+                break;
+            case 'Q':
+            case 'q':
+                $s .= 'Q';
+                break;
+
+            case 'M':
+                $s .= 'Mon';
+                break;
+
+            case 'm':
+                $s .= 'MM';
+                break;
+            case 'D':
+            case 'd':
+                $s .= 'DD';
+                break;
+
+            case 'H':
+                $s.= 'HH24';
+                break;
+
+            case 'h':
+                $s .= 'HH';
+                break;
+
+            case 'i':
+                $s .= 'MI';
+                break;
+
+            case 's':
+                $s .= 'SS';
+                break;
+
+            case 'a':
+            case 'A':
+                $s .= 'AM';
+                break;
+
+            default:
+                // handle escape characters...
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt, $i, 1);
+                }
+                if (strpos('-/.:;, ', $ch) !== false) {
+                    $s .= $ch;
+                } else {
+                    $s .= '"' . $ch . '"';
+                }
             }
         }
         return $s . "')";

Braces +3 added lines, -1 removed lines

@@ -69,7 +69,9 @@
      */
     function sqlDate($fmt, $col = false)
     {
-        if (!$col) $col = $this->sysTimeStamp;
+        if (!$col) {
+            $col = $this->sysTimeStamp;
+        }
         $s = 'TO_CHAR(' . $col . ",'";
 
         $len = strlen($fmt);

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
     {
         for ($i = 0, $numArgs = func_num_args(); $i < $numArgs; $i++) {
             $var = func_get_arg($i);
-            $sql .= ($i == 0 ? "" : " || ") . $var;
+            $sql .= ($i == 0 ? "" : " || ").$var;
         }
 
         return $sql;
@@ -70,7 +70,7 @@ 
     function sqlDate($fmt, $col = false)
     {
         if (!$col) $col = $this->sysTimeStamp;
-        $s = 'TO_CHAR(' . $col . ",'";
+        $s = 'TO_CHAR('.$col.",'";
 
         $len = strlen($fmt);
         for ($i = 0; $i < $len; $i++) {
@@ -98,7 +98,7 @@ 
                     break;
 
                 case 'H':
-                    $s.= 'HH24';
+                    $s .= 'HH24';
                     break;
 
                 case 'h':
@@ -127,11 +127,11 @@ 
                     if (strpos('-/.:;, ', $ch) !== false) {
                         $s .= $ch;
                     } else {
-                        $s .= '"' . $ch . '"';
+                        $s .= '"'.$ch.'"';
                     }
             }
         }
-        return $s . "')";
+        return $s."')";
     }
 
     /**

src/Database/DBSQLRelayDriver.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
     protected $_conn;
     protected $_transaction = false;
 
+    /**
+     * @param ConnectionManagement $connMngt
+     */
     public function __construct($connMngt)
     {
         $this->_connectionManagement = $connMngt;

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             sqlrcur_prepareQuery($cur, $sql);
             $bindCount = 1;
             foreach ($array as $key => $value) {
-                $field = strval($bindCount ++);
+                $field = strval($bindCount++);
                 sqlrcur_inputBind($cur, $field, $value);
             }
             $success = sqlrcur_executeQuery($cur);

src/Database/SQLBind.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      *
      * @param ConnectionManagement $connData
      * @param string $sql
-     * @param array $param
+     * @param array $params
      * @return array An array with the adjusted SQL and PARAMs
      */
     public static function parseSQL(ConnectionManagement $connData, $sql, $params = null)

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             $arg = str_replace("_", SQLBind::keyAdj($key), $paramSubstName);
 
             $count = 0;
-            $sql = preg_replace("/(\[\[$key\]\]|:" . $key . "[\s\W]|:$key\$)/", $arg . ' ', $sql, -1, $count);
+            $sql = preg_replace("/(\[\[$key\]\]|:".$key."[\s\W]|:$key\$)/", $arg.' ', $sql, -1, $count);
             if ($count === 0) {
                 unset($params[$key]);
             }

src/Database/SQLHelper.php

Doc Comments +3 added lines, -1 removed lines

@@ -32,7 +32,6 @@ 
     /**
      * Generate and Execute UPDATE and INSERTS
      *
-     * @param DBDataset $db
      * @param string $table
      * @param array $fields
      * @param SQLType $type
@@ -148,6 +147,9 @@ 
         $this->_fieldDeliRight = $right;
     }
 
+    /**
+     * @param string $sql
+     */
     public static function createSafeSQL($sql, $list)
     {
         foreach ($list as $key => $value) {

Spacing +6 added lines, -6 removed lines

@@ -55,8 +55,8 @@ 
                 if ($sql != "") {
                     $sql .= ", ";
                 }
-                $sql .= " " . $this->_fieldDeliLeft . $fieldname . $this->_fieldDeliRight . " = " . $this->getValue($fieldname,
-                        $fieldvalue, $param, $decimalpoint) . " ";
+                $sql .= " ".$this->_fieldDeliLeft.$fieldname.$this->_fieldDeliRight." = ".$this->getValue($fieldname,
+                        $fieldvalue, $param, $decimalpoint)." ";
             }
             $sql = "update $table set $sql where $filter ";
         } elseif ($type == SQLType::SQL_INSERT) {
@@ -68,7 +68,7 @@ 
                     $campos .= ", ";
                     $valores .= ", ";
                 }
-                $campos .= $this->_fieldDeliLeft . $fieldname . $this->_fieldDeliRight;
+                $campos .= $this->_fieldDeliLeft.$fieldname.$this->_fieldDeliRight;
                 $valores .= $this->getValue($fieldname, $fieldvalue, $param, $decimalpoint);
             }
             $sql = "insert into $table ($campos) values ($valores)";
@@ -89,7 +89,7 @@ 
      */
     protected function getValue($name, $valores, &$param, $decimalpoint)
     {
-        $paramName = "[[" . $name . "]]";
+        $paramName = "[[".$name."]]";
         if (!is_array($valores)) {
             $valores = array(SQLFieldType::TEXT, $valores);
         }
@@ -109,7 +109,7 @@ 
         } elseif ($valores[0] == SQLFieldType::DATE) {
             $date = ($valores[1] instanceof DateTime ? $valores[1]->format(DBBaseFunctions::YMDH) : $valores[1]);
             $param[$name] = $date;
-            if (($this->_db->getDbType() == 'oci8') || ( ($this->_db->getDbType() == 'dsn') && (strpos($this->_db->getDbConnectionString(),
+            if (($this->_db->getDbType() == 'oci8') || (($this->_db->getDbType() == 'dsn') && (strpos($this->_db->getDbConnectionString(),
                     "oci8")))) {
                 return "TO_DATE($paramName, 'YYYY-MM-DD')";
             } else {
@@ -139,7 +139,7 @@ 
         if (strlen($sql) > 4) {
             $sql .= ' and ';
         }
-        $sql = " $fieldName " . $relation . " " . $this->getValue($fieldName, $value, $param, $decimalpoint);
+        $sql = " $fieldName ".$relation." ".$this->getValue($fieldName, $value, $param, $decimalpoint);
     }
 
     public function setFieldDelimeters($left, $right)

src/Enum/FixedTextDefinition.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      * @param string $fieldName
      * @param int $startPos
      * @param int $length
-     * @param bool $requiredValue
+     * @param string|boolean $requiredValue
      * @param array_of_FixedTextDefinition $subTypes
      */
     public function __construct($fieldName, $startPos, $length, $requiredValue = "", $subTypes = null)

src/Model/ObjectHandler.php

Doc Comments +8 added lines, -2 removed lines

@@ -185,7 +185,6 @@ 
      * @param type $classMeta
      * @param type $prop
      * @param type $keyProp
-     * @param type $this->_config
      * @return null
      */
     protected function getPropInfo($classMeta, $prop, $keyProp)
@@ -287,6 +286,9 @@ 
         return $node;
     }
 
+    /**
+     * @param DOMNode $node
+     */
     protected function createPropertyNodes($node, $properties, $classMeta)
     {
         if (!is_null($properties)) {
@@ -321,6 +323,10 @@ 
                     // Check if the array is associative or dont.
                     $isAssoc = (bool) count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string'));
                     $hasScalar = (bool) count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]),
+
+                                /**
+                                 * @param DOMNode $val
+                                 */
                                 function($val) {
                                 return !(is_object($val) || is_array($val));
                             }));
@@ -519,7 +525,7 @@ 
      *
      * @param DOMNode $domnode
      * @param type $jsonFunction
-     * @return type
+     * @return string
      */
     public static function xml2json($domnode, $jsonFunction = "")
     {

Braces +3 added lines, -2 removed lines

@@ -170,8 +170,9 @@
                 : "";
         $classMeta[ObjectHandler::CLASS_DONT_CREATE_NODE_CLASS] = array_key_exists("$this->_config:dontcreatenode",
             $classAttributes);
-        if (!is_array($classMeta[ObjectHandler::CLASS_NAMESPACE]) && !empty($classMeta[ObjectHandler::CLASS_NAMESPACE]))
-                $classMeta[ObjectHandler::CLASS_NAMESPACE] = array($classMeta[ObjectHandler::CLASS_NAMESPACE]);
+        if (!is_array($classMeta[ObjectHandler::CLASS_NAMESPACE]) && !empty($classMeta[ObjectHandler::CLASS_NAMESPACE])) {
+                        $classMeta[ObjectHandler::CLASS_NAMESPACE] = array($classMeta[ObjectHandler::CLASS_NAMESPACE]);
+        }
 
         #----------
         # Node References

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
 
         // Check the proper treatment
         if (is_array($model)) {
-            $this->_model = (object) $model;
+            $this->_model = (object)$model;
             $this->_currentArray = true;
 
             // Fix First Level non-associative arrays
@@ -162,7 +162,7 @@ 
             isset($classAttributes["$this->_config:rdftype"]) ? $classAttributes["$this->_config:rdftype"] : "{HOST}/rdf/class/{CLASS}");
         $classMeta[ObjectHandler::CLASS_RDF_ABOUT] = $this->replaceVars($classMeta[ObjectHandler::CLASS_NAME],
             isset($classAttributes["$this->_config:rdfabout"]) ? $classAttributes["$this->_config:rdfabout"] : "{HOST}/rdf/instance/{CLASS}/{GetID()}");
-        $classMeta[ObjectHandler::CLASS_DEFAULT_PREFIX] = isset($classAttributes["$this->_config:defaultprefix"]) ? $classAttributes["$this->_config:defaultprefix"] . ":"
+        $classMeta[ObjectHandler::CLASS_DEFAULT_PREFIX] = isset($classAttributes["$this->_config:defaultprefix"]) ? $classAttributes["$this->_config:defaultprefix"].":"
                 : "";
         $classMeta[ObjectHandler::CLASS_IS_RDF] = ($classMeta[ObjectHandler::CLASS_DOC_TYPE] == "rdf");
         $classMeta[ObjectHandler::CLASS_IGNORE_ALL_CLASS] = array_key_exists("$this->_config:ignore", $classAttributes);
@@ -213,7 +213,7 @@ 
                 $propName = substr($propName, 1);
             }
 
-            $methodName = $classMeta[ObjectHandler::CLASS_GETTER] . ucfirst(preg_replace($classMeta[ObjectHandler::CLASS_PROPERTY_PATTERN][0],
+            $methodName = $classMeta[ObjectHandler::CLASS_GETTER].ucfirst(preg_replace($classMeta[ObjectHandler::CLASS_PROPERTY_PATTERN][0],
                         $classMeta[ObjectHandler::CLASS_PROPERTY_PATTERN][1], $propName));
             if ($classMeta[ObjectHandler::CLASS_REFL]->hasMethod($methodName)) {
                 $method = $classMeta[ObjectHandler::CLASS_REFL]->getMethod($methodName);
@@ -234,7 +234,7 @@ 
         $propMeta[ObjectHandler::PROP_FORCE_NAME] = isset($propAttributes["$this->_config:dontcreatenode"]) ? $propAttributes["$this->_config:dontcreatenode"]
                 : "";
         if (strpos($propMeta[ObjectHandler::PROP_NAME], ":") === false) {
-            $propMeta[ObjectHandler::PROP_NAME] = $classMeta[ObjectHandler::CLASS_DEFAULT_PREFIX] . $propMeta[ObjectHandler::PROP_NAME];
+            $propMeta[ObjectHandler::PROP_NAME] = $classMeta[ObjectHandler::CLASS_DEFAULT_PREFIX].$propMeta[ObjectHandler::PROP_NAME];
         }
         if ($propMeta[ObjectHandler::PROP_NAME] == ObjectHandler::OBJECT_ARRAY_IGNORE_NODE) {
             $propMeta[ObjectHandler::PROP_DONT_CREATE_NODE] = true;
@@ -260,7 +260,7 @@ 
         if (is_array($classMeta[ObjectHandler::CLASS_NAMESPACE])) {
             foreach ($classMeta[ObjectHandler::CLASS_NAMESPACE] as $value) {
                 $prefix = strtok($value, "!");
-                $uri = str_replace($prefix . "!", "", $value);
+                $uri = str_replace($prefix."!", "", $value);
                 XmlUtil::AddNamespaceToDocument($this->_current, $prefix,
                     $this->replaceVars($classMeta[ObjectHandler::CLASS_NAME], $uri));
             }
@@ -319,8 +319,8 @@ 
                 # Value is an ARRAY?
                 elseif (is_array($propMeta[ObjectHandler::PROP_VALUE])) {
                     // Check if the array is associative or dont.
-                    $isAssoc = (bool) count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string'));
-                    $hasScalar = (bool) count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]),
+                    $isAssoc = (bool)count(array_filter(array_keys($propMeta[ObjectHandler::PROP_VALUE]), 'is_string'));
+                    $hasScalar = (bool)count(array_filter(array_values($propMeta[ObjectHandler::PROP_VALUE]),
                                 function($val) {
                                 return !(is_object($val) || is_array($val));
                             }));
@@ -330,7 +330,7 @@ 
                     if ($propMeta[ObjectHandler::PROP_DONT_CREATE_NODE] || (!$isAssoc && $hasScalar)) {
                         $nodeUsed = $node;
                     } else if ((!$isAssoc && !$hasScalar)) {
-                        $lazyCreate = true;    // Have to create the node every iteration
+                        $lazyCreate = true; // Have to create the node every iteration
                     } else {
                         $nodeUsed = $used = XmlUtil::CreateChild($node, $propMeta[ObjectHandler::PROP_NAME]);
                     }
@@ -418,7 +418,7 @@ 
         # Host
         $port = isset($_SERVER["SERVER_PORT"]) ? $_SERVER["SERVER_PORT"] : 80;
         $httpHost = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : 'localhost';
-        $host = ($port == 443 ? "https://" : "http://") . $httpHost;
+        $host = ($port == 443 ? "https://" : "http://").$httpHost;
 
         # Replace Part One
         $text = preg_replace(array("/\{[hH][oO][sS][tT]\}/", "/\{[cC][lL][aA][sS][sS]\}/"), array($host, $name), $text);
@@ -466,15 +466,15 @@ 
         if ($value instanceof SimpleXMLElement) {
             $x = array();
             foreach ($value->children() as $k => $v) {
-                $text = "" . $v;
+                $text = "".$v;
                 if ($text != "") {
                     $arText = array($text);
                 } else {
                     $arText = array();
                 }
-                $x[$k][] = (array) $v + $arText;
+                $x[$k][] = (array)$v + $arText;
             }
-            $value = (array) $value->attributes() + $x;
+            $value = (array)$value->attributes() + $x;
         }
 
         // Fix empty arrays or with one element only.
@@ -536,9 +536,9 @@ 
         }
 
         if ($xml->getName() == "xmlnuke") {
-            $array = (array) $xml->children();
+            $array = (array)$xml->children();
         } else {
-            $array = (array) $xml;
+            $array = (array)$xml;
         }
 
         array_walk($array, "ByJG\AnyDataset\Model\ObjectHandler::mapArray");
@@ -550,6 +550,6 @@ 
             $json = json_encode($array);
         }
 
-        return $jsonFunction . $pre . $json . $pos;
+        return $jsonFunction.$pre.$json.$pos;
     }
 }

src/Repository/AnyDataset.php

Doc Comments +4 added lines

@@ -308,6 +308,10 @@
         return;
     }
 
+    /**
+     * @param SingleRow[] $seq
+     * @param string $field
+     */
     protected function quickSortExec($seq, $field)
     {
         if (!count($seq)) return $seq;

Braces +3 added lines, -1 removed lines

@@ -310,7 +310,9 @@
 
     protected function quickSortExec($seq, $field)
     {
-        if (!count($seq)) return $seq;
+        if (!count($seq)) {
+            return $seq;
+        }
 
         $k = $seq [0];
         $x = $y = array();

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
                     if (!is_null($attr)) {
                         $sr->addField($attr->nodeValue, $field->nodeValue);
                     } else {
-                        throw new \InvalidArgumentException('Malformed anydataset file ' . basename($filepath));
+                        throw new \InvalidArgumentException('Malformed anydataset file '.basename($filepath));
                     }
                 }
                 $sr->acceptChanges();
@@ -316,7 +316,7 @@ 
         $x = $y = array();
 
         $cntSeq = count($seq);
-        for ($i = 1; $i < $cntSeq; $i ++) {
+        for ($i = 1; $i < $cntSeq; $i++) {
             if ($seq[$i]->getField($field) <= $k->getField($field)) {
                 $x [] = $seq [$i];
             } else {

src/Repository/DBIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     private $_rs;
 
     /**
-     * @param PDOStatement $recordset
+     * @param \PDOStatement $recordset
      * @return void
      */
     public function __construct($recordset)