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

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3 #5604

Merged
merged 17 commits into from
Mar 4, 2014

Conversation

samsonasik
Copy link
Contributor

Per @weierophinney change on af3e982 at PR #5602

@macnibblet
Copy link
Contributor

@samsonasik
Copy link
Contributor Author

@macnibblet done ;)

@macnibblet
Copy link
Contributor

Ehm, shouldn't you be removing all the class_aliases and using the proper implementation instead ?

@macnibblet
Copy link
Contributor

You should do a grep on all instances of version_compare in the library folder because there are many more instances

@samsonasik
Copy link
Contributor Author

@macnibblet all version_compare checked. I'm not sure about removing class_aliases, any suggestions for it that need to be removed / updated ?

@macnibblet
Copy link
Contributor

The reason that we have class_aliases is because we need to fix a bug in PHP, if we bump the minor version we don't need to use those fixes thus they should be removed...

@samsonasik
Copy link
Contributor Author

@macnibblet updated. please let me know if I missed something ^^

@samsonasik
Copy link
Contributor Author

@macnibblet wait, last commit cause travis error because I remove class_aliases, I will reset it and check again.

@macnibblet
Copy link
Contributor

You are going to need to fix tests aswell :)

@samsonasik
Copy link
Contributor Author

@macnibblet updated. travis green again ;)

) {
return __DIR__ . '/_files/magic.lte.5.3.10.mime';
}

// Ubuntu has backported the changes in 12.04 to PHP 5.3.10.
if (strpos(PHP_VERSION, 'ubuntu') !== false && version_compare(PHP_VERSION, '5.3.10', '>=')) {
if (strpos(PHP_VERSION, 'ubuntu') !== false) {
return __DIR__ . '/_files/magic.lte.5.3.10.mime';
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that whole block can go away now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about it //cc @weierophinney

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gws I think ubuntu check should still exist because version_compare is check for PHP_VERSION >= 5.3.10 , not < , so, the conditional still valid, and we need to only remove the version_compare check because we are already in PHP_VERSION >= 5.3.23. /cc @weierophinney

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My thinking: the PHP version requirements in ZF2 are now beyond the magic database change in 5.3.11 for the 5.3.x line, regardless of Ubuntu's backport to 5.3.10. The only remaining supported version which requires the old magic file format is 5.4.0, which is tested for in the first block.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weierophinney any suggestions for this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gws Ok, now removed as your suggestion. thanks.

@samsonasik
Copy link
Contributor Author

rebased agains develop cause #5724

@@ -129,8 +126,6 @@ public function testVerifyFailureVersion()
'backwards compatibility settings.'
);
$this->bcrypt->verify('test', $hash);
} else {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove if too.

@samsonasik
Copy link
Contributor Author

@Maks3w done ;)

@Maks3w Maks3w added this to the 2.3.0 milestone Feb 15, 2014
@samsonasik
Copy link
Contributor Author

@Maks3w removed ;)

@samsonasik
Copy link
Contributor Author

@Maks3w done, now removed, I did :
1. move Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php into Zend/Stdlib/ArrayObject.php and remove the Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
2. move Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php into Zend/Session/Storage/SessionArrayStorage.php and remove Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php

Please let me know if I missed something ^^

@@ -23,6 +19,6 @@ class_alias('Zend\Session\Container\PhpReferenceCompatibility', 'Zend\Session\Ab
* Additionally, expiries may be absolute TTLs or measured in "hops", which
* are based on how many times the key or container were accessed.
*/
class Container extends AbstractBaseContainer
class Container extends PhpReferenceCompatibility
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

include the code from the parent class here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and remove the old class

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Maks3w done. code included from the parent class, and old class removed.

@HardieBoeve
Copy link

Why not set the minimum to php 5.4? And maybe even better to 5.5 cause 5.3 is already deprecated for almost an year, and 5.4 will be soon deprecated with the release of 5.6.

@samsonasik
Copy link
Contributor Author

@HardieBoeve 5.4 will be for ZF3 //cc @weierophinney ;)

@HardieBoeve
Copy link

ok :) .. but would it not be better for ZF3 to require at least PHP5.5? Because 5.4 is almost eol.

@blanchonvincent
Copy link
Contributor

@HardieBoeve "Adoption of PHP 5.4 and/or PHP 5.5. Right now, we want to target 5.4
for ZF3, but the main stumbling block is adoption. Right now, most LTS
distributions are on PHP 5.3.3, and may or may not have new releases
by then; we don't want to risk having a version that nobody can adopt." by @weierophinney

@HardieBoeve
Copy link

@blanchonvincent thats sadly true .....

But what is the time schedule for releasing ZF3? Will it be this year? Else i personally think it will be pointless to adopt an eol version of php, because most developers are using other resources than the main resources an LTS comes with to get the latest version, but also i know some not, and yes .. when closing them out will be not an good idea.

@Ocramius
Copy link
Member

Afaik, only RHEL will be 5.4, and RHEL is designed to run ancient systems anyway (not for what is yet to be built), so 5.5 could eventually be a good candidate. I'd move this to the mailing list though.

@HardieBoeve
Copy link

@Ocramius 👍

gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-paginator that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-serializer that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-text that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-xmlrpc that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-di that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-server that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-progressbar that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-console that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-filter that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-json that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-file that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-escaper that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-dom that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-session that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-log that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-mime that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
gianarb pushed a commit to zendframework/zend-feed that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
weierophinney pushed a commit to zendframework/zend-permissions-acl that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
weierophinney pushed a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
…hange/php-require-version

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants