Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 8, 2020. It is now read-only.

Prettify the output of Zend\Code\Generator\ValueGenerator for multi line arrays#5616

Merged
weierophinney merged 3 commits into
zendframework:developfrom
RalfEggert:feature_zend_code_array_prettify
Mar 4, 2014
Merged

Prettify the output of Zend\Code\Generator\ValueGenerator for multi line arrays#5616
weierophinney merged 3 commits into
zendframework:developfrom
RalfEggert:feature_zend_code_array_prettify

Conversation

@RalfEggert
Copy link
Copy Markdown
Contributor

@RalfEggert RalfEggert commented Dec 15, 2013

This fix prettifies the output for multi line arrays generated with Zend\Code\Generator\ValueGenerator

Without this fix, an array looks like this.

array(
    'controllers' => array('invokables' => array(
            'Event\Controller\IndexController' => 'Event\Controller\IndexController',
            'Event\Controller\ShopController' => 'Event\Controller\ShopController',
            )),
    'view_manager' => array('template_path_stack' => array(__DIR__ . '/../view'))
    )

With the fix, the same array will look like this:

array(
    'controllers' => array(
        'invokables' => array(
            'Event\Controller\IndexController' => 'Event\Controller\IndexController',
            'Event\Controller\ShopController' => 'Event\Controller\ShopController',
        )
    ),
    'view_manager' => array(
        'template_path_stack' => array(
            __DIR__ . '/../view'
        )
    )
)

Please note the changes for the entry for 'view_manager' and the positions of the braces.

@RalfEggert RalfEggert mentioned this pull request Dec 15, 2013
Closed
@blanchonvincent
Copy link
Copy Markdown
Contributor

blanchonvincent commented Dec 15, 2013

@RalfEggert Update the unit tests please, there are some fails https://travis-ci.org/zendframework/zf2/jobs/15495156#L281

@RalfEggert
Copy link
Copy Markdown
Contributor Author

RalfEggert commented Dec 16, 2013

Sorry, forgot about that. The unit tests are fixed now...

@blanchonvincent
Copy link
Copy Markdown
Contributor

blanchonvincent commented Dec 16, 2013

@RalfEggert https://travis-ci.org/zendframework/zf2/jobs/15509026#L269 :)

@RalfEggert
Copy link
Copy Markdown
Contributor Author

RalfEggert commented Dec 16, 2013

To be honest, I don't really understand what failed there... :-(

@zluiten
Copy link
Copy Markdown
Contributor

zluiten commented Dec 16, 2013

@RalfEggert the closing parenthesis of the expected value is indended 4 spaces to much. https://github.com/RalfEggert/zf2/blob/0413da7532bc8e28e18527af18ac1ad9875cfb90/tests/ZendTest/Code/Generator/PropertyGeneratorTest.php#L108

@RalfEggert
Copy link
Copy Markdown
Contributor Author

RalfEggert commented Dec 16, 2013

@Netiul Thanks, I just checked the ValueGeneratorTest and missed that one. Now it should work...

@blanchonvincent
Copy link
Copy Markdown
Contributor

blanchonvincent commented Dec 16, 2013

@RalfEggert 👍

Maks3w
Maks3w reviewed Jan 2, 2014
View reviewed changes
Comment thread tests/ZendTest/Code/Generator/ValueGeneratorTest.php
Copy link
Copy Markdown
Member

@Maks3w Maks3w Jan 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the close parenthesis should not be indented

@weierophinney weierophinney added this to the 2.3.0 milestone Mar 3, 2014
weierophinney added a commit that referenced this pull request Mar 4, 2014
@weierophinney
Merge pull request #5616 from RalfEggert/feature_zend_code_array_pret…
b911b4c 
…tify

Prettify the output of Zend\Code\Generator\ValueGenerator for multi line arrays
weierophinney added a commit that referenced this pull request Mar 4, 2014
@weierophinney
Merge branch 'feature/5616' into develop
bcf9981 
Close #5616
@weierophinney weierophinney merged commit c28f71a into zendframework:develop Mar 4, 2014
@weierophinney weierophinney self-assigned this Mar 4, 2014
weierophinney added a commit that referenced this pull request Mar 5, 2014
@weierophinney
Merge pull request #5907 from Maks3w/feature_zend_code_array_prettify
ed5b591 
[#5616] Adapt array indentation to PSR-2 guidelines by default
weierophinney added a commit that referenced this pull request Mar 5, 2014
@weierophinney
[#5616] Revert code from #5608
16ad31c 
Based on new tests and links to relevant specifications, the code from #5608
was invalid; header lines may never start with whitespace.

This patch reverts that code, and updates the `fromString()` logic to
capture whitespace on subsequent lines to include in the multi-line
header value. Tests have been updated where necessary to use a regex for
testing the existence of whitespace between multiline values.
weierophinney added a commit that referenced this pull request Mar 5, 2014
@weierophinney
Merge branch 'hotfix/5616'
16b6c1e 
Close #5616
weierophinney added a commit that referenced this pull request Mar 5, 2014
@weierophinney
Merge branch 'hotfix/5616' into develop
d02d04d 
Forward port #5616

Conflicts:
	tests/ZendTest/Http/Response/ResponseStreamTest.php
	tests/ZendTest/Http/ResponseTest.php
weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015
@weierophinney
[zendframework/zendframework#5616] Revert code from zendframework/zen…
9775572 
…dframework#5608

Based on new tests and links to relevant specifications, the code from zendframework/zendframework#5608
was invalid; header lines may never start with whitespace.

This patch reverts that code, and updates the `fromString()` logic to
capture whitespace on subsequent lines to include in the multi-line
header value. Tests have been updated where necessary to use a regex for
testing the existence of whitespace between multiline values.
weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015
@weierophinney
Merge branch 'hotfix/5616'
2ce8f5e 
Close zendframework/zendframework#5616
weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015
@weierophinney
Merge branch 'hotfix/5616' into develop
8311d55 
Forward port zendframework/zendframework#5616

Conflicts:
	tests/ZendTest/Http/Response/ResponseStreamTest.php
	tests/ZendTest/Http/ResponseTest.php
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@weierophinney weierophinney

Labels

None yet

Projects

None yet

Milestone

2.3.0

Development

Successfully merging this pull request may close these issues.

5 participants

@RalfEggert @blanchonvincent @zluiten @Maks3w @weierophinney