Skip to content
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.

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

Add php7.4 support #18064

Merged
merged 26 commits into from
Nov 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
75 changes: 44 additions & 31 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ steps:
commands:
- git submodule update --init
- name: checkers
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- ./autotest-checkers.sh
secrets: [ github_token ]
Expand Down Expand Up @@ -94,22 +94,27 @@ steps:
commands:
- git submodule update --init
- name: syntax-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
- name: syntax-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
- name: phan
image: nextcloudci/php7.2:php7.2-12
- name: syntax-php7.4
image: nextcloudci/php7.4:2
commands:
- composer install
- composer require --dev "phan/phan:0.11.1"
- ./lib/composer/phan/phan/phan -k build/.phan/config.php
- php ./build/.phan/plugin-checker.php
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
#- name: phan
# image: nextcloudci/php7.2:php7.2-13
# commands:
# - composer install
# - composer require --dev "phan/phan:0.11.1"
# - ./lib/composer/phan/phan/phan -k build/.phan/config.php
# - php ./build/.phan/plugin-checker.php

trigger:
branch:
Expand Down Expand Up @@ -323,11 +328,15 @@ steps:
commands:
- git submodule update --init
- name: nodb-php7.2
image: nextcloudci/php7.2:php7.2-11
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
- name: nodb-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
- name: nodb-php7.4
image: nextcloudci/php7.4:2
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite

Expand All @@ -353,11 +362,15 @@ steps:
commands:
- git submodule update --init
- name: sqlite-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
- name: sqlite-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
- name: sqlite-php7.4
image: nextcloudci/php7.4:2
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite

Expand All @@ -383,7 +396,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.1-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand Down Expand Up @@ -418,7 +431,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.2-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand Down Expand Up @@ -452,7 +465,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.3-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand Down Expand Up @@ -486,7 +499,7 @@ steps:
commands:
- git submodule update --init
- name: mariadb10.4-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand Down Expand Up @@ -521,7 +534,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -557,7 +570,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -589,7 +602,7 @@ steps:
commands:
- git submodule update --init
- name: mysql-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -621,7 +634,7 @@ steps:
commands:
- git submodule update --init
- name: mysql5.6-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -655,7 +668,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=9 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
Expand Down Expand Up @@ -690,7 +703,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
Expand Down Expand Up @@ -724,7 +737,7 @@ steps:
commands:
- git submodule update --init
- name: postgres-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=11 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
Expand Down Expand Up @@ -759,7 +772,7 @@ steps:
commands:
- git submodule update --init
- name: mysqlmb4-php7.2
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4

Expand Down Expand Up @@ -794,7 +807,7 @@ steps:
commands:
- git submodule update --init
- name: mysqlmb4-php7.3
image: nextcloudci/php7.3:php7.3-1
image: nextcloudci/php7.3:php7.3-4
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4

Expand Down Expand Up @@ -2041,7 +2054,7 @@ steps:
commands:
- git submodule update --init
- name: nodb-codecov
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- TEST_SELECTION=NODB ./autotest.sh sqlite
Expand Down Expand Up @@ -2070,7 +2083,7 @@ steps:
commands:
- git submodule update --init
- name: db-codecov
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- TEST_SELECTION=QUICKDB ./autotest.sh sqlite
Expand Down Expand Up @@ -2099,7 +2112,7 @@ steps:
commands:
- git submodule update --init
- name: object-store
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- ./tests/drone-wait-objectstore.sh
Expand Down Expand Up @@ -2130,7 +2143,7 @@ steps:
commands:
- git submodule update --init
- name: object-store
image: nextcloudci/php7.2:php7.2-12
image: nextcloudci/php7.2:php7.2-13
commands:
- phpenmod xdebug
- ./tests/drone-wait-objectstore.sh
Expand Down Expand Up @@ -2235,7 +2248,7 @@ steps:
commands:
- git submodule update --init
- name: memcache-memcached
image: nextcloudci/php7.3-memcached:php7.3-memcached-2
image: nextcloudci/php7.3-memcached:php7.3-memcached-3
commands:
- phpenmod xdebug
- service memcached restart
Expand All @@ -2262,7 +2275,7 @@ trigger:
# commands:
# - git submodule update --init
#- name: memcache-redis-cluster
# image: nextcloudci/php7.2:php7.2-12
# image: nextcloudci/php7.2:php7.2-13
# commands:
# - phpenmod xdebug
# - sleep 20
Expand Down
2 changes: 1 addition & 1 deletion apps/admin_audit/tests/Actions/SecurityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SecurityTest extends TestCase {
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
private $user;

public function setUp() {
protected function setUp(): void {
parent::setUp();

$this->logger = $this->createMock(ILogger::class);
Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/Unit/Activity/ListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ListenerTest extends TestCase {
/** @var IShareHelper|\PHPUnit_Framework_MockObject_MockObject */
protected $shareHelper;

protected function setUp() {
protected function setUp(): void {
parent::setUp();

$this->activityManager = $this->createMock(IManager::class);
Expand Down
4 changes: 2 additions & 2 deletions apps/comments/tests/Unit/AppInfo/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
* @package OCA\Comments\Tests\Unit\AppInfo
*/
class ApplicationTest extends TestCase {
protected function setUp() {
protected function setUp(): void {
parent::setUp();
\OC::$server->getUserManager()->createUser('dummy', '456');
\OC::$server->getUserSession()->setUser(\OC::$server->getUserManager()->get('dummy'));
}

protected function tearDown() {
protected function tearDown(): void {
\OC::$server->getUserManager()->get('dummy')->delete();
parent::tearDown();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CommentersSorterTest extends TestCase {
/** @var CommentersSorter */
protected $sorter;

public function setUp() {
protected function setUp(): void {
parent::setUp();

$this->commentsManager = $this->createMock(ICommentsManager::class);
Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/Unit/Controller/NotificationsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class NotificationsTest extends TestCase {
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
protected $urlGenerator;

protected function setUp() {
protected function setUp(): void {
parent::setUp();

$this->commentsManager = $this->createMock(ICommentsManager::class);
Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/Unit/EventHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class EventHandlerTest extends TestCase {
/** @var NotificationListener|\PHPUnit_Framework_MockObject_MockObject */
protected $notificationListener;

protected function setUp() {
protected function setUp(): void {
parent::setUp();

$this->activityListener = $this->getMockBuilder(ActivityListener::class)
Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/Unit/JSSettingsHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class JSSettingsHelperTest extends TestCase {
/** @var JSSettingsHelper */
protected $helper;

public function setUp() {
protected function setUp(): void {
parent::setUp();

$this->c = $this->createMock(IServerContainer::class);
Expand Down
2 changes: 1 addition & 1 deletion apps/comments/tests/Unit/Notification/ListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ListenerTest extends TestCase {
/** @var Listener */
protected $listener;

protected function setUp() {
protected function setUp(): void {
parent::setUp();

$this->notificationManager = $this->createMock(\OCP\Notification\IManager::class);
Expand Down
Loading