-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
NTO-180 PHP8.1 compatibility #5
Conversation
Execute record generator related test first
…ly set on the query
…rayAccess Fix comments for record filter
Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
…ompose (FriendsOfSymfony1#86) Related to FriendsOfSymfony1/symfony1#261 Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
Fix mandatory value for array $emittedActAs (PHP 8 compatibility)
…ies/raw SQL (#3) * Added missing calls for applying indexes to subsuqeries and rawSql queries * query execution now solely depeneds on getSqlQuery * Removed redundant binding of indexes to a cached query
Fix Doctrine_Record _invokedSaveHooks cannot assign array value to boolean Declaration to array instead of boolean
https://wiki.php.net/rfc/phase_out_serializable PHP 7.4 add a new Serialize mecanism PHP 8.1 made old method, "Serializable implementation" deprecated PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix: Adding both method serialize/unserialize and __serialize/__unserialize In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4. Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment.
…lue anymore. Method str_replace/strtotime now require a string, not null FIX: PDOStatement::fetch, $cursorOffset must be a int Doctrine_Connection_Statement->fetch() default value to null FIX: Private methods cannot be final as they are never overridden by other classes Doctrine_Query_Having->_parseAliases(), remove "final"
https://wiki.php.net/rfc/internal_method_return_types PHP 8.0 added return type for abstract methods on Iterator, ArrayAccess, Countable, IteratorAggregate PHP 8.1 made non implementation as a Deprecated Warning PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix : adding this Attribute #[\ReturnTypeWillChange] Will drop the Deprecated warning. Adding return type will break compatibility before PHP 7.4, Return type has been added on PHP 7.0, but "mixed" special type is required, and it has been added on PHP 7.4. In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4 Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. Add missing Annotation
Php5.3 is broken due to Letsencrypt certificate cannot download composer
…types: string % int Doctrine_Parser_Xml:89, htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated https://wiki.php.net/rfc/internal_method_return_types for Doctrine_Node Doctrine_Adapter_Mock Doctrine_EventListener_TestLogger Doctrine_Parser_Xml Doctrine_Ticket_1254_TestCase, replace stftime() by date() with format adaptation.
sfYamlInline, backport fix from Symfony1. Doctrine_Hydrator_Graph fix array_map, rtrim(): Passing null to parameter #1 ($string) of type string is deprecated I emmit the hypothese that this array_map was broken, because array_map result is not assigned. Doctrine_Migration_Diff:333, str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated Doctrine_Migration_Builder:78:, is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated Doctrine_Validator_Notblank, allow null value HydrationListener, in HydrateTestCase.php, fix strtoupper(): Passing null to parameter #1 ($string) of type string is deprecated internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types see 2b2d173 for details Doctrine_Collection_OnDemand Doctrine_Validator_Exception
On 32 bit system, PHP use a float to overflow a bigint. On 64 bit, PHP int is the same as a database bigint, so this test is not relevant anymore
… in Doctrine_Record. This is only happening on 32bit system, because int 32bit could not map the whole strtotime date scope. Example value: "0000-00-00 00:00:00" Before 8.1 strtotime returns false, after it return false but also raise a Warning. @ is slightly lowering performance, it should not trigger any unwanted error, as if format is invalid strtotime should return "false" As this old project need BC for old system, seems the best fix.
Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
And remove an useless return false Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> Co-authored-by: Thomas <th@it-solutions-hirsch.de>
Remove Doctrine_Table::findBy* and findByOne* which are not phpdoc valid. Each class "MyTable" which "Doctrine_Table" should have all magick @method declared Fix invalid annotation and remove blank lines
Thanks to thePanz and Alquerci ! Co-authored-by: Alexandre Quercia <alquerci@email.com> Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
… php 8.1 incompatibility
Co-authored-by: Emanuele Panzeri <thepanz@gmail.com>
…lue anymore. Method str_replace/strtotime now require a string, not null FIX: PDOStatement::fetch, $cursorOffset must be a int Doctrine_Connection_Statement->fetch() default value to null FIX: Private methods cannot be final as they are never overridden by other classes Doctrine_Query_Having->_parseAliases(), remove "final"
sfYamlInline, backport fix from Symfony1. Doctrine_Hydrator_Graph fix array_map, rtrim(): Passing null to parameter #1 ($string) of type string is deprecated I emmit the hypothese that this array_map was broken, because array_map result is not assigned. Doctrine_Migration_Diff:333, str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated Doctrine_Migration_Builder:78:, is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated Doctrine_Validator_Notblank, allow null value HydrationListener, in HydrateTestCase.php, fix strtoupper(): Passing null to parameter #1 ($string) of type string is deprecated internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types see 2b2d173 for details Doctrine_Collection_OnDemand Doctrine_Validator_Exception PHP 8.1 PDO stringify is now disable by default. Activate it for Mysql + Sqlite https://www.php.net/manual/en/migration81.incompatible.php#migration81.incompatible.pdo.mysql PHP 8.1 Fix: Warning: strtotime() : Epoch doesn't fit in a PHP integer in Doctrine_Record. This is only happening on 32bit system, because int 32bit could not map the whole strtotime date scope. Example value: "0000-00-00 00:00:00" Before 8.1 strtotime returns false, after it return false but also raise a Warning. @ is slightly lowering performance, it should not trigger any unwanted error, as if format is invalid strtotime should return "false" As this old project need BC for old system, seems the best fix. PHP 8.1 > Automatic conversion of false to array is deprecated Fix Doctrine_Record _invokedSaveHooks cannot assign array value to boolean Declaration to array instead of boolean PHP 8.1 > Serializable Phase Out https://wiki.php.net/rfc/phase_out_serializable PHP 7.4 add a new Serialize mecanism PHP 8.1 made old method, "Serializable implementation" deprecated PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix: Adding both method serialize/unserialize and __serialize/__unserialize In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4. Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. PHP 8.1 > internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types PHP 8.0 added return type for abstract methods on Iterator, ArrayAccess, Countable, IteratorAggregate PHP 8.1 made non implementation as a Deprecated Warning PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix : adding this Attribute Will drop the Deprecated warning. Adding return type will break compatibility before PHP 7.4, Return type has been added on PHP 7.0, but "mixed" special type is required, and it has been added on PHP 7.4. In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4 Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. Update Travis to PHP up to 8.1 PHP 8.0 > Doctrine_Query:36, uncaught TypeError: Unsupported operand types: string % int Doctrine_Parser_Xml:89, htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated https://wiki.php.net/rfc/internal_method_return_types for Doctrine_Node Doctrine_Adapter_Mock Doctrine_EventListener_TestLogger Doctrine_Parser_Xml Doctrine_Ticket_1254_TestCase, replace stftime() by date() with format adaptation.
Fix BC compatibility for any dev using fetch($currentOffset = null) Fix SQLite Connect to return a boolean Remove useless string cast by testing null before Check TaskName declaration Fix test 1783 - 64bit compatibility On 32 bit system, PHP use a float to overflow a bigint. On 64 bit, PHP int is the same as a database bigint, so this test is not relevant anymore
@@ -89,6 +89,7 @@ public function __isset($name) | |||
* @param string $name | |||
* @return void | |||
*/ | |||
#[\ReturnTypeWillChange] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sort of change is very characteristic of those provided by the upstream. This comment allows for suppression of deprecation warnings to preserve backwards compatibility when overloading behaviour methods or core functions.
*/ | ||
public function serialize() | ||
{ | ||
$vars = $this->__serialize(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also common in the upstream - something has changed with serialisation in PHP8, and this additional code protects backwards compatibility while supporting the PHP8 specific improvements.
@@ -74,7 +74,7 @@ public function __construct($collection) | |||
* | |||
* @return void | |||
*/ | |||
public function rewind() | |||
public function rewind(): void |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes, however, are where I got to fixing the code before the upstream did. I've updated the method signature to match what it overloads, which means no deprecation message is emitted (or suppressed), but breaks backwards compatibility as a result.
@@ -75,7 +75,7 @@ public function __construct($migrationsPath = null) | |||
if ($migrationsPath instanceof Doctrine_Migration) { | |||
$this->setMigrationsPath($migrationsPath->getMigrationClassesDirectory()); | |||
$this->migration = $migrationsPath; | |||
} else if (is_dir($migrationsPath)) { | |||
} else if (is_dir((string) $migrationsPath)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also pretty common. Many core functions throw warnings if they expect a string argument and they get passed a null
. Lots of situations where that's possible now have the argument being cast to string
to avoid those warnings.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice job. I have some suggestions, but I can't easily tell which bits are you and which bits are upstream i.e best left alone. So feel free to action/disregard as you see fit.
* Fix tests to be able to finish it without a fatal error Execute record generator related test first * Fix tests for relationship fetch order when the order is not explicitly set on the query * Fix PHP 7 compatibility about deep isset() on class that implement ArrayAccess Fix comments for record filter * Mark as known bug, integer validation with numbers greater than PHP_INT_MAX * Fix test for export to XML * Fix PHP 7.4 compatibility * Add zlib required PHP extension on composer configuration * Fix code structure about always close connections after each test Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Add consistent local environment for testing with docker and docker-compose (FriendsOfSymfony1#86) Related to FriendsOfSymfony1/symfony1#261 Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Update Builder.php for PHP8 compatibility (FriendsOfSymfony1#82) Fix mandatory value for array $emittedActAs (PHP 8 compatibility) * imported double-quoting changes from zikula/doctrine1@bda84a8 * Applied patches from JSB-363 (#1) * JSB-363: Added missing calls to applyIndexes when considering subqueries/raw SQL (#3) * Added missing calls for applying indexes to subsuqeries and rawSql queries * query execution now solely depeneds on getSqlQuery * Removed redundant binding of indexes to a cached query * PHP 8.1 > Automatic conversion of false to array is deprecated Fix Doctrine_Record _invokedSaveHooks cannot assign array value to boolean Declaration to array instead of boolean * PHP 8.1 > Serializable Phase Out https://wiki.php.net/rfc/phase_out_serializable PHP 7.4 add a new Serialize mecanism PHP 8.1 made old method, "Serializable implementation" deprecated PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix: Adding both method serialize/unserialize and __serialize/__unserialize In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4. Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. * PHP 8.0 > Typing of internal function parameters do not allow null value anymore. Method str_replace/strtotime now require a string, not null FIX: PDOStatement::fetch, $cursorOffset must be a int Doctrine_Connection_Statement->fetch() default value to null FIX: Private methods cannot be final as they are never overridden by other classes Doctrine_Query_Having->_parseAliases(), remove "final" * PHP 8.1 > internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types PHP 8.0 added return type for abstract methods on Iterator, ArrayAccess, Countable, IteratorAggregate PHP 8.1 made non implementation as a Deprecated Warning PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix : adding this Attribute Will drop the Deprecated warning. Adding return type will break compatibility before PHP 7.4, Return type has been added on PHP 7.0, but "mixed" special type is required, and it has been added on PHP 7.4. In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4 Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. Add missing Annotation * Update Travis to PHP up to 8.1 Php5.3 is broken due to Letsencrypt certificate cannot download composer * PHP 8.0 > Doctrine_Query:36, uncaught TypeError: Unsupported operand types: string % int Doctrine_Parser_Xml:89, htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated https://wiki.php.net/rfc/internal_method_return_types for Doctrine_Node Doctrine_Adapter_Mock Doctrine_EventListener_TestLogger Doctrine_Parser_Xml Doctrine_Ticket_1254_TestCase, replace stftime() by date() with format adaptation. * PHP 8.1 fix last sfYamlInline, backport fix from Symfony1. Doctrine_Hydrator_Graph fix array_map, rtrim(): Passing null to parameter #1 ($string) of type string is deprecated I emmit the hypothese that this array_map was broken, because array_map result is not assigned. Doctrine_Migration_Diff:333, str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated Doctrine_Migration_Builder:78:, is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated Doctrine_Validator_Notblank, allow null value HydrationListener, in HydrateTestCase.php, fix strtoupper(): Passing null to parameter #1 ($string) of type string is deprecated internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types see 2b2d173 for details Doctrine_Collection_OnDemand Doctrine_Validator_Exception * Fix test 1783 - 64bit compatibility On 32 bit system, PHP use a float to overflow a bigint. On 64 bit, PHP int is the same as a database bigint, so this test is not relevant anymore * PHP 8.1 PDO stringify is now disable by default. Activate it for Mysql + Sqlite https://www.php.net/manual/en/migration81.incompatible.php#migration81.incompatible.pdo.mysql * PHP8.1 Fix: Warning: strtotime() : Epoch doesn't fit in a PHP integer in Doctrine_Record. This is only happening on 32bit system, because int 32bit could not map the whole strtotime date scope. Example value: "0000-00-00 00:00:00" Before 8.1 strtotime returns false, after it return false but also raise a Warning. @ is slightly lowering performance, it should not trigger any unwanted error, as if format is invalid strtotime should return "false" As this old project need BC for old system, seems the best fix. * Annotate can return null Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Return annotation Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Return annotation Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Coding style And remove an useless return false Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> Co-authored-by: Thomas <th@it-solutions-hirsch.de> * Fix annotation. Remove Doctrine_Table::findBy* and findByOne* which are not phpdoc valid. Each class "MyTable" which "Doctrine_Table" should have all magick @method declared Fix invalid annotation and remove blank lines * Remove useless string cast by testing null before * Fix SQLite Connect to return a boolean * Fix BC compatibility for any dev using fetch($currentOffset = null) * Commit Suggestions - Fix phpDoc and yoda style Thanks to thePanz and Alquerci ! Co-authored-by: Alexandre Quercia <alquerci@email.com> Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * Handle default taskName to null, to avoid triggering the strlen(null) php 8.1 incompatibility * Fix taskname empty length Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> * bumped min php version, bumped branch alias * don't attempt `strtolower` on null values * updated iterator method signatures to match upstream * avoid returning any value from a `: void` hinted function * PHP 8.0 > Typing of internal function parameters do not allow null value anymore. Method str_replace/strtotime now require a string, not null FIX: PDOStatement::fetch, $cursorOffset must be a int Doctrine_Connection_Statement->fetch() default value to null FIX: Private methods cannot be final as they are never overridden by other classes Doctrine_Query_Having->_parseAliases(), remove "final" * PHP 8.1 > Compatibility sfYamlInline, backport fix from Symfony1. Doctrine_Hydrator_Graph fix array_map, rtrim(): Passing null to parameter #1 ($string) of type string is deprecated I emmit the hypothese that this array_map was broken, because array_map result is not assigned. Doctrine_Migration_Diff:333, str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated Doctrine_Migration_Builder:78:, is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated Doctrine_Validator_Notblank, allow null value HydrationListener, in HydrateTestCase.php, fix strtoupper(): Passing null to parameter #1 ($string) of type string is deprecated internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types see 2b2d173 for details Doctrine_Collection_OnDemand Doctrine_Validator_Exception PHP 8.1 PDO stringify is now disable by default. Activate it for Mysql + Sqlite https://www.php.net/manual/en/migration81.incompatible.php#migration81.incompatible.pdo.mysql PHP 8.1 Fix: Warning: strtotime() : Epoch doesn't fit in a PHP integer in Doctrine_Record. This is only happening on 32bit system, because int 32bit could not map the whole strtotime date scope. Example value: "0000-00-00 00:00:00" Before 8.1 strtotime returns false, after it return false but also raise a Warning. @ is slightly lowering performance, it should not trigger any unwanted error, as if format is invalid strtotime should return "false" As this old project need BC for old system, seems the best fix. PHP 8.1 > Automatic conversion of false to array is deprecated Fix Doctrine_Record _invokedSaveHooks cannot assign array value to boolean Declaration to array instead of boolean PHP 8.1 > Serializable Phase Out https://wiki.php.net/rfc/phase_out_serializable PHP 7.4 add a new Serialize mecanism PHP 8.1 made old method, "Serializable implementation" deprecated PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix: Adding both method serialize/unserialize and __serialize/__unserialize In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4. Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. PHP 8.1 > internal_method_return_types https://wiki.php.net/rfc/internal_method_return_types PHP 8.0 added return type for abstract methods on Iterator, ArrayAccess, Countable, IteratorAggregate PHP 8.1 made non implementation as a Deprecated Warning PHP 9.0 (no release date at this moment) will drop the support. Temporary Fix : adding this Attribute Will drop the Deprecated warning. Adding return type will break compatibility before PHP 7.4, Return type has been added on PHP 7.0, but "mixed" special type is required, and it has been added on PHP 7.4. In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4 Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment. Update Travis to PHP up to 8.1 PHP 8.0 > Doctrine_Query:36, uncaught TypeError: Unsupported operand types: string % int Doctrine_Parser_Xml:89, htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated https://wiki.php.net/rfc/internal_method_return_types for Doctrine_Node Doctrine_Adapter_Mock Doctrine_EventListener_TestLogger Doctrine_Parser_Xml Doctrine_Ticket_1254_TestCase, replace stftime() by date() with format adaptation. * PR Review - Small bug Fixes Fix BC compatibility for any dev using fetch($currentOffset = null) Fix SQLite Connect to return a boolean Remove useless string cast by testing null before Check TaskName declaration Fix test 1783 - 64bit compatibility On 32 bit system, PHP use a float to overflow a bigint. On 64 bit, PHP int is the same as a database bigint, so this test is not relevant anymore * Fix Annotation and Coding Style * Add proof tast name with empty task name property sets by child class * minor PSR fixes * minor tidies suggested at code review * removed docker environments for testing older php versions Co-authored-by: Alexandre Quercia <alquerci@email.com> Co-authored-by: Emanuele Panzeri <thepanz@gmail.com> Co-authored-by: xNatek <nathan.trenet@gmail.com> Co-authored-by: Alexander Sims <alexmk92@live.co.uk> Co-authored-by: Tybaze <tybaze@users.noreply.github.com> Co-authored-by: Ben Tybaze <6998932+Tybaze@users.noreply.github.com> Co-authored-by: Thomas <th@it-solutions-hirsch.de>
The starting point for this PR was to take a WIP branch on the upstream FriendsOfSymfony1/doctrine1 repo submitted by a community member, and built out from there to get
deepwell
up and running. While I was patching and fixing breakages, the upstream received a merge commit which added "official" support for PHP8.x, so I merged that into this PR as well.What that leaves us with is a bit of a hodgepodge of changes. Many of the ones provided by the upstream are intended to add support for PHP8.x without disabling backwards compatibility for PHP7.x (and sometimes earlier). By contrast, my perspective has been that we're never going backwards to an older language version and thus we don't need to include support for that use case. The result is a mixed approach which isn't ideal, but there is questionable value in spending time gutting out old features when we have a working project as-is.