Skip to content

Remove obsolete GD function overwrites #35560

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
szaimen merged 6 commits into from
Dec 4, 2022
Merged

Remove obsolete GD function overwrites #35560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40166dd
Remove obsolete GD function overwrites
J0WI Jul 31, 2021
53994f6
Fix redundant condition
J0WI Sep 2, 2022
1dd3afe
Add type hints
J0WI Jul 31, 2021
110ea0d
Allow empty mimeType
J0WI Sep 2, 2022
f71b95e
Cleanup test exclusions
J0WI Sep 2, 2022
a4d0700
Fix test image default quality
J0WI Dec 3, 2022
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
17 changes: 0 additions & 17 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3679,23 +3679,6 @@
<code>count($obd_values) &gt; 0</code>
</RedundantCondition>
</file>
<file src="lib/private/legacy/OC_Image.php">
<ImplementedReturnTypeMismatch occurrences="1">
<code>null|string</code>
</ImplementedReturnTypeMismatch>
<InvalidArrayOffset occurrences="2">
<code>$data[floor($p)]</code>
<code>$data[floor($p)]</code>
</InvalidArrayOffset>
<InvalidScalarArgument occurrences="3">
<code>$this-&gt;bitDepth</code>
<code>$x</code>
<code>$y</code>
</InvalidScalarArgument>
<RedundantCondition occurrences="1">
<code>$isWritable</code>
</RedundantCondition>
</file>
<file src="lib/private/legacy/OC_User.php">
<UndefinedClass occurrences="1">
<code>\Test\Util\User\Dummy</code>
Expand Down
34 changes: 17 additions & 17 deletions lib/private/StreamImage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class StreamImage implements IStreamImage {
/** @var resource The internal stream */
private $stream;

/** @var string */
/** @var null|string */
private $mimeType;

/** @var int */
Expand All @@ -55,82 +55,82 @@ public function __construct($stream, string $mimeType, int $width, int $height)
}

/** @inheritDoc */
public function valid() {
public function valid(): bool {
return is_resource($this->stream);
}

/** @inheritDoc */
public function mimeType() {
public function mimeType(): ?string {
return $this->mimeType;
}

/** @inheritDoc */
public function width() {
public function width(): int {
return $this->width;
}

/** @inheritDoc */
public function height() {
public function height(): int {
return $this->height;
}

public function widthTopLeft() {
public function widthTopLeft(): int {
throw new \BadMethodCallException('Not implemented');
}

public function heightTopLeft() {
public function heightTopLeft(): int {
throw new \BadMethodCallException('Not implemented');
}

public function show($mimeType = null) {
public function show(?string $mimeType = null): bool {
throw new \BadMethodCallException('Not implemented');
}

public function save($filePath = null, $mimeType = null) {
public function save(?string $filePath = null, ?string $mimeType = null): bool {
throw new \BadMethodCallException('Not implemented');
}

public function resource() {
return $this->stream;
}

public function dataMimeType() {
public function dataMimeType(): ?string {
return $this->mimeType;
}

public function data() {
public function data(): ?string {
return '';
}

public function getOrientation() {
public function getOrientation(): int {
throw new \BadMethodCallException('Not implemented');
}

public function fixOrientation() {
public function fixOrientation(): bool {
throw new \BadMethodCallException('Not implemented');
}

public function resize($maxSize) {
public function resize(int $maxSize): bool {
throw new \BadMethodCallException('Not implemented');
}

public function preciseResize(int $width, int $height): bool {
throw new \BadMethodCallException('Not implemented');
}

public function centerCrop($size = 0) {
public function centerCrop(int $size = 0): bool {
throw new \BadMethodCallException('Not implemented');
}

public function crop(int $x, int $y, int $w, int $h): bool {
throw new \BadMethodCallException('Not implemented');
}

public function fitIn($maxWidth, $maxHeight) {
public function fitIn(int $maxWidth, int $maxHeight): bool {
throw new \BadMethodCallException('Not implemented');
}

public function scaleDownToFit($maxWidth, $maxHeight) {
public function scaleDownToFit(int $maxWidth, int $maxHeight): bool {
throw new \BadMethodCallException('Not implemented');
}

Expand Down
Loading