-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Conversation
See https://wiki.php.net/rfc/default_encoding > PHP 5.6 and master, introduce new php.ini setting. Old iconv.*/mbstring.* php.ini parameters will be removed for master PHP6. Use of iconv.*/mbstring.* php.ini parameters raise E_DEPRECATED for 5.6 and up.
…coding-deprecated-in-php-5.6 #6218 - applying hotfix for `iconv.internal_encoding` deprecation
Fixed charset support for Pdo_Pgsql.
If element has attributes & string value until now the string value was ignored & lost, I added the _ index so that it also returns the string value along with the attribute names
Needs a test case |
@@ -149,7 +149,11 @@ protected function processNextElement() | |||
|
|||
if ($attributes) { | |||
if (!is_array($child)) { | |||
$child = array(); | |||
if(is_string($child)){ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (is_string($child)) {
10x @Ocramius , could you please give me some pointers where/how to start building the test-case for Travis ? |
@catalint you can look at existing tests in https://github.com/zendframework/zf2/blob/9f4a9bc04dd711003458d6a814338d0904b0eb40/tests/ZendTest/Config/Reader/XmlTest.php |
@catalint did you get to check the tests? You can eventually ask on IRC on channel |
yeah, found them in the repo, didn't get the change to add some for my On Mon, Jul 28, 2014 at 3:36 AM, Marco Pivetta [email protected]
|
@catalint disregard my previous comment....I see it now |
Added test case + CS cleanup in new PR #6879 |
Closing as per @adamlundrigan's work. @catalint your commits will be ported, thanks! :-) |
@adamlundrigan deservs a cold beer :) thanks
|
… minor CS fixes
…endframework#6879-zend-config-reader-xml-node-value-conflict' Close zendframework/zendframework#6279 Close zendframework/zendframework#6879
…endframework#6879-zend-config-reader-xml-node-value-conflict' into develop Close zendframework/zendframework#6279 Close zendframework/zendframework#6879 Forward port zendframework/zendframework#6279 Forward port zendframework/zendframework#6879
…endframework#6879-zend-config-reader-xml-node-value-conflict' into develop Close zendframework/zendframework#6279 Close zendframework/zendframework#6879 Forward port zendframework/zendframework#6279 Forward port zendframework/zendframework#6879
…endframework#6879-zend-config-reader-xml-node-value-conflict' into develop Close zendframework/zendframework#6279 Close zendframework/zendframework#6879 Forward port zendframework/zendframework#6279 Forward port zendframework/zendframework#6879
If element has attributes & string value until now the string value was ignored & lost, I added the _ index so that it also returns the string value along with the attribute names