From 351a41ec3bdda87cb2924e089167c2860b8c4b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=86=D1=83=D1=80=D0=B0?= Date: Sun, 6 Oct 2013 21:18:04 +1100 Subject: [PATCH 1/4] refs #NA Fix Constants Doc Block --- Library/ClassDefinition.php | 2 +- Library/CodePrinter.php | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 100755 Library/ClassDefinition.php mode change 100644 => 100755 Library/CodePrinter.php diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php old mode 100644 new mode 100755 index f51a0d5ff07..3c92eb53875 --- 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 old mode 100644 new mode 100755 index c11296b21c7..edbb123b0c5 --- 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++; From ec33c7e1bf76c18e702ed18aba06ce17e781037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=86=D1=83=D1=80=D0=B0?= Date: Sun, 6 Oct 2013 23:51:30 +1100 Subject: [PATCH 2/4] refs #NA Return changed files perm to 644 --- Library/ClassDefinition.php | 0 Library/CodePrinter.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Library/ClassDefinition.php mode change 100755 => 100644 Library/CodePrinter.php diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php old mode 100755 new mode 100644 diff --git a/Library/CodePrinter.php b/Library/CodePrinter.php old mode 100755 new mode 100644 From b449e47404270dcb6a31dd582048823eba7b1b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=86=D1=83=D1=80=D0=B0?= Date: Sun, 6 Oct 2013 23:53:03 +1100 Subject: [PATCH 3/4] refs #NA Jetbrains ideas project folder added to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2c6668e6a58..20131c926dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +.idea/ .temp/ ext/Makefile.global ext/acinclude.m4 From 95ff25692840cd9cfe9c56cb56a3fa7f1525fa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=86=D1=83=D1=80=D0=B0?= Date: Mon, 7 Oct 2013 00:01:28 +1100 Subject: [PATCH 4/4] refs #NA Fix Fatal error: Call to undefined method Variable::getDynamicType() --- Library/Statements/LetStatement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Statements/LetStatement.php b/Library/Statements/LetStatement.php index 19b5e54b647..f3369322c1a 100644 --- 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