Merge pull request phalcon#11 from zaets28rus/master

refs #NA Some fixes
ovr · Oct 6, 2013 · 3d3d134 · 3d3d134
2 parents 580e731 + 95ff256
commit 3d3d134
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.idea/
 .temp/
 ext/Makefile.global
 ext/acinclude.m4

diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
@@ -570,7 +570,7 @@ public function compile(CompilationContext $compilationContext)
 		foreach ($this->getProperties() as $property) {
 			$docBlock = $property->getDocBlock();
 			if ($docBlock) {
-				$codePrinter->outputDocBlock($docBlock);
+				$codePrinter->outputDocBlock($docBlock, false);
 			}
 			$property->compile($compilationContext);
 		}

diff --git a/Library/CodePrinter.php b/Library/CodePrinter.php
@@ -105,15 +105,22 @@ public function output($code)
 	/**
 	 * Adds a comment to the output with indentation level
 	 *
-	 * @param string $docBlock
+	 * @param $docblock
+	 * @param bool $replaceTab
 	 */
-	public function outputDocBlock($docblock)
+	public function outputDocBlock($docblock, $replaceTab = true)
 	{
 		$code = '';
 		$docblock = '/' . $docblock . '/';
+
 		foreach (explode("\n", $docblock) as $line) {
-			$code .= preg_replace('/^[ \t]+/', ' ', $line) . PHP_EOL;
+			if ($replaceTab) {
+				$code .= preg_replace('/^[ \t]+/', ' ', $line) . PHP_EOL;
+			} else {
+				$code .= $line . PHP_EOL;
+			}
 		}
+
 		$this->_lastLine = $code;
 		$this->_code .= $code;
 		$this->_currentPrints++;

diff --git a/Library/Statements/LetStatement.php b/Library/Statements/LetStatement.php
@@ -1206,7 +1206,7 @@ public function assignDecr($variable, Variable $symbolVariable, CompilationConte
 				break;
 			case 'variable':
 
-				$dynamicType = $symbolVariable->getDynamicType();
+				$dynamicType = $symbolVariable->getDynamicTypes();
 
 				/**
 				 * Variable is probably not initialized here