Merge pull request #521 from ovr/520_issue

Fix #520 Issue
zephir-lang · Sep 14, 2014 · b2a3062 · b2a3062
2 parents f614412 + a4b4b05
commit b2a3062
Show file tree

Hide file tree

Showing 22 changed files with 170 additions and 434 deletions.
diff --git a/Library/ClassProperty.php b/Library/ClassProperty.php
@@ -269,8 +269,18 @@ public function compile(CompilationContext $compilationContext)
                         }
 
                         if ($needLetStatementAdded) {
-                            $statements[] = $letStatement;
-                            $statementsBlock->setStatements($statements);
+                            $newStatements = array();
+
+                            /**
+                             * Start from let statement
+                             */
+                            $newStatements[] = $letStatement;
+
+                            foreach ($statements as $statement) {
+                                $newStatements[] = $statement;
+                            }
+
+                            $statementsBlock->setStatements($newStatements);
                             $constructMethod->setStatementsBlock($statementsBlock);
                             $compilationContext->classDefinition->getEventsManager()->dispatch('setMethod', array($constructMethod));
                         }

diff --git a/ext/config.m4 b/ext/config.m4
@@ -85,6 +85,7 @@ if test "$PHP_TEST" = "yes"; then
 	test/pregmatch.zep.c
 	test/properties/extendspublicproperties.zep.c
 	test/properties/privateproperties.zep.c
+	test/properties/propertyarray.zep.c
 	test/properties/protectedproperties.zep.c
 	test/properties/publicproperties.zep.c
 	test/properties/staticprotectedproperties.zep.c

diff --git a/ext/test.c b/ext/test.c
@@ -110,6 +110,7 @@ zend_class_entry *test_pdostatement_ce;
 zend_class_entry *test_pregmatch_ce;
 zend_class_entry *test_properties_extendspublicproperties_ce;
 zend_class_entry *test_properties_privateproperties_ce;
+zend_class_entry *test_properties_propertyarray_ce;
 zend_class_entry *test_properties_protectedproperties_ce;
 zend_class_entry *test_properties_staticprotectedproperties_ce;
 zend_class_entry *test_properties_staticpublicproperties_ce;
@@ -385,6 +386,7 @@ static PHP_MINIT_FUNCTION(test)
 	ZEPHIR_INIT(Test_Pregmatch);
 	ZEPHIR_INIT(Test_Properties_ExtendsPublicProperties);
 	ZEPHIR_INIT(Test_Properties_PrivateProperties);
+	ZEPHIR_INIT(Test_Properties_PropertyArray);
 	ZEPHIR_INIT(Test_Properties_ProtectedProperties);
 	ZEPHIR_INIT(Test_Properties_StaticProtectedProperties);
 	ZEPHIR_INIT(Test_Properties_StaticPublicProperties);

diff --git a/ext/test.h b/ext/test.h
@@ -87,6 +87,7 @@
 #include "test/pregmatch.zep.h"
 #include "test/properties/extendspublicproperties.zep.h"
 #include "test/properties/privateproperties.zep.h"
+#include "test/properties/propertyarray.zep.h"
 #include "test/properties/protectedproperties.zep.h"
 #include "test/properties/publicproperties.zep.h"
 #include "test/properties/staticprotectedproperties.zep.h"

diff --git a/ext/test/evaltest.c b/ext/test/evaltest.c
diff --git a/ext/test/evaltest.h b/ext/test/evaltest.h
diff --git a/ext/test/exitdie.c b/ext/test/exitdie.c
diff --git a/ext/test/exitdie.h b/ext/test/exitdie.h
diff --git a/ext/test/internalclasses.zep.c b/ext/test/internalclasses.zep.c
diff --git a/ext/test/issues.c b/ext/test/issues.c
diff --git a/ext/test/issues.h b/ext/test/issues.h
diff --git a/ext/test/oo/test.zep.c b/ext/test/oo/test.zep.c
diff --git a/ext/test/oo/test.zep.h b/ext/test/oo/test.zep.h