PR #829 fixed for 1.2.1

CHANGELOG

@@ -6,6 +6,7 @@
  - 'beforeException' events now can handle exceptions ocurred when executing actions
  - Added Phalcon\Dispatcher::getHandlerClass and Phalcon\Dispatch::getActionMethod
  - Now Phalcon\Form\Element\* classes implement Phalcon\Form\ElementInterface
+ - Phalcon\Config\Adapter\Ini correctly handles empty sections and INI files without any sections
 
 1.2.0
  - Now 'compiledPath' option accept a closure to dynamically create the compilation path in Volt

ext/cache/frontend/json.c

@@ -31,7 +31,7 @@
 
 #include "kernel/main.h"
 #include "kernel/memory.h"
-
+#include "kernel/string.h"
 #include "kernel/object.h"
 #include "kernel/array.h"
 #include "kernel/fcall.h"

ext/config/adapter/ini.c

@@ -130,8 +130,23 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct){
 		PHALCON_GET_HKEY(section, ah0, hp0);
 		PHALCON_GET_HVALUE(directives);
 
+		if (unlikely(Z_TYPE_P(directives) != IS_ARRAY)) {
+			Z_ADDREF_P(directives);
+			if (phalcon_array_update_zval(&config, section, &directives, 0) != SUCCESS) {
+				Z_DELREF_P(directives);
+			}
+			zend_hash_move_forward_ex(ah0, &hp0);
+			continue;
+		}
+
 		phalcon_is_iterable(directives, &ah1, &hp1, 0, 0);
 
+		if (zend_hash_num_elements(ah1) == 0) {
+			phalcon_array_update_zval(&config, section, &directives, 0);
+			zend_hash_move_forward_ex(ah0, &hp0);
+			continue;
+		}
+
 		while (zend_hash_get_current_data_ex(ah1, (void**) &hd, &hp1) == SUCCESS) {
 
 			PHALCON_GET_HKEY(key, ah1, hp1);

ext/http/response.c

@@ -37,6 +37,7 @@
 #include "kernel/exception.h"
 #include "kernel/concat.h"
 #include "kernel/operators.h"
+#include "kernel/string.h"
 
 /**
  * Phalcon\Http\Response

ext/logger/formatter/json.c

@@ -31,7 +31,7 @@
 
 #include "kernel/main.h"
 #include "kernel/memory.h"
-
+#include "kernel/string.h"
 #include "kernel/fcall.h"
 #include "kernel/array.h"
 

unit-tests/ConfigTest.php

@@ -231,5 +231,26 @@ public function testIssue732()
 		unset($a['a']);
 		$this->assertTrue(!isset($a['a']));
 	}
-}
 
+	public function testIssue829()
+	{
+		$config = new \Phalcon\Config\Adapter\Ini('unit-tests/config/829-no-sections.ini');
+		$actual = $config->toArray();
+		$expected = array(
+			'hoge' => 'test',
+			'foo'  => 'bar',
+		);
+
+		$this->assertEquals($actual, $expected);
+
+		$config = new \Phalcon\Config\Adapter\Ini('unit-tests/config/829-with-empty-section.ini');
+		$actual = $config->toArray();
+		$expected = array(
+			'section' => array('hoge' => 'test'),
+			'empty'   => array(),
+			'test'    => array('foo'  => 'bar'),
+		);
+
+		$this->assertEquals($actual, $expected);
+	}
+}

unit-tests/config/829-no-sections.ini

@@ -0,0 +1,2 @@
+hoge=test
+foo=bar

unit-tests/config/829-with-empty-section.ini

@@ -0,0 +1,7 @@
+[section]
+hoge=test
+
+[empty]
+
+[test]
+foo=bar