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

[cs] cleanup master #5672

Merged
merged 6 commits into from
Jan 4, 2014
Merged

[cs] cleanup master #5672

merged 6 commits into from
Jan 4, 2014

Conversation

Maks3w
Copy link
Member

@Maks3w Maks3w commented Jan 4, 2014

Fix PSR-0 and PSR-2 issues.

Maks3w added 6 commits January 4, 2014 11:17
@Maks3w
[cs] Remove unnecessary use statements
cb4402f 
The imported classes share the same namespace.
@Maks3w
[psr0] Match class name with filename
e91d69f
@Maks3w
[psr0] exclude ZendTest/Loader/TestAsset/Name_Space/Namespaced/Class.php
d4d8740 
Exclude ZendTest/Loader/TestAsset/Name_Space/Namespaced/Class.php from PSR-0 checks.
@Maks3w
[test] Remove orphan assets
9ac6bc1
@Maks3w
[psr0] Fix namespaces
e530990
@Maks3w
[cs] Exclude some component assets from cs check
4877152 
Exclude assets which not follow PSR-0 standards
@Maks3w Maks3w merged commit 4877152 into zendframework:master Jan 4, 2014
@Maks3w Maks3w deleted the hotfix/cs-cleanup branch January 4, 2014 12:06
weierophinney pushed a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
cb65c9a 
…-cleanup'
weierophinney pushed a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015
@Maks3w
Forward port zendframework/zendframework#5672
8b40f40 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
0ccec76 
…-cleanup'
weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
@Maks3w
Forward port zendframework/zendframework#5672
b66ecbe 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
173fdb9 
…-cleanup'
gianarb pushed a commit to zendframework/zend-captcha that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
5624dcb 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-uri that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
7b56a57 
…-cleanup'
gianarb pushed a commit to zendframework/zend-uri that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
abb043f 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
e3292c5 
…-cleanup'
gianarb pushed a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
1308a9c 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
8db253f 
…-cleanup'
gianarb pushed a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
30d2b4b 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-debug that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
2dd5268 
…-cleanup'
gianarb pushed a commit to zendframework/zend-debug that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
5d36555 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-loader that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
0cf297f 
…-cleanup'
gianarb pushed a commit to zendframework/zend-loader that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
2cbf238 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-modulemanager that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
9fb11da 
…-cleanup'
gianarb pushed a commit to zendframework/zend-modulemanager that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
883b5fd 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-test that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
8ef2791 
…-cleanup'
gianarb pushed a commit to zendframework/zend-test that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
4217f55 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
759b848 
…-cleanup'
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
3e880d6 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-di that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
ec2b8bc 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
03b41a2 
…-cleanup'
gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
40fb990 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-progressbar that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
103a360 
…-cleanup'
gianarb pushed a commit to zendframework/zend-progressbar that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
09f5906 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-console that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
c45b896 
…-cleanup'
gianarb pushed a commit to zendframework/zend-filter that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
acfbbcd 
…-cleanup'
gianarb pushed a commit to zendframework/zend-filter that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
8ac6dc2 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
d000d8a 
…-cleanup'
gianarb pushed a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
fe25a4f 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
4d6040d 
…-cleanup'
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
008b63c 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-escaper that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
b106c74 
…-cleanup'
gianarb pushed a commit to zendframework/zend-escaper that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
0632656 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-session that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
5a32e1b 
…-cleanup'
gianarb pushed a commit to zendframework/zend-session that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
4434ad7 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-log that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
6faf2bb 
…-cleanup'
gianarb pushed a commit to zendframework/zend-log that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
bba7d3a 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
38f33dd 
…-cleanup'
gianarb pushed a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
b920175 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
38be842 
…-cleanup'
gianarb pushed a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
665e171 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
f7ab865 
…-cleanup'
gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
6bfd1a6 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
695649c 
…-cleanup'
gianarb pushed a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
de66f61 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
gianarb pushed a commit to zendframework/zend-feed that referenced this pull request May 15, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
59a52e7 
…-cleanup'
gianarb pushed a commit to zendframework/zend-feed that referenced this pull request May 15, 2015
@Maks3w
Forward port zendframework/zendframework#5672
4b2a554 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
weierophinney pushed a commit to zendframework/zend-i18n-resources that referenced this pull request May 28, 2015
@Maks3w
Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…
274bf4b 
…-cleanup'
weierophinney pushed a commit to zendframework/zend-i18n-resources that referenced this pull request May 28, 2015
@Maks3w
Forward port zendframework/zendframework#5672
4290548 
Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.2.6
Development

Successfully merging this pull request may close these issues.
1 participant
@Maks3w