Fix doc blocks consistency and coding standards PSR2 #4352

Merged
merged 2 commits into from Apr 29, 2013

Conversation

Projects
None yet
3 participants
Contributor

neeckeloo commented Apr 29, 2013

Use "bool" instead of "boolean" and "int" instead of "integer" in doc blocks for consistency.
Also fix coding standards PSR2 as elseif and spaces.

Member

localheinz commented Apr 29, 2013

👍

Contributor

neeckeloo commented Apr 29, 2013

I should have used two pull requests but I commits in the wrong branch the second time and it seems complicated to solve with rebase command.

@weierophinney weierophinney added a commit that referenced this pull request Apr 29, 2013

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop
Close #4352
dcce728

weierophinney merged commit 2db9a17 into zendframework:develop Apr 29, 2013

1 check failed

default The Travis build failed
Details

@weierophinney weierophinney added a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
35d5358

@weierophinney weierophinney added a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 9b1ad90

@weierophinney weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
94834e3

@weierophinney weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop e84c12e

@weierophinney weierophinney added a commit to zendframework/zend-barcode that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
a240e0e

@weierophinney weierophinney added a commit to zendframework/zend-barcode that referenced this pull request May 14, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop b0c018c

@weierophinney weierophinney added a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
79e532c

@weierophinney weierophinney added a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 3615dc2

@weierophinney weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
b85803e

@weierophinney weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 5d1699c

@weierophinney weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
2a5dd9c

@weierophinney weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop e1de8ec

@weierophinney weierophinney added a commit to zendframework/zend-math that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
0fb5ce8

@weierophinney weierophinney added a commit to zendframework/zend-math that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop d6fc79f

@weierophinney weierophinney added a commit to zendframework/zend-loader that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
9cfdb94

@weierophinney weierophinney added a commit to zendframework/zend-loader that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop d0835c3

@weierophinney weierophinney added a commit to zendframework/zend-memory that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
2c75191

@weierophinney weierophinney added a commit to zendframework/zend-memory that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 57fe8e9

@weierophinney weierophinney added a commit to zendframework/zend-config that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
d9c4ace

@weierophinney weierophinney added a commit to zendframework/zend-config that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 488393b

@weierophinney weierophinney added a commit to zendframework/zend-test that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
332c976

@weierophinney weierophinney added a commit to zendframework/zend-test that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 4205ad6

@weierophinney weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
166fa4c

@weierophinney weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop cd7f1f4

@weierophinney weierophinney added a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
c2c9c4f

@weierophinney weierophinney added a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop b2e0c83

@weierophinney weierophinney added a commit to zendframework/zend-paginator that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
5bb229a

@weierophinney weierophinney added a commit to zendframework/zend-paginator that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 43cba4d

@weierophinney weierophinney added a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
3daecbe

@weierophinney weierophinney added a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop fb94cca

@weierophinney weierophinney added a commit to zendframework/zend-text that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
3b51c87

@weierophinney weierophinney added a commit to zendframework/zend-text that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 0ffed8f

@weierophinney weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
64b87d3

@weierophinney weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 8e9d237

@weierophinney weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
653e4ac

@weierophinney weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop d240054

@weierophinney weierophinney added a commit to zendframework/zend-progressbar that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
8464ef7

@weierophinney weierophinney added a commit to zendframework/zend-progressbar that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop d24dc4d

@weierophinney weierophinney added a commit to zendframework/zend-console that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
3cecca7

@weierophinney weierophinney added a commit to zendframework/zend-console that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 7591112

@weierophinney weierophinney added a commit to zendframework/zend-filter that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
79c2ac8

@weierophinney weierophinney added a commit to zendframework/zend-filter that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 473be1c

@weierophinney weierophinney added a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
5a4c2d2

@weierophinney weierophinney added a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 9cc3538

@weierophinney weierophinney added a commit to zendframework/zend-json that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
9c84fb7

@weierophinney weierophinney added a commit to zendframework/zend-json that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop cbb5bf2

@weierophinney weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
ef939bd

@weierophinney weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 15e5d42

@weierophinney weierophinney added a commit to zendframework/zend-file that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
99e86fc

@weierophinney weierophinney added a commit to zendframework/zend-file that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 9e9b7fb

@weierophinney weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
952351b

@weierophinney weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 93220b2

@weierophinney weierophinney added a commit to zendframework/zend-cache that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
7080c30

@weierophinney weierophinney added a commit to zendframework/zend-cache that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 5ff3908

@weierophinney weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
19b2306

@weierophinney weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 4ac7e7f

@weierophinney weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
062b17e

@weierophinney weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 8405746

@weierophinney weierophinney added a commit to zendframework/zend-feed that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge pull request zendframework/zendframework#4352 from neeckeloo/do…
…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php
7fad774

@weierophinney weierophinney added a commit to zendframework/zend-feed that referenced this pull request May 15, 2015

@weierophinney weierophinney Merge branch 'hotfix/4352' into develop 758e5c3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment