Skip to content

Type the QB mappers with the entity template #3783

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
ChristophWurst merged 1 commit into from
Oct 30, 2020
Merged

Type the QB mappers with the entity template #3783

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
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ocp-version: [ 'dev-master', 'v20.0.0' ]
ocp-version: [ 'dev-master', 'v20.0.1' ]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"require-dev": {
"roave/security-advisories": "dev-master",
"christophwurst/nextcloud": "v20.0.0",
"christophwurst/nextcloud": "v20.0.1",
"christophwurst/nextcloud_testing": "0.11.0",
"nextcloud/coding-standard": "^0.3.0",
"phan/phan": "^3.0",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions lib/Db/AliasMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
use OCP\IDBConnection;
use function array_map;

/**
* @template-extends QBMapper<Alias>
*/
class AliasMapper extends QBMapper {

/**
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/ClassifierMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;

/**
* @template-extends QBMapper<Classifier>
*/
class ClassifierMapper extends QBMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'mail_classifiers');
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/CollectedAddressMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
use OCP\IDBConnection;
use function array_map;

/**
* @template-extends QBMapper<CollectedAddress>
*/
class CollectedAddressMapper extends QBMapper {

/**
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/LocalAttachmentMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;

/**
* @template-extends QBMapper<LocalAttachment>
*/
class LocalAttachmentMapper extends QBMapper {

/**
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/MailAccountMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
use OCP\IDBConnection;
use OCP\IUser;

/**
* @template-extends QBMapper<MailAccount>
*/
class MailAccountMapper extends QBMapper {

/**
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/MailboxMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/**
* @template-extends QBMapper<Mailbox>
*/
namespace OCA\Mail\Db;

use OCA\Mail\Account;
Expand Down
3 changes: 3 additions & 0 deletions lib/Db/MessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
use function ltrim;
use function mb_substr;

/**
* @template-extends QBMapper<Message>
*/
class MessageMapper extends QBMapper {

/** @var ITimeFactory */
Expand Down