Skip to content

[stable10] PHP 5.5 is EOL as well by now #28765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 1 commit into from
Aug 22, 2017
Merged

[stable10] PHP 5.5 is EOL as well by now #28765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions settings/Controller/CheckSetupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
use OC_Util;
use OCP\IURLGenerator;

/**
Expand Down Expand Up @@ -253,7 +252,7 @@ public function rescanFailedIntegrityCheck() {

/**
* @NoCSRFRequired
* @return DataResponse
* @return DataResponse | DataDisplayResponse
*/
public function getFailedIntegrityCheckFiles() {
if(!$this->checker->isCodeCheckEnforced()) {
Expand Down Expand Up @@ -339,8 +338,9 @@ public function check() {
protected function isEndOfLive() {
$eol = false;

//PHP 5.4 is EOL on 14 Sep 2015
if (version_compare(PHP_VERSION, '5.5.0') === -1) {
// PHP 5.4 is EOL on 14 Sep 2015
// PHP 5.5 is EOL on 21 Jul 2016
if (version_compare(PHP_VERSION, '5.6.0') === -1) {
$eol = true;
return $eol;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/Settings/Controller/CheckSetupControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

namespace Tests\Settings\Controller;

use GuzzleHttp\Exception\ClientException;
use OC\Settings\Controller\CheckSetupController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
Expand Down Expand Up @@ -452,6 +453,7 @@ public function testIsBuggyNss400() {
->will($this->returnValue(['ssl_version' => 'NSS/1.0.2b']));
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
->disableOriginalConstructor()->getMock();
/** @var ClientException | \PHPUnit_Framework_MockObject_MockObject $exception */
$exception = $this->getMockBuilder('\GuzzleHttp\Exception\ClientException')
->disableOriginalConstructor()->getMock();
$response = $this->getMockBuilder('\GuzzleHttp\Message\ResponseInterface')
Expand Down Expand Up @@ -486,6 +488,7 @@ public function testIsBuggyNss200() {
->will($this->returnValue(['ssl_version' => 'NSS/1.0.2b']));
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
->disableOriginalConstructor()->getMock();
/** @var ClientException | \PHPUnit_Framework_MockObject_MockObject $exception */
$exception = $this->getMockBuilder('\GuzzleHttp\Exception\ClientException')
->disableOriginalConstructor()->getMock();
$response = $this->getMockBuilder('\GuzzleHttp\Message\ResponseInterface')
Expand Down