Commit d2360791 authored by romanb's avatar romanb

[2.0] Formatting issues.

parent 6e760bac
...@@ -15,15 +15,15 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; ...@@ -15,15 +15,15 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
*/ */
abstract class Type abstract class Type
{ {
/* The following constants represent type codes and mirror the PDO::PARAM_X constants /* The following constants represent type codes and mirror the PDO::PARAM_X constants
* to decouple ourself from PDO. * to decouple ourself from PDO.
*/ */
const CODE_BOOL = 5; const CODE_BOOL = 5;
const CODE_NULL = 0; const CODE_NULL = 0;
const CODE_INT = 1; const CODE_INT = 1;
const CODE_STR = 2; const CODE_STR = 2;
const CODE_LOB = 3; const CODE_LOB = 3;
private static $_typeObjects = array(); private static $_typeObjects = array();
private static $_typesMap = array( private static $_typesMap = array(
'integer' => 'Doctrine\DBAL\Types\IntegerType', 'integer' => 'Doctrine\DBAL\Types\IntegerType',
...@@ -61,7 +61,7 @@ abstract class Type ...@@ -61,7 +61,7 @@ abstract class Type
public function getTypeCode() public function getTypeCode()
{ {
return self::CODE_STR; return self::CODE_STR;
} }
/** /**
......
...@@ -28,12 +28,12 @@ namespace Doctrine\ORM\Query\AST; ...@@ -28,12 +28,12 @@ namespace Doctrine\ORM\Query\AST;
*/ */
class StateFieldPathExpression extends Node class StateFieldPathExpression extends Node
{ {
//const TYPE_COLLECTION_VALUED_ASSOCIATION = 1; //const TYPE_COLLECTION_VALUED_ASSOCIATION = 1;
//const TYPE_SINGLE_VALUED_ASSOCIATION = 2; //const TYPE_SINGLE_VALUED_ASSOCIATION = 2;
//const TYPE_STATE_FIELD = 3; //const TYPE_STATE_FIELD = 3;
//private $_type; //private $_type;
private $_parts; private $_parts;
// Information that is attached during semantical analysis. // Information that is attached during semantical analysis.
private $_isSimpleStateFieldPathExpression = false; private $_isSimpleStateFieldPathExpression = false;
......
...@@ -884,7 +884,7 @@ class Parser ...@@ -884,7 +884,7 @@ class Parser
while ($this->_lexer->isNextToken('.')) { while ($this->_lexer->isNextToken('.')) {
if ($stateFieldSeen) { if ($stateFieldSeen) {
$this->syntaxError(); $this->syntaxError();
} }
$this->match('.'); $this->match('.');
$part = $this->_IdentificationVariable(); $part = $this->_IdentificationVariable();
...@@ -1098,7 +1098,7 @@ class Parser ...@@ -1098,7 +1098,7 @@ class Parser
{ {
$condPrimary = new AST\ConditionalPrimary; $condPrimary = new AST\ConditionalPrimary;
if ($this->_lexer->isNextToken('(')) { if ($this->_lexer->isNextToken('(')) {
// Peek beyond the matching closing paranthesis ')' // Peek beyond the matching closing paranthesis ')'
$numUnmatched = 1; $numUnmatched = 1;
$peek = $this->_lexer->peek(); $peek = $this->_lexer->peek();
while ($numUnmatched > 0) { while ($numUnmatched > 0) {
...@@ -1276,8 +1276,8 @@ class Parser ...@@ -1276,8 +1276,8 @@ class Parser
*/ */
private function _isNextAllAnySome() private function _isNextAllAnySome()
{ {
return $this->_lexer->lookahead['type'] === Lexer::T_ALL || return $this->_lexer->lookahead['type'] === Lexer::T_ALL ||
$this->_lexer->lookahead['type'] === Lexer::T_ANY || $this->_lexer->lookahead['type'] === Lexer::T_ANY ||
$this->_lexer->lookahead['type'] === Lexer::T_SOME; $this->_lexer->lookahead['type'] === Lexer::T_SOME;
} }
...@@ -1499,7 +1499,7 @@ class Parser ...@@ -1499,7 +1499,7 @@ class Parser
} }
/** /**
* Subselect ::= SimpleSelectClause SubselectFromClause [WhereClause] [GroupByClause] [HavingClause] [OrderByClause] * Subselect ::= SimpleSelectClause SubselectFromClause [WhereClause] [GroupByClause] [HavingClause] [OrderByClause]
*/ */
public function _Subselect() public function _Subselect()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment