* '2131-add-accept-header-parsing' of https://github.com/Rupert-RR/yii:
Yii code style correction
Removed unnecessary spaces.
Transferred data for unit tests from the test functions into data providers.
Undo accidental permissions change on bootstrap.php
Added unit test file for CHttpRequest for the methods parseAcceptHeader() and compareAcceptTypes(). Modified the regexp in parseAcceptHeader() to accept wildcards in the path. Modified the description of compareAcceptTypes() to better reflect the comparison result (higher preference returns lower value, so that most preferred is first in the array).
parseAcceptHeader() function description tidy up.
Typo corrections and code tidy up.
Altered parseAcceptHeader() to use only one regexp. Thanks to Ka on StackExchange for this expression.
Typo corrections
Separated out parse and compare functions. Reduced regular expression count to 2 from 3. Modified MIME type array map structure.
Added #135 back in changelog, which got lost somehow..
Moved position of line to follow numerical order.
Enh #2131: Added Accept header parsing to CHttpRequest to give an array of accepted types in order of preference
Conflicts:
CHANGELOG
parseAcceptHeader() and compareAcceptTypes().
Modified the regexp in parseAcceptHeader() to accept wildcards in the
path.
Modified the description of compareAcceptTypes() to better reflect the
comparison result (higher preference returns lower value, so that most
preferred is first in the array).
Fixed conflict with text/xml header.
Changed signature of CWsdlGenerator::buildHtmlDocs($return=false) to callable from other script. Also needed for unit test.
* phpnode-add-cdataprovideriterator:
Refactoring of CDataProviderIterator
#545 more tiny code style changes
#545 reformat code according to Yii style
#545 dont use getters or setters if we can avoid it
#545 dont use getters or setters if we can avoid it
#545 make protected members private
#545 update changelog
#545 fix whitespace
Update changelog for #545
Add CDataProviderIterator to allow iterating over large data sets
* 'add-cdataprovideriterator' of https://github.com/phpnode/yii:
#545 more tiny code style changes
#545 reformat code according to Yii style
#545 dont use getters or setters if we can avoid it
#545 dont use getters or setters if we can avoid it
#545 make protected members private
#545 update changelog
#545 fix whitespace
Update changelog for #545
Add CDataProviderIterator to allow iterating over large data sets
Conflicts:
CHANGELOG
