Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of Changes
The upgrade involves the following categories of changes:
?Typesyntax instead of implicit= nullSerializableinterface with__serialize()and__unserialize()intreturn type tocount()methods\Traversablereturn type togetIterator()__toString()Method - Addingstringreturn typeDetailed Changes by File
lib/Doctrine/Access.php
offsetExists($offset)→offsetExists(mixed $offset): booloffsetGet($offset)→offsetGet(mixed $offset): mixedoffsetSet($offset, $value)→offsetSet(mixed $offset, mixed $value): voidoffsetUnset($offset)→offsetUnset(mixed $offset): voidreturn $this->remove($offset)to just$this->remove($offset)inoffsetUnset()(void return)lib/Doctrine/Adapter/Mock.php
count()→count(): intlib/Doctrine/AuditLog.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Cli.php
__construct(array $config = array(), Doctrine_Cli_Formatter $formatter = null)→__construct(array $config = array(), ?Doctrine_Cli_Formatter $formatter = null)lib/Doctrine/Cli/AnsiColorFormatter.php
">> %-${width}s %s"→">> %-{$width}s %s"lib/Doctrine/Collection.php
Serializablefrom implements clauseserialize()→__serialize(): array(returns array instead of string)unserialize($serialized)→__unserialize(array $data): voidkey()→key(): mixedcount()→count(): intsave(Doctrine_Connection $conn = null, ...)→save(?Doctrine_Connection $conn = null, ...)replace(Doctrine_Connection $conn = null, ...)→replace(?Doctrine_Connection $conn = null, ...)delete(Doctrine_Connection $conn = null, ...)→delete(?Doctrine_Connection $conn = null, ...)getIterator()→getIterator(): \Traversable__toString()→__toString(): stringlib/Doctrine/Collection/Iterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidlib/Doctrine/Collection/Iterator/Expandable.php
valid()→valid(): boolreturn false;at end of methodlib/Doctrine/Collection/Iterator/Normal.php
valid()→valid(): boollib/Doctrine/Collection/Iterator/Offset.php
valid()→valid(): boolreturn false;lib/Doctrine/Collection/Offset.php
getIterator()→getIterator(): \Traversablelib/Doctrine/Collection/OnDemand.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Column.php
count()→count(): intgetIterator()→getIterator(): \Traversablelib/Doctrine/Connection.php
Serializablefrom implements clauseprotected $exported = array();propertygetIterator()→getIterator(): \Traversablecount()→count(): int__toString()→__toString(): stringserialize()→__serialize(): arrayunserialize($serialized)→__unserialize(array $data): voidlib/Doctrine/Connection/Profiler.php
getIterator()→getIterator(): \Traversablecount()→count(): intlib/Doctrine/Connection/Statement.php
fetch()methodlib/Doctrine/Expression.php
count()→count(): intlib/Doctrine/File.php
setUp()→setUp(): voidlib/Doctrine/File/Index.php
setTableDefinition()→setTableDefinition(): voidsetUp()→setUp(): voidlib/Doctrine/Formatter.php
str_replace()parameterlib/Doctrine/Hydrator/Graph.php
lib/Doctrine/I18n.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Import/Builder.php
setTableDefinition()now includes: voidreturn typesetUp()now includes: voidreturn typelib/Doctrine/Locator.php
count()→count(): intgetIterator()→getIterator(): \Traversablelib/Doctrine/Manager.php
Serializablefrom implements clausecount()→count(): intgetIterator()→getIterator(): \Traversable__toString()→__toString(): stringserialize()→__serialize(): arrayunserialize($serialized)→__unserialize(array $data): voidlib/Doctrine/Node.php
getIterator($type = null, $options = null)→getIterator($type = null, $options = null): \Traversablelib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Node/NestedSet/PreOrderIterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Null.php
count()→count(): intlib/Doctrine/Pager/Layout.php
count()→count(): intlib/Doctrine/Query.php
count(array $params = array())→count(array $params = array()): intlib/Doctrine/Query/Abstract.php
getIterator()→getIterator(): \Traversablelib/Doctrine/Query/Having.php
count()→count(): intlib/Doctrine/Query/Part.php
count()→count(): intlib/Doctrine/Query/Tokenizer.php
continuetocontinue 2where targeting switch inside looplib/Doctrine/RawSql.php
continuetocontinue 2where targeting switch inside looplib/Doctrine/Record.php
Serializablefrom implements clauseserialize()→__serialize(): arrayunserialize($serialized)→__unserialize(array $data): voidcount()→count(): intgetIterator()→getIterator(): \Traversable__toString()→__toString(): string$_invokedSaveHooksinitialization fromfalseto[]lib/Doctrine/Record/Abstract.php
setTableDefinition()→setTableDefinition(): voidsetUp()→setUp(): voidlib/Doctrine/Record/Iterator.php
rewind()→rewind(): voidkey()→key(): mixedcurrent()→current(): mixednext()→next(): voidvalid()→valid(): boollib/Doctrine/Relation.php
count()→count(): intgetIterator()→getIterator(): \Traversable__toString()→__toString(): stringlib/Doctrine/Search.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Search/Record.php
setTableDefinition()→setTableDefinition(): voidsetUp()→setUp(): voidlib/Doctrine/Table.php
count()→count(): int__toString()→__toString(): stringvalidateField($fieldName, $value, Doctrine_Record $record = null)→validateField($fieldName, $value, ?Doctrine_Record $record = null)getColumnNames(array $fieldNames = null)→getColumnNames(?array $fieldNames = null)explode()with null parameter using null coalescinglib/Doctrine/Table/Repository.php
count()→count(): intgetIterator()→getIterator(): \Traversablelib/Doctrine/Template.php
setUp()→setUp(): voidsetTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/Geographical.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/I18n.php
setUp()→setUp(): voidlib/Doctrine/Template/NestedSet.php
setUp()→setUp(): voidsetTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/Searchable.php
setUp()→setUp(): voidlib/Doctrine/Template/Sluggable.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/SoftDelete.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/Timestampable.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Template/Versionable.php
setUp()→setUp(): voidlib/Doctrine/Tree.php
setTableDefinition()→setTableDefinition(): voidlib/Doctrine/Tree/Interface.php
createRoot(Doctrine_Record $record = null)→createRoot(?Doctrine_Record $record = null)lib/Doctrine/Tree/NestedSet.php
setTableDefinition()→setTableDefinition(): voidcreateRoot(Doctrine_Record $record = null)→createRoot(?Doctrine_Record $record = null)lib/Doctrine/Validator.php
isValidType()to prevent "Array to string conversion" warninglib/Doctrine/Validator/Driver.php
__toString()→__toString(): stringlib/Doctrine/Validator/ErrorStack.php
getIterator()→getIterator(): \Traversablecount()→count(): intlib/Doctrine/Validator/Exception.php
getIterator()→getIterator(): \Traversablecount()→count(): intlib/Doctrine/Validator/Notblank.php
trim()on nullBreaking Changes
These changes maintain backward compatibility for user code, but any code that extends Doctrine classes may need to update method signatures to match the new return types.
Classes extending Doctrine_Record
Child classes must update:
setTableDefinition()→setTableDefinition(): voidsetUp()→setUp(): voidClasses extending Doctrine_Template
Child classes must update:
setTableDefinition()→setTableDefinition(): voidsetUp()→setUp(): voidClasses implementing Iterator
Must add return types to all Iterator methods:
rewind(): voidcurrent(): mixedkey(): mixednext(): voidvalid(): boolClasses implementing Countable
Must add return type:
count(): intClasses implementing IteratorAggregate
Must add return type:
getIterator(): \TraversableClasses implementing ArrayAccess
Must add return types:
offsetExists(mixed $offset): booloffsetGet(mixed $offset): mixedoffsetSet(mixed $offset, mixed $value): voidoffsetUnset(mixed $offset): void