Skip to content

Commit

Permalink
Merge pull request #22883 from nextcloud/techdebt/noid/remove-phan
Browse files Browse the repository at this point in the history
Remove phan config - was replaced by Psalm
  • Loading branch information
MorrisJobke authored Sep 16, 2020
2 parents f7c59ff + 99c9423 commit a72edb0
Show file tree
Hide file tree
Showing 34 changed files with 1 addition and 2,750 deletions.
25 changes: 0 additions & 25 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,6 @@ trigger:
- pull_request
- push

#---
#kind: pipeline
#name: syntax-and-phan
#
#steps:
#- name: submodules
# image: docker:git
# commands:
# - git submodule update --init
#- 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:
# - master
# - stable*
# event:
# - pull_request
# - push

---
kind: pipeline
name: litmus
Expand Down
7 changes: 0 additions & 7 deletions apps/dav/lib/CalDAV/CalDavBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,6 @@ public function getSubscriptionById($subscriptionId) {
* @param string $calendarUri
* @param array $properties
* @return int
* @suppress SqlInjectionChecker
*/
public function createCalendar($principalUri, $calendarUri, array $properties) {
$values = [
Expand Down Expand Up @@ -818,9 +817,6 @@ public function updateCalendar($calendarId, PropPatch $propPatch) {
$supportedProperties = array_keys($this->propertyMap);
$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';

/**
* @suppress SqlInjectionChecker
*/
$propPatch->handle($supportedProperties, function ($mutations) use ($calendarId) {
$newValues = [];
foreach ($mutations as $propertyName => $propertyValue) {
Expand Down Expand Up @@ -2148,9 +2144,6 @@ public function updateSubscription($subscriptionId, PropPatch $propPatch) {
$supportedProperties = array_keys($this->subscriptionPropertyMap);
$supportedProperties[] = '{http://calendarserver.org/ns/}source';

/**
* @suppress SqlInjectionChecker
*/
$propPatch->handle($supportedProperties, function ($mutations) use ($subscriptionId) {
$newValues = [];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,7 @@ private function generateDateString(IL10N $l10n, VEvent $vevent):string {

$diff = $dtstartDt->diff($dtendDt);

/** @phan-suppress-next-line PhanUndeclaredClassMethod */
$dtstartDt = new \DateTime($dtstartDt->format(\DateTime::ATOM));
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
$dtendDt = new \DateTime($dtendDt->format(\DateTime::ATOM));

if ($isAllDay) {
Expand All @@ -400,9 +398,7 @@ private function generateDateString(IL10N $l10n, VEvent $vevent):string {

$startTimezone = $endTimezone = null;
if (!$vevent->DTSTART->isFloating()) {
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
$startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
$endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,11 @@ protected function extractEventDetails(VEvent $vevent):array {
? ((string) $vevent->LOCATION)
: null,
'all_day' => $start instanceof Property\ICalendar\Date,
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
'start_atom' => $start->getDateTime()->format(\DateTime::ATOM),
'start_is_floating' => $start->isFloating(),
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
'start_timezone' => $start->getDateTime()->getTimezone()->getName(),
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
'end_atom' => $end->getDateTime()->format(\DateTime::ATOM),
'end_is_floating' => $end->isFloating(),
/** @phan-suppress-next-line PhanUndeclaredClassMethod */
'end_timezone' => $end->getDateTime()->getTimezone()->getName(),
];
}
Expand Down
3 changes: 0 additions & 3 deletions apps/dav/lib/CardDAV/CardDavBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,6 @@ public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatc
'{' . Plugin::NS_CARDDAV . '}addressbook-description',
];

/**
* @suppress SqlInjectionChecker
*/
$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
$updates = [];
foreach ($mutations as $property => $newValue) {
Expand Down
4 changes: 0 additions & 4 deletions apps/files_external/lib/Service/DBConfigService.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ protected function modifyMountsOnDelete(string $applicableId, int $applicableTyp
* Get admin defined mounts
*
* @return array
* @suppress SqlInjectionChecker
*/
public function getAdminMounts() {
$builder = $this->connection->getQueryBuilder();
Expand Down Expand Up @@ -198,7 +197,6 @@ public function getMountsFor($type, $value) {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string|null $value user_id, group_id or null for global mounts
* @return array
* @suppress SqlInjectionChecker
*/
public function getAdminMountsFor($type, $value) {
$builder = $this->connection->getQueryBuilder();
Expand All @@ -214,7 +212,6 @@ public function getAdminMountsFor($type, $value) {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string[] $values user_ids or group_ids
* @return array
* @suppress SqlInjectionChecker
*/
public function getAdminMountsForMultiple($type, array $values) {
$builder = $this->connection->getQueryBuilder();
Expand All @@ -238,7 +235,6 @@ public function getAdminMountsForMultiple($type, array $values) {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string|null $value user_id, group_id or null for global mounts
* @return array
* @suppress SqlInjectionChecker
*/
public function getUserMountsFor($type, $value) {
$builder = $this->connection->getQueryBuilder();
Expand Down
226 changes: 0 additions & 226 deletions build/.phan/config.php

This file was deleted.

Loading

0 comments on commit a72edb0

Please sign in to comment.