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

[Actions] update versions #3765

Merged
merged 5 commits into from
Nov 3, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ body:
description: |
Which Nextcloud Server version are you running.
options:
- "Nextcloud 25"
- "Nextcloud 26"
- "Nextcloud 27"
- "Nextcloud 28"
- "Nextcloud 29"
- "Nextcloud 30"
- "Nextcloud 31"
- "Other/Don't know"
validations:
required: true
Expand Down Expand Up @@ -186,7 +186,7 @@ body:
attributes:
label: Other PHP version
description: Add your _other_ PHP versoin
placeholder: i.e. PHP 7.4
placeholder: i.e. PHP 8.3

- type: dropdown
id: server-database
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-composer/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
name: Setup composer and PHP
inputs:
php-version:
description: 'PHP version (default: 8.0)'
description: 'PHP version (default: 8.2)'
required: false
default: '8.0'
default: '8.2'
php-tools:
description: 'Additional php tools'
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-server/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ inputs:
description: 'App to checkout (default: polls)'
php-version:
required: false
default: '8.0'
description: 'PHP version (default: 8.0)'
default: '8.2'
description: 'PHP version (default: 8.2)'
php-tools:
description: 'Additional php tools'
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
php-versions: ['8.1']
server-versions: ['stable27']
server-versions: ['stable28']

name: SQLite

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ocp-version: ['stable27', 'master']
ocp-version: ['stable28', 'master']
php-versions: ['8.1', '8.2', '8.3']

name: Psalm
Expand All @@ -30,10 +30,10 @@ jobs:
php-tools: composer

- name: Install Nextcloud API
run: composer require --dev nextcloud/ocp:dev-${{ matrix.ocp-version }}
run: composer require --dev -W nextcloud/ocp:dev-${{ matrix.ocp-version }}

- name: Install symfony/console
run: composer require symfony/console
run: composer require -W symfony/console

- name: Run coding standards check
run: composer run psalm
6 changes: 3 additions & 3 deletions lib/Db/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ class Comment extends EntityWithUser implements JsonSerializable {
protected int $parent = 0;

public function __construct() {
$this->addType('pollId', 'int');
$this->addType('timestamp', 'int');
$this->addType('deleted', 'int');
$this->addType('pollId', 'integer');
$this->addType('timestamp', 'integer');
$this->addType('deleted', 'integer');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/Db/EntityWithUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ abstract class EntityWithUser extends Entity {

public function __construct() {
// joined Attributes
$this->addType('anonymized', 'int');
$this->addType('poll_expire', 'int');
$this->addType('anonymized', 'integer');
$this->addType('poll_expire', 'integer');
}
/**
* Anonymized the user completely (ANON_FULL) or just strips out personal information
Expand Down
6 changes: 3 additions & 3 deletions lib/Db/Log.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class Log extends Entity implements JsonSerializable {
protected int $processed = 0;

public function __construct() {
$this->addType('pollId', 'int');
$this->addType('created', 'int');
$this->addType('processed', 'int');
$this->addType('pollId', 'integer');
$this->addType('created', 'integer');
$this->addType('processed', 'integer');
}

/**
Expand Down
30 changes: 15 additions & 15 deletions lib/Db/Option.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,23 @@ class Option extends EntityWithUser implements JsonSerializable {
protected int $showResults = 0;

public function __construct() {
$this->addType('released', 'int');
$this->addType('pollId', 'int');
$this->addType('timestamp', 'int');
$this->addType('order', 'int');
$this->addType('confirmed', 'int');
$this->addType('duration', 'int');
$this->addType('deleted', 'int');
$this->addType('released', 'integer');
$this->addType('pollId', 'integer');
$this->addType('timestamp', 'integer');
$this->addType('order', 'integer');
$this->addType('confirmed', 'integer');
$this->addType('duration', 'integer');
$this->addType('deleted', 'integer');

// joined Attributes
$this->addType('optionLimit', 'int');
$this->addType('voteLimit', 'int');
$this->addType('userCountYesVotes', 'int');
$this->addType('countOptionVotes', 'int');
$this->addType('votesYes', 'int');
$this->addType('votesNo', 'int');
$this->addType('votesMaybe', 'int');
$this->addType('showResults', 'int');
$this->addType('optionLimit', 'integer');
$this->addType('voteLimit', 'integer');
$this->addType('userCountYesVotes', 'integer');
$this->addType('countOptionVotes', 'integer');
$this->addType('votesYes', 'integer');
$this->addType('votesNo', 'integer');
$this->addType('votesMaybe', 'integer');
$this->addType('showResults', 'integer');
}

/**
Expand Down
40 changes: 20 additions & 20 deletions lib/Db/Poll.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,30 +162,30 @@ class Poll extends EntityWithUser implements JsonSerializable {
protected int $currentUserCountVotesYes = 0;

public function __construct() {
$this->addType('created', 'int');
$this->addType('expire', 'int');
$this->addType('deleted', 'int');
$this->addType('anonymous', 'int');
$this->addType('allowComment', 'int');
$this->addType('allowMaybe', 'int');
$this->addType('proposalsExpire', 'int');
$this->addType('voteLimit', 'int');
$this->addType('optionLimit', 'int');
$this->addType('adminAccess', 'int');
$this->addType('hideBookedUp', 'int');
$this->addType('useNo', 'int');
$this->addType('lastInteraction', 'int');
$this->addType('created', 'integer');
$this->addType('expire', 'integer');
$this->addType('deleted', 'integer');
$this->addType('anonymous', 'integer');
$this->addType('allowComment', 'integer');
$this->addType('allowMaybe', 'integer');
$this->addType('proposalsExpire', 'integer');
$this->addType('voteLimit', 'integer');
$this->addType('optionLimit', 'integer');
$this->addType('adminAccess', 'integer');
$this->addType('hideBookedUp', 'integer');
$this->addType('useNo', 'integer');
$this->addType('lastInteraction', 'integer');

// joined columns
$this->addType('isCurrentUserLocked', 'int');
$this->addType('maxDate', 'int');
$this->addType('minDate', 'int');
$this->addType('countOptions', 'int');
$this->addType('isCurrentUserLocked', 'integer');
$this->addType('maxDate', 'integer');
$this->addType('minDate', 'integer');
$this->addType('countOptions', 'integer');

// subqueried columns
$this->addType('currentUserCountVotes', 'int');
$this->addType('currentUserCountVotesYes', 'int');
$this->addType('currentUserCountOrphanedVotes', 'int');
$this->addType('currentUserCountVotes', 'integer');
$this->addType('currentUserCountVotesYes', 'integer');
$this->addType('currentUserCountOrphanedVotes', 'integer');

$this->urlGenerator = Container::queryClass(IURLGenerator::class);
$this->userSession = Container::queryClass(UserSession::class);
Expand Down
2 changes: 1 addition & 1 deletion lib/Db/Preferences.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Preferences extends Entity implements JsonSerializable {
protected ?string $preferences = '';

public function __construct() {
$this->addType('timestamp', 'int');
$this->addType('timestamp', 'integer');

// initialize with default values
$this->setPreferences(json_encode(self::DEFAULT));
Expand Down
10 changes: 5 additions & 5 deletions lib/Db/Share.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ class Share extends EntityWithUser implements JsonSerializable {
protected int $voted = 0;

public function __construct() {
$this->addType('pollId', 'int');
$this->addType('invitationSent', 'int');
$this->addType('locked', 'int');
$this->addType('reminderSent', 'int');
$this->addType('deleted', 'int');
$this->addType('pollId', 'integer');
$this->addType('invitationSent', 'integer');
$this->addType('locked', 'integer');
$this->addType('reminderSent', 'integer');
$this->addType('deleted', 'integer');
$this->urlGenerator = Server::get(IURLGenerator::class);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Db/Subscription.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Subscription extends Entity implements JsonSerializable {


public function __construct() {
$this->addType('pollId', 'int');
$this->addType('pollId', 'integer');
}

/**
Expand Down
8 changes: 4 additions & 4 deletions lib/Db/Vote.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ class Vote extends EntityWithUser implements JsonSerializable {
protected ?int $optionId = null;

public function __construct() {
$this->addType('id', 'int');
$this->addType('pollId', 'int');
$this->addType('voteOptionId', 'int');
$this->addType('deleted', 'int');
$this->addType('id', 'integer');
$this->addType('pollId', 'integer');
$this->addType('voteOptionId', 'integer');
$this->addType('deleted', 'integer');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/Db/Watch.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class Watch extends Entity implements JsonSerializable {
protected string $sessionId = '';

public function __construct() {
$this->addType('pollId', 'int');
$this->addType('updated', 'int');
$this->addType('pollId', 'integer');
$this->addType('updated', 'integer');
}

/**
Expand Down