nextcloud / server

lib/private/PreviewManager.php

Spacing +3 added lines, -3 removed lines

@@ -326,7 +326,7 @@ 
 	 */
 	protected function registerCoreProvider($class, $mimeType, $options = []) {
 		if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-			$this->registerProvider($mimeType, function () use ($class, $options) {
+			$this->registerProvider($mimeType, function() use ($class, $options) {
 				return new $class($options);
 			});
 		}
@@ -425,14 +425,14 @@ 
 
 		$providers = $context->getPreviewProviders();
 		foreach ($providers as $provider) {
-			$key = $provider->getMimeTypeRegex() . '-' . $provider->getService();
+			$key = $provider->getMimeTypeRegex().'-'.$provider->getService();
 			if (array_key_exists($key, $this->loadedBootstrapProviders)) {
 				// Do not load the provider more than once
 				continue;
 			}
 			$this->loadedBootstrapProviders[$key] = null;
 
-			$this->registerProvider($provider->getMimeTypeRegex(), function () use ($provider) {
+			$this->registerProvider($provider->getMimeTypeRegex(), function() use ($provider) {
 				try {
 					return $this->container->get($provider->getService());
 				} catch (QueryException $e) {

Indentation +431 added lines, -431 removed lines

@@ -28,435 +28,435 @@
 use function array_key_exists;
 
 class PreviewManager implements IPreview {
-	protected IConfig $config;
-	protected IRootFolder $rootFolder;
-	protected IAppData $appData;
-	protected IEventDispatcher $eventDispatcher;
-	private ?Generator $generator = null;
-	private GeneratorHelper $helper;
-	protected bool $providerListDirty = false;
-	protected bool $registeredCoreProviders = false;
-	protected array $providers = [];
-
-	/** @var array mime type => support status */
-	protected array $mimeTypeSupportMap = [];
-	protected ?array $defaultProviders = null;
-	protected ?string $userId;
-	private Coordinator $bootstrapCoordinator;
-
-	/**
-	 * Hash map (without value) of loaded bootstrap providers
-	 * @psalm-var array<string, null>
-	 */
-	private array $loadedBootstrapProviders = [];
-	private ContainerInterface $container;
-	private IBinaryFinder $binaryFinder;
-	private IMagickSupport $imagickSupport;
-	private bool $enablePreviews;
-
-	public function __construct(
-		IConfig $config,
-		IRootFolder $rootFolder,
-		IAppData $appData,
-		IEventDispatcher $eventDispatcher,
-		GeneratorHelper $helper,
-		?string $userId,
-		Coordinator $bootstrapCoordinator,
-		ContainerInterface $container,
-		IBinaryFinder $binaryFinder,
-		IMagickSupport $imagickSupport,
-	) {
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-		$this->appData = $appData;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->helper = $helper;
-		$this->userId = $userId;
-		$this->bootstrapCoordinator = $bootstrapCoordinator;
-		$this->container = $container;
-		$this->binaryFinder = $binaryFinder;
-		$this->imagickSupport = $imagickSupport;
-		$this->enablePreviews = $config->getSystemValueBool('enable_previews', true);
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be
-	 * called in case preview providers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Preview\IProvider or \OCP\Preview\IProviderV2
-	 *
-	 * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
-	 * @param \Closure $callable
-	 * @return void
-	 */
-	public function registerProvider($mimeTypeRegex, \Closure $callable): void {
-		if (!$this->enablePreviews) {
-			return;
-		}
-
-		if (!isset($this->providers[$mimeTypeRegex])) {
-			$this->providers[$mimeTypeRegex] = [];
-		}
-		$this->providers[$mimeTypeRegex][] = $callable;
-		$this->providerListDirty = true;
-	}
-
-	/**
-	 * Get all providers
-	 */
-	public function getProviders(): array {
-		if (!$this->enablePreviews) {
-			return [];
-		}
-
-		$this->registerCoreProviders();
-		$this->registerBootstrapProviders();
-		if ($this->providerListDirty) {
-			$keys = array_map('strlen', array_keys($this->providers));
-			array_multisort($keys, SORT_DESC, $this->providers);
-			$this->providerListDirty = false;
-		}
-
-		return $this->providers;
-	}
-
-	/**
-	 * Does the manager have any providers
-	 */
-	public function hasProviders(): bool {
-		$this->registerCoreProviders();
-		return !empty($this->providers);
-	}
-
-	private function getGenerator(): Generator {
-		if ($this->generator === null) {
-			$this->generator = new Generator(
-				$this->config,
-				$this,
-				$this->appData,
-				new GeneratorHelper(
-					$this->rootFolder,
-					$this->config
-				),
-				$this->eventDispatcher,
-				$this->container->get(LoggerInterface::class),
-			);
-		}
-		return $this->generator;
-	}
-
-	public function getPreview(
-		File $file,
-		$width = -1,
-		$height = -1,
-		$crop = false,
-		$mode = IPreview::MODE_FILL,
-		$mimeType = null,
-		bool $cacheResult = true,
-	): ISimpleFile {
-		$this->throwIfPreviewsDisabled($file, $mimeType);
-		$previewConcurrency = $this->getGenerator()->getNumConcurrentPreviews('preview_concurrency_all');
-		$sem = Generator::guardWithSemaphore(Generator::SEMAPHORE_ID_ALL, $previewConcurrency);
-		try {
-			$preview = $this->getGenerator()->getPreview($file, $width, $height, $crop, $mode, $mimeType, $cacheResult);
-		} finally {
-			Generator::unguardWithSemaphore($sem);
-		}
-
-		return $preview;
-	}
-
-	/**
-	 * Generates previews of a file
-	 *
-	 * @param File $file
-	 * @param array $specifications
-	 * @param string $mimeType
-	 * @return ISimpleFile the last preview that was generated
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 * @since 19.0.0
-	 */
-	public function generatePreviews(File $file, array $specifications, $mimeType = null) {
-		$this->throwIfPreviewsDisabled($file, $mimeType);
-		return $this->getGenerator()->generatePreviews($file, $specifications, $mimeType);
-	}
-
-	/**
-	 * returns true if the passed mime type is supported
-	 *
-	 * @param string $mimeType
-	 * @return boolean
-	 */
-	public function isMimeSupported($mimeType = '*') {
-		if (!$this->enablePreviews) {
-			return false;
-		}
-
-		if (isset($this->mimeTypeSupportMap[$mimeType])) {
-			return $this->mimeTypeSupportMap[$mimeType];
-		}
-
-		$this->registerCoreProviders();
-		$this->registerBootstrapProviders();
-		$providerMimeTypes = array_keys($this->providers);
-		foreach ($providerMimeTypes as $supportedMimeType) {
-			if (preg_match($supportedMimeType, $mimeType)) {
-				$this->mimeTypeSupportMap[$mimeType] = true;
-				return true;
-			}
-		}
-		$this->mimeTypeSupportMap[$mimeType] = false;
-		return false;
-	}
-
-	/**
-	 * Check if a preview can be generated for a file
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file, ?string $mimeType = null): bool {
-		if (!$this->enablePreviews) {
-			return false;
-		}
-
-		$fileMimeType = $mimeType ?? $file->getMimeType();
-
-		$this->registerCoreProviders();
-		if (!$this->isMimeSupported($fileMimeType)) {
-			return false;
-		}
-
-		$mount = $file->getMountPoint();
-		if ($mount and !$mount->getOption('previews', true)) {
-			return false;
-		}
-
-		foreach ($this->providers as $supportedMimeType => $providers) {
-			if (preg_match($supportedMimeType, $fileMimeType)) {
-				foreach ($providers as $providerClosure) {
-					$provider = $this->helper->getProvider($providerClosure);
-					if (!($provider instanceof IProviderV2)) {
-						continue;
-					}
-
-					if ($provider->isAvailable($file)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * List of enabled default providers
-	 *
-	 * The following providers are enabled by default:
-	 *  - OC\Preview\PNG
-	 *  - OC\Preview\JPEG
-	 *  - OC\Preview\GIF
-	 *  - OC\Preview\BMP
-	 *  - OC\Preview\XBitmap
-	 *  - OC\Preview\MarkDown
-	 *  - OC\Preview\MP3
-	 *  - OC\Preview\TXT
-	 *
-	 * The following providers are disabled by default due to performance or privacy concerns:
-	 *  - OC\Preview\Font
-	 *  - OC\Preview\HEIC
-	 *  - OC\Preview\Illustrator
-	 *  - OC\Preview\Movie
-	 *  - OC\Preview\MSOfficeDoc
-	 *  - OC\Preview\MSOffice2003
-	 *  - OC\Preview\MSOffice2007
-	 *  - OC\Preview\OpenDocument
-	 *  - OC\Preview\PDF
-	 *  - OC\Preview\Photoshop
-	 *  - OC\Preview\Postscript
-	 *  - OC\Preview\StarOffice
-	 *  - OC\Preview\SVG
-	 *  - OC\Preview\TIFF
-	 *
-	 * @return array
-	 */
-	protected function getEnabledDefaultProvider() {
-		if ($this->defaultProviders !== null) {
-			return $this->defaultProviders;
-		}
-
-		$imageProviders = [
-			Preview\PNG::class,
-			Preview\JPEG::class,
-			Preview\GIF::class,
-			Preview\BMP::class,
-			Preview\XBitmap::class,
-			Preview\Krita::class,
-			Preview\WebP::class,
-		];
-
-		$this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
-			Preview\MarkDown::class,
-			Preview\MP3::class,
-			Preview\TXT::class,
-			Preview\OpenDocument::class,
-		], $imageProviders));
-
-		if (in_array(Preview\Image::class, $this->defaultProviders)) {
-			$this->defaultProviders = array_merge($this->defaultProviders, $imageProviders);
-		}
-		$this->defaultProviders = array_unique($this->defaultProviders);
-		return $this->defaultProviders;
-	}
-
-	/**
-	 * Register the default providers (if enabled)
-	 *
-	 * @param string $class
-	 * @param string $mimeType
-	 */
-	protected function registerCoreProvider($class, $mimeType, $options = []) {
-		if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-			$this->registerProvider($mimeType, function () use ($class, $options) {
-				return new $class($options);
-			});
-		}
-	}
-
-	/**
-	 * Register the default providers (if enabled)
-	 */
-	protected function registerCoreProviders() {
-		if ($this->registeredCoreProviders) {
-			return;
-		}
-		$this->registeredCoreProviders = true;
-
-		$this->registerCoreProvider(Preview\TXT::class, '/text\/plain/');
-		$this->registerCoreProvider(Preview\MarkDown::class, '/text\/(x-)?markdown/');
-		$this->registerCoreProvider(Preview\PNG::class, '/image\/png/');
-		$this->registerCoreProvider(Preview\JPEG::class, '/image\/jpeg/');
-		$this->registerCoreProvider(Preview\GIF::class, '/image\/gif/');
-		$this->registerCoreProvider(Preview\BMP::class, '/image\/bmp/');
-		$this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
-		$this->registerCoreProvider(Preview\WebP::class, '/image\/webp/');
-		$this->registerCoreProvider(Preview\Krita::class, '/application\/x-krita/');
-		$this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg$/');
-		$this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');
-		$this->registerCoreProvider(Preview\Imaginary::class, Preview\Imaginary::supportedMimeTypes());
-		$this->registerCoreProvider(Preview\ImaginaryPDF::class, Preview\ImaginaryPDF::supportedMimeTypes());
-
-		// SVG and Bitmap require imagick
-		if ($this->imagickSupport->hasExtension()) {
-			$imagickProviders = [
-				'SVG' => ['mimetype' => '/image\/svg\+xml/', 'class' => Preview\SVG::class],
-				'TIFF' => ['mimetype' => '/image\/tiff/', 'class' => Preview\TIFF::class],
-				'PDF' => ['mimetype' => '/application\/pdf/', 'class' => Preview\PDF::class],
-				'AI' => ['mimetype' => '/application\/illustrator/', 'class' => Preview\Illustrator::class],
-				'PSD' => ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class],
-				'EPS' => ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class],
-				'TTF' => ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class],
-				'HEIC' => ['mimetype' => '/image\/(x-)?hei(f|c)/', 'class' => Preview\HEIC::class],
-				'TGA' => ['mimetype' => '/image\/(x-)?t(ar)?ga/', 'class' => Preview\TGA::class],
-				'SGI' => ['mimetype' => '/image\/(x-)?sgi/', 'class' => Preview\SGI::class],
-			];
-
-			foreach ($imagickProviders as $queryFormat => $provider) {
-				$class = $provider['class'];
-				if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-					continue;
-				}
-
-				if ($this->imagickSupport->supportsFormat($queryFormat)) {
-					$this->registerCoreProvider($class, $provider['mimetype']);
-				}
-			}
-		}
-
-		$this->registerCoreProvidersOffice();
-
-		// Video requires ffmpeg
-		if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
-			$movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null);
-			if (!is_string($movieBinary)) {
-				$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
-			}
-
-
-			if (is_string($movieBinary)) {
-				$this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ['movieBinary' => $movieBinary]);
-			}
-		}
-	}
-
-	private function registerCoreProvidersOffice(): void {
-		$officeProviders = [
-			['mimetype' => '/application\/msword/', 'class' => Preview\MSOfficeDoc::class],
-			['mimetype' => '/application\/vnd.ms-.*/', 'class' => Preview\MSOffice2003::class],
-			['mimetype' => '/application\/vnd.openxmlformats-officedocument.*/', 'class' => Preview\MSOffice2007::class],
-			['mimetype' => '/application\/vnd.oasis.opendocument.*/', 'class' => Preview\OpenDocument::class],
-			['mimetype' => '/application\/vnd.sun.xml.*/', 'class' => Preview\StarOffice::class],
-			['mimetype' => '/image\/emf/', 'class' => Preview\EMF::class],
-		];
-
-		$findBinary = true;
-		$officeBinary = false;
-
-		foreach ($officeProviders as $provider) {
-			$class = $provider['class'];
-			if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-				continue;
-			}
-
-			if ($findBinary) {
-				// Office requires openoffice or libreoffice
-				$officeBinary = $this->config->getSystemValue('preview_libreoffice_path', false);
-				if ($officeBinary === false) {
-					$officeBinary = $this->binaryFinder->findBinaryPath('libreoffice');
-				}
-				if ($officeBinary === false) {
-					$officeBinary = $this->binaryFinder->findBinaryPath('openoffice');
-				}
-				$findBinary = false;
-			}
-
-			if ($officeBinary) {
-				$this->registerCoreProvider($class, $provider['mimetype'], ['officeBinary' => $officeBinary]);
-			}
-		}
-	}
-
-	private function registerBootstrapProviders(): void {
-		$context = $this->bootstrapCoordinator->getRegistrationContext();
-
-		if ($context === null) {
-			// Just ignore for now
-			return;
-		}
-
-		$providers = $context->getPreviewProviders();
-		foreach ($providers as $provider) {
-			$key = $provider->getMimeTypeRegex() . '-' . $provider->getService();
-			if (array_key_exists($key, $this->loadedBootstrapProviders)) {
-				// Do not load the provider more than once
-				continue;
-			}
-			$this->loadedBootstrapProviders[$key] = null;
-
-			$this->registerProvider($provider->getMimeTypeRegex(), function () use ($provider) {
-				try {
-					return $this->container->get($provider->getService());
-				} catch (QueryException $e) {
-					return null;
-				}
-			});
-		}
-	}
-
-	/**
-	 * @throws NotFoundException if preview generation is disabled
-	 */
-	private function throwIfPreviewsDisabled(File $file, ?string $mimeType = null): void {
-		if (!$this->isAvailable($file, $mimeType)) {
-			throw new NotFoundException('Previews disabled');
-		}
-	}
+    protected IConfig $config;
+    protected IRootFolder $rootFolder;
+    protected IAppData $appData;
+    protected IEventDispatcher $eventDispatcher;
+    private ?Generator $generator = null;
+    private GeneratorHelper $helper;
+    protected bool $providerListDirty = false;
+    protected bool $registeredCoreProviders = false;
+    protected array $providers = [];
+
+    /** @var array mime type => support status */
+    protected array $mimeTypeSupportMap = [];
+    protected ?array $defaultProviders = null;
+    protected ?string $userId;
+    private Coordinator $bootstrapCoordinator;
+
+    /**
+     * Hash map (without value) of loaded bootstrap providers
+     * @psalm-var array<string, null>
+     */
+    private array $loadedBootstrapProviders = [];
+    private ContainerInterface $container;
+    private IBinaryFinder $binaryFinder;
+    private IMagickSupport $imagickSupport;
+    private bool $enablePreviews;
+
+    public function __construct(
+        IConfig $config,
+        IRootFolder $rootFolder,
+        IAppData $appData,
+        IEventDispatcher $eventDispatcher,
+        GeneratorHelper $helper,
+        ?string $userId,
+        Coordinator $bootstrapCoordinator,
+        ContainerInterface $container,
+        IBinaryFinder $binaryFinder,
+        IMagickSupport $imagickSupport,
+    ) {
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+        $this->appData = $appData;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->helper = $helper;
+        $this->userId = $userId;
+        $this->bootstrapCoordinator = $bootstrapCoordinator;
+        $this->container = $container;
+        $this->binaryFinder = $binaryFinder;
+        $this->imagickSupport = $imagickSupport;
+        $this->enablePreviews = $config->getSystemValueBool('enable_previews', true);
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be
+     * called in case preview providers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Preview\IProvider or \OCP\Preview\IProviderV2
+     *
+     * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
+     * @param \Closure $callable
+     * @return void
+     */
+    public function registerProvider($mimeTypeRegex, \Closure $callable): void {
+        if (!$this->enablePreviews) {
+            return;
+        }
+
+        if (!isset($this->providers[$mimeTypeRegex])) {
+            $this->providers[$mimeTypeRegex] = [];
+        }
+        $this->providers[$mimeTypeRegex][] = $callable;
+        $this->providerListDirty = true;
+    }
+
+    /**
+     * Get all providers
+     */
+    public function getProviders(): array {
+        if (!$this->enablePreviews) {
+            return [];
+        }
+
+        $this->registerCoreProviders();
+        $this->registerBootstrapProviders();
+        if ($this->providerListDirty) {
+            $keys = array_map('strlen', array_keys($this->providers));
+            array_multisort($keys, SORT_DESC, $this->providers);
+            $this->providerListDirty = false;
+        }
+
+        return $this->providers;
+    }
+
+    /**
+     * Does the manager have any providers
+     */
+    public function hasProviders(): bool {
+        $this->registerCoreProviders();
+        return !empty($this->providers);
+    }
+
+    private function getGenerator(): Generator {
+        if ($this->generator === null) {
+            $this->generator = new Generator(
+                $this->config,
+                $this,
+                $this->appData,
+                new GeneratorHelper(
+                    $this->rootFolder,
+                    $this->config
+                ),
+                $this->eventDispatcher,
+                $this->container->get(LoggerInterface::class),
+            );
+        }
+        return $this->generator;
+    }
+
+    public function getPreview(
+        File $file,
+        $width = -1,
+        $height = -1,
+        $crop = false,
+        $mode = IPreview::MODE_FILL,
+        $mimeType = null,
+        bool $cacheResult = true,
+    ): ISimpleFile {
+        $this->throwIfPreviewsDisabled($file, $mimeType);
+        $previewConcurrency = $this->getGenerator()->getNumConcurrentPreviews('preview_concurrency_all');
+        $sem = Generator::guardWithSemaphore(Generator::SEMAPHORE_ID_ALL, $previewConcurrency);
+        try {
+            $preview = $this->getGenerator()->getPreview($file, $width, $height, $crop, $mode, $mimeType, $cacheResult);
+        } finally {
+            Generator::unguardWithSemaphore($sem);
+        }
+
+        return $preview;
+    }
+
+    /**
+     * Generates previews of a file
+     *
+     * @param File $file
+     * @param array $specifications
+     * @param string $mimeType
+     * @return ISimpleFile the last preview that was generated
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     * @since 19.0.0
+     */
+    public function generatePreviews(File $file, array $specifications, $mimeType = null) {
+        $this->throwIfPreviewsDisabled($file, $mimeType);
+        return $this->getGenerator()->generatePreviews($file, $specifications, $mimeType);
+    }
+
+    /**
+     * returns true if the passed mime type is supported
+     *
+     * @param string $mimeType
+     * @return boolean
+     */
+    public function isMimeSupported($mimeType = '*') {
+        if (!$this->enablePreviews) {
+            return false;
+        }
+
+        if (isset($this->mimeTypeSupportMap[$mimeType])) {
+            return $this->mimeTypeSupportMap[$mimeType];
+        }
+
+        $this->registerCoreProviders();
+        $this->registerBootstrapProviders();
+        $providerMimeTypes = array_keys($this->providers);
+        foreach ($providerMimeTypes as $supportedMimeType) {
+            if (preg_match($supportedMimeType, $mimeType)) {
+                $this->mimeTypeSupportMap[$mimeType] = true;
+                return true;
+            }
+        }
+        $this->mimeTypeSupportMap[$mimeType] = false;
+        return false;
+    }
+
+    /**
+     * Check if a preview can be generated for a file
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file, ?string $mimeType = null): bool {
+        if (!$this->enablePreviews) {
+            return false;
+        }
+
+        $fileMimeType = $mimeType ?? $file->getMimeType();
+
+        $this->registerCoreProviders();
+        if (!$this->isMimeSupported($fileMimeType)) {
+            return false;
+        }
+
+        $mount = $file->getMountPoint();
+        if ($mount and !$mount->getOption('previews', true)) {
+            return false;
+        }
+
+        foreach ($this->providers as $supportedMimeType => $providers) {
+            if (preg_match($supportedMimeType, $fileMimeType)) {
+                foreach ($providers as $providerClosure) {
+                    $provider = $this->helper->getProvider($providerClosure);
+                    if (!($provider instanceof IProviderV2)) {
+                        continue;
+                    }
+
+                    if ($provider->isAvailable($file)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * List of enabled default providers
+     *
+     * The following providers are enabled by default:
+     *  - OC\Preview\PNG
+     *  - OC\Preview\JPEG
+     *  - OC\Preview\GIF
+     *  - OC\Preview\BMP
+     *  - OC\Preview\XBitmap
+     *  - OC\Preview\MarkDown
+     *  - OC\Preview\MP3
+     *  - OC\Preview\TXT
+     *
+     * The following providers are disabled by default due to performance or privacy concerns:
+     *  - OC\Preview\Font
+     *  - OC\Preview\HEIC
+     *  - OC\Preview\Illustrator
+     *  - OC\Preview\Movie
+     *  - OC\Preview\MSOfficeDoc
+     *  - OC\Preview\MSOffice2003
+     *  - OC\Preview\MSOffice2007
+     *  - OC\Preview\OpenDocument
+     *  - OC\Preview\PDF
+     *  - OC\Preview\Photoshop
+     *  - OC\Preview\Postscript
+     *  - OC\Preview\StarOffice
+     *  - OC\Preview\SVG
+     *  - OC\Preview\TIFF
+     *
+     * @return array
+     */
+    protected function getEnabledDefaultProvider() {
+        if ($this->defaultProviders !== null) {
+            return $this->defaultProviders;
+        }
+
+        $imageProviders = [
+            Preview\PNG::class,
+            Preview\JPEG::class,
+            Preview\GIF::class,
+            Preview\BMP::class,
+            Preview\XBitmap::class,
+            Preview\Krita::class,
+            Preview\WebP::class,
+        ];
+
+        $this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
+            Preview\MarkDown::class,
+            Preview\MP3::class,
+            Preview\TXT::class,
+            Preview\OpenDocument::class,
+        ], $imageProviders));
+
+        if (in_array(Preview\Image::class, $this->defaultProviders)) {
+            $this->defaultProviders = array_merge($this->defaultProviders, $imageProviders);
+        }
+        $this->defaultProviders = array_unique($this->defaultProviders);
+        return $this->defaultProviders;
+    }
+
+    /**
+     * Register the default providers (if enabled)
+     *
+     * @param string $class
+     * @param string $mimeType
+     */
+    protected function registerCoreProvider($class, $mimeType, $options = []) {
+        if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
+            $this->registerProvider($mimeType, function () use ($class, $options) {
+                return new $class($options);
+            });
+        }
+    }
+
+    /**
+     * Register the default providers (if enabled)
+     */
+    protected function registerCoreProviders() {
+        if ($this->registeredCoreProviders) {
+            return;
+        }
+        $this->registeredCoreProviders = true;
+
+        $this->registerCoreProvider(Preview\TXT::class, '/text\/plain/');
+        $this->registerCoreProvider(Preview\MarkDown::class, '/text\/(x-)?markdown/');
+        $this->registerCoreProvider(Preview\PNG::class, '/image\/png/');
+        $this->registerCoreProvider(Preview\JPEG::class, '/image\/jpeg/');
+        $this->registerCoreProvider(Preview\GIF::class, '/image\/gif/');
+        $this->registerCoreProvider(Preview\BMP::class, '/image\/bmp/');
+        $this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
+        $this->registerCoreProvider(Preview\WebP::class, '/image\/webp/');
+        $this->registerCoreProvider(Preview\Krita::class, '/application\/x-krita/');
+        $this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg$/');
+        $this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');
+        $this->registerCoreProvider(Preview\Imaginary::class, Preview\Imaginary::supportedMimeTypes());
+        $this->registerCoreProvider(Preview\ImaginaryPDF::class, Preview\ImaginaryPDF::supportedMimeTypes());
+
+        // SVG and Bitmap require imagick
+        if ($this->imagickSupport->hasExtension()) {
+            $imagickProviders = [
+                'SVG' => ['mimetype' => '/image\/svg\+xml/', 'class' => Preview\SVG::class],
+                'TIFF' => ['mimetype' => '/image\/tiff/', 'class' => Preview\TIFF::class],
+                'PDF' => ['mimetype' => '/application\/pdf/', 'class' => Preview\PDF::class],
+                'AI' => ['mimetype' => '/application\/illustrator/', 'class' => Preview\Illustrator::class],
+                'PSD' => ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class],
+                'EPS' => ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class],
+                'TTF' => ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class],
+                'HEIC' => ['mimetype' => '/image\/(x-)?hei(f|c)/', 'class' => Preview\HEIC::class],
+                'TGA' => ['mimetype' => '/image\/(x-)?t(ar)?ga/', 'class' => Preview\TGA::class],
+                'SGI' => ['mimetype' => '/image\/(x-)?sgi/', 'class' => Preview\SGI::class],
+            ];
+
+            foreach ($imagickProviders as $queryFormat => $provider) {
+                $class = $provider['class'];
+                if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
+                    continue;
+                }
+
+                if ($this->imagickSupport->supportsFormat($queryFormat)) {
+                    $this->registerCoreProvider($class, $provider['mimetype']);
+                }
+            }
+        }
+
+        $this->registerCoreProvidersOffice();
+
+        // Video requires ffmpeg
+        if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
+            $movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null);
+            if (!is_string($movieBinary)) {
+                $movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
+            }
+
+
+            if (is_string($movieBinary)) {
+                $this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ['movieBinary' => $movieBinary]);
+            }
+        }
+    }
+
+    private function registerCoreProvidersOffice(): void {
+        $officeProviders = [
+            ['mimetype' => '/application\/msword/', 'class' => Preview\MSOfficeDoc::class],
+            ['mimetype' => '/application\/vnd.ms-.*/', 'class' => Preview\MSOffice2003::class],
+            ['mimetype' => '/application\/vnd.openxmlformats-officedocument.*/', 'class' => Preview\MSOffice2007::class],
+            ['mimetype' => '/application\/vnd.oasis.opendocument.*/', 'class' => Preview\OpenDocument::class],
+            ['mimetype' => '/application\/vnd.sun.xml.*/', 'class' => Preview\StarOffice::class],
+            ['mimetype' => '/image\/emf/', 'class' => Preview\EMF::class],
+        ];
+
+        $findBinary = true;
+        $officeBinary = false;
+
+        foreach ($officeProviders as $provider) {
+            $class = $provider['class'];
+            if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
+                continue;
+            }
+
+            if ($findBinary) {
+                // Office requires openoffice or libreoffice
+                $officeBinary = $this->config->getSystemValue('preview_libreoffice_path', false);
+                if ($officeBinary === false) {
+                    $officeBinary = $this->binaryFinder->findBinaryPath('libreoffice');
+                }
+                if ($officeBinary === false) {
+                    $officeBinary = $this->binaryFinder->findBinaryPath('openoffice');
+                }
+                $findBinary = false;
+            }
+
+            if ($officeBinary) {
+                $this->registerCoreProvider($class, $provider['mimetype'], ['officeBinary' => $officeBinary]);
+            }
+        }
+    }
+
+    private function registerBootstrapProviders(): void {
+        $context = $this->bootstrapCoordinator->getRegistrationContext();
+
+        if ($context === null) {
+            // Just ignore for now
+            return;
+        }
+
+        $providers = $context->getPreviewProviders();
+        foreach ($providers as $provider) {
+            $key = $provider->getMimeTypeRegex() . '-' . $provider->getService();
+            if (array_key_exists($key, $this->loadedBootstrapProviders)) {
+                // Do not load the provider more than once
+                continue;
+            }
+            $this->loadedBootstrapProviders[$key] = null;
+
+            $this->registerProvider($provider->getMimeTypeRegex(), function () use ($provider) {
+                try {
+                    return $this->container->get($provider->getService());
+                } catch (QueryException $e) {
+                    return null;
+                }
+            });
+        }
+    }
+
+    /**
+     * @throws NotFoundException if preview generation is disabled
+     */
+    private function throwIfPreviewsDisabled(File $file, ?string $mimeType = null): void {
+        if (!$this->isAvailable($file, $mimeType)) {
+            throw new NotFoundException('Previews disabled');
+        }
+    }
 }

apps/settings/lib/Controller/HelpController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		}
 
 		$documentationUrl = $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
+			$this->urlGenerator->linkTo('', 'core/doc/'.$mode.'/index.html')
 		);
 
 		$urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);

Indentation +57 added lines, -57 removed lines

@@ -25,67 +25,67 @@
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class HelpController extends Controller {
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private INavigationManager $navigationManager,
-		private IURLGenerator $urlGenerator,
-		/** @var string */
-		private ?string $userId,
-		private IGroupManager $groupManager,
-		private IL10N $l10n,
-		private IConfig $config,
-		private IAppConfig $appConfig,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private INavigationManager $navigationManager,
+        private IURLGenerator $urlGenerator,
+        /** @var string */
+        private ?string $userId,
+        private IGroupManager $groupManager,
+        private IL10N $l10n,
+        private IConfig $config,
+        private IAppConfig $appConfig,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @return TemplateResponse
-	 *
-	 * @NoSubAdminRequired
-	 */
-	#[NoCSRFRequired]
-	#[NoAdminRequired]
-	public function help(string $mode = 'user'): TemplateResponse {
-		$this->navigationManager->setActiveEntry('help');
-		$pageTitle = $this->l10n->t('Administrator documentation');
-		if ($mode !== 'admin') {
-			$pageTitle = $this->l10n->t('User documentation');
-			$mode = 'user';
-		}
+    /**
+     * @return TemplateResponse
+     *
+     * @NoSubAdminRequired
+     */
+    #[NoCSRFRequired]
+    #[NoAdminRequired]
+    public function help(string $mode = 'user'): TemplateResponse {
+        $this->navigationManager->setActiveEntry('help');
+        $pageTitle = $this->l10n->t('Administrator documentation');
+        if ($mode !== 'admin') {
+            $pageTitle = $this->l10n->t('User documentation');
+            $mode = 'user';
+        }
 
-		$documentationUrl = $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
-		);
+        $documentationUrl = $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
+        );
 
-		$urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);
-		$urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']);
+        $urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);
+        $urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']);
 
-		$knowledgebaseEmbedded = $this->config->getSystemValueBool('knowledgebase.embedded', false);
-		if (!$knowledgebaseEmbedded) {
-			$pageTitle = $this->l10n->t('Nextcloud help overview');
-			$urlUserDocs = $this->urlGenerator->linkToDocs('user');
-			$urlAdminDocs = $this->urlGenerator->linkToDocs('admin');
-		}
+        $knowledgebaseEmbedded = $this->config->getSystemValueBool('knowledgebase.embedded', false);
+        if (!$knowledgebaseEmbedded) {
+            $pageTitle = $this->l10n->t('Nextcloud help overview');
+            $urlUserDocs = $this->urlGenerator->linkToDocs('user');
+            $urlAdminDocs = $this->urlGenerator->linkToDocs('admin');
+        }
 
-		$legalNoticeUrl = $this->appConfig->getValueString('theming', 'imprintUrl');
-		$privacyUrl = $this->appConfig->getValueString('theming', 'privacyUrl');
+        $legalNoticeUrl = $this->appConfig->getValueString('theming', 'imprintUrl');
+        $privacyUrl = $this->appConfig->getValueString('theming', 'privacyUrl');
 
-		$response = new TemplateResponse('settings', 'help', [
-			'admin' => $this->groupManager->isAdmin($this->userId),
-			'url' => $documentationUrl,
-			'urlUserDocs' => $urlUserDocs,
-			'urlAdminDocs' => $urlAdminDocs,
-			'mode' => $mode,
-			'pageTitle' => $pageTitle,
-			'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
-			'legalNoticeUrl' => $legalNoticeUrl,
-			'privacyUrl' => $privacyUrl,
-		]);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-		return $response;
-	}
+        $response = new TemplateResponse('settings', 'help', [
+            'admin' => $this->groupManager->isAdmin($this->userId),
+            'url' => $documentationUrl,
+            'urlUserDocs' => $urlUserDocs,
+            'urlAdminDocs' => $urlAdminDocs,
+            'mode' => $mode,
+            'pageTitle' => $pageTitle,
+            'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
+            'legalNoticeUrl' => $legalNoticeUrl,
+            'privacyUrl' => $privacyUrl,
+        ]);
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+        return $response;
+    }
 }

lib/private/Authentication/Token/TokenCleanupJob.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\BackgroundJob\TimedJob;
 
 class TokenCleanupJob extends TimedJob {
-	private IProvider $provider;
+    private IProvider $provider;
 
-	public function __construct(ITimeFactory $time, IProvider $provider) {
-		parent::__construct($time);
-		$this->provider = $provider;
-		// Run once a day at off-peak time
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+    public function __construct(ITimeFactory $time, IProvider $provider) {
+        parent::__construct($time);
+        $this->provider = $provider;
+        // Run once a day at off-peak time
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		$this->provider->invalidateOldTokens();
-	}
+    protected function run($argument) {
+        $this->provider->invalidateOldTokens();
+    }
 }

lib/private/Repair/NC24/AddTokenCleanupJob.php

Indentation +10 added lines, -10 removed lines

@@ -31,17 +31,17 @@
 use OCP\Migration\IRepairStep;
 
 class AddTokenCleanupJob implements IRepairStep {
-	private IJobList $jobList;
+    private IJobList $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add token cleanup job';
-	}
+    public function getName(): string {
+        return 'Add token cleanup job';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(TokenCleanupJob::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(TokenCleanupJob::class);
+    }
 }

lib/public/Files/DavUtil.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	public static function getDavFileId(int $id): string {
 		$instanceId = \OC_Util::getInstanceId();
 		$id = sprintf('%08d', $id);
-		return $id . $instanceId;
+		return $id.$instanceId;
 	}
 
 	/**

Indentation +57 added lines, -57 removed lines

@@ -15,64 +15,64 @@
  * @since 25.0.0
  */
 class DavUtil {
-	/**
-	 * Compute the fileId to use for dav responses
-	 *
-	 * @param int $id Id of the file returned by FileInfo::getId
-	 * @since 25.0.0
-	 */
-	public static function getDavFileId(int $id): string {
-		$instanceId = \OC_Util::getInstanceId();
-		$id = sprintf('%08d', $id);
-		return $id . $instanceId;
-	}
+    /**
+     * Compute the fileId to use for dav responses
+     *
+     * @param int $id Id of the file returned by FileInfo::getId
+     * @since 25.0.0
+     */
+    public static function getDavFileId(int $id): string {
+        $instanceId = \OC_Util::getInstanceId();
+        $id = sprintf('%08d', $id);
+        return $id . $instanceId;
+    }
 
-	/**
-	 * Compute the format needed for returning permissions for dav
-	 *
-	 * @since 25.0.0
-	 */
-	public static function getDavPermissions(FileInfo $info): string {
-		$permissions = $info->getPermissions();
-		$p = '';
-		if ($info->isShared()) {
-			$p .= 'S';
-		}
-		if ($permissions & Constants::PERMISSION_SHARE) {
-			$p .= 'R';
-		}
-		if ($info->isMounted()) {
-			$p .= 'M';
-		}
-		if ($permissions & Constants::PERMISSION_READ) {
-			$p .= 'G';
-		}
-		if ($permissions & Constants::PERMISSION_DELETE) {
-			$p .= 'D';
-		}
-		if ($permissions & Constants::PERMISSION_UPDATE) {
-			$p .= 'NV'; // Renameable, Movable
-		}
+    /**
+     * Compute the format needed for returning permissions for dav
+     *
+     * @since 25.0.0
+     */
+    public static function getDavPermissions(FileInfo $info): string {
+        $permissions = $info->getPermissions();
+        $p = '';
+        if ($info->isShared()) {
+            $p .= 'S';
+        }
+        if ($permissions & Constants::PERMISSION_SHARE) {
+            $p .= 'R';
+        }
+        if ($info->isMounted()) {
+            $p .= 'M';
+        }
+        if ($permissions & Constants::PERMISSION_READ) {
+            $p .= 'G';
+        }
+        if ($permissions & Constants::PERMISSION_DELETE) {
+            $p .= 'D';
+        }
+        if ($permissions & Constants::PERMISSION_UPDATE) {
+            $p .= 'NV'; // Renameable, Movable
+        }
 
-		// since we always add update permissions for the root of movable mounts
-		// we need to check the shared cache item directly to determine if it's writable
-		$storage = $info->getStorage();
-		if ($info->getInternalPath() === '' && $info->getMountPoint() instanceof IMovableMount) {
-			$rootEntry = $storage->getCache()->get('');
-			$isWritable = $rootEntry->getPermissions() & Constants::PERMISSION_UPDATE;
-		} else {
-			$isWritable = $permissions & Constants::PERMISSION_UPDATE;
-		}
+        // since we always add update permissions for the root of movable mounts
+        // we need to check the shared cache item directly to determine if it's writable
+        $storage = $info->getStorage();
+        if ($info->getInternalPath() === '' && $info->getMountPoint() instanceof IMovableMount) {
+            $rootEntry = $storage->getCache()->get('');
+            $isWritable = $rootEntry->getPermissions() & Constants::PERMISSION_UPDATE;
+        } else {
+            $isWritable = $permissions & Constants::PERMISSION_UPDATE;
+        }
 
-		if ($info->getType() === FileInfo::TYPE_FILE) {
-			if ($isWritable) {
-				$p .= 'W';
-			}
-		} else {
-			if ($permissions & Constants::PERMISSION_CREATE) {
-				$p .= 'CK';
-			}
-		}
-		return $p;
-	}
+        if ($info->getType() === FileInfo::TYPE_FILE) {
+            if ($isWritable) {
+                $p .= 'W';
+            }
+        } else {
+            if ($permissions & Constants::PERMISSION_CREATE) {
+                $p .= 'CK';
+            }
+        }
+        return $p;
+    }
 }

lib/public/Collaboration/Reference/IReferenceProvider.php

Indentation +29 added lines, -29 removed lines

@@ -28,36 +28,36 @@
  * @since 25.0.0
  */
 interface IReferenceProvider {
-	/**
-	 * Validate that a given reference identifier matches the current provider
-	 *
-	 * @since 25.0.0
-	 */
-	public function matchReference(string $referenceText): bool;
+    /**
+     * Validate that a given reference identifier matches the current provider
+     *
+     * @since 25.0.0
+     */
+    public function matchReference(string $referenceText): bool;
 
-	/**
-	 * Return a reference with its metadata for a given reference identifier
-	 *
-	 * @since 25.0.0
-	 */
-	public function resolveReference(string $referenceText): ?IReference;
+    /**
+     * Return a reference with its metadata for a given reference identifier
+     *
+     * @since 25.0.0
+     */
+    public function resolveReference(string $referenceText): ?IReference;
 
-	/**
-	 * Return true if the reference metadata can be globally cached
-	 *
-	 * @since 25.0.0
-	 */
-	public function getCachePrefix(string $referenceId): string;
+    /**
+     * Return true if the reference metadata can be globally cached
+     *
+     * @since 25.0.0
+     */
+    public function getCachePrefix(string $referenceId): string;
 
-	/**
-	 * Return a custom cache key to be used for caching the metadata
-	 * This could be for example the current user id if the reference
-	 * access permissions are different for each user
-	 *
-	 * Should return null, if the cache is only related to the
-	 * reference id and has no further dependency
-	 *
-	 * @since 25.0.0
-	 */
-	public function getCacheKey(string $referenceId): ?string;
+    /**
+     * Return a custom cache key to be used for caching the metadata
+     * This could be for example the current user id if the reference
+     * access permissions are different for each user
+     *
+     * Should return null, if the cache is only related to the
+     * reference id and has no further dependency
+     *
+     * @since 25.0.0
+     */
+    public function getCacheKey(string $referenceId): ?string;
 }

apps/settings/templates/settings/personal/security/password.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  */
 
 if ($_['passwordChangeSupported']) {
-	\OCP\Util::addScript('settings', 'vue-settings-personal-password');
+    \OCP\Util::addScript('settings', 'vue-settings-personal-password');
 }
 ?>
 <div id="security-password"></div>

lib/private/Files/Stream/HashWrapper.php

Indentation +47 added lines, -47 removed lines

@@ -28,58 +28,58 @@
 use Icewind\Streams\Wrapper;
 
 class HashWrapper extends Wrapper {
-	protected $callback;
-	protected $hash;
+    protected $callback;
+    protected $hash;
 
-	public static function wrap($source, string $algo, callable $callback) {
-		$hash = hash_init($algo);
-		$context = stream_context_create([
-			'hash' => [
-				'source' => $source,
-				'callback' => $callback,
-				'hash' => $hash,
-			],
-		]);
-		return Wrapper::wrapSource($source, $context, 'hash', self::class);
-	}
+    public static function wrap($source, string $algo, callable $callback) {
+        $hash = hash_init($algo);
+        $context = stream_context_create([
+            'hash' => [
+                'source' => $source,
+                'callback' => $callback,
+                'hash' => $hash,
+            ],
+        ]);
+        return Wrapper::wrapSource($source, $context, 'hash', self::class);
+    }
 
-	protected function open() {
-		$context = $this->loadContext('hash');
+    protected function open() {
+        $context = $this->loadContext('hash');
 
-		$this->callback = $context['callback'];
-		$this->hash = $context['hash'];
-		return true;
-	}
+        $this->callback = $context['callback'];
+        $this->hash = $context['hash'];
+        return true;
+    }
 
-	public function dir_opendir($path, $options) {
-		return $this->open();
-	}
+    public function dir_opendir($path, $options) {
+        return $this->open();
+    }
 
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		return $this->open();
-	}
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        return $this->open();
+    }
 
-	public function stream_read($count) {
-		$result = parent::stream_read($count);
-		hash_update($this->hash, $result);
-		return $result;
-	}
+    public function stream_read($count) {
+        $result = parent::stream_read($count);
+        hash_update($this->hash, $result);
+        return $result;
+    }
 
-	public function stream_close() {
-		if (is_callable($this->callback)) {
-			// if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
-			if ($this->hash instanceof \HashContext) {
-				try {
-					$hash = @hash_final($this->hash);
-					if ($hash) {
-						call_user_func($this->callback, $hash);
-					}
-				} catch (\Throwable $e) {
-				}
-			}
-			// prevent further calls by potential PHP 7 GC ghosts
-			$this->callback = null;
-		}
-		return parent::stream_close();
-	}
+    public function stream_close() {
+        if (is_callable($this->callback)) {
+            // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
+            if ($this->hash instanceof \HashContext) {
+                try {
+                    $hash = @hash_final($this->hash);
+                    if ($hash) {
+                        call_user_func($this->callback, $hash);
+                    }
+                } catch (\Throwable $e) {
+                }
+            }
+            // prevent further calls by potential PHP 7 GC ghosts
+            $this->callback = null;
+        }
+        return parent::stream_close();
+    }
 }

lib/public/Color.php

Spacing +3 added lines, -3 removed lines

@@ -133,9 +133,9 @@
 	 */
 	public function alphaBlending(float $opacity, Color $source): Color {
 		return new Color(
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
+			(int) ((1 - $opacity) * $source->red() + $opacity * $this->red()),
+			(int) ((1 - $opacity) * $source->green() + $opacity * $this->green()),
+			(int) ((1 - $opacity) * $source->blue() + $opacity * $this->blue())
 		);
 	}
 

Indentation +114 added lines, -114 removed lines

@@ -10,129 +10,129 @@
  * @since 25.0.0
  */
 class Color {
-	private int $r;
-	private int $g;
-	private int $b;
+    private int $r;
+    private int $g;
+    private int $b;
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function __construct($r, $g, $b) {
-		$this->r = $r;
-		$this->g = $g;
-		$this->b = $b;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function __construct($r, $g, $b) {
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+    }
 
-	/**
-	 * Returns the red color component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function red(): int {
-		return $this->r;
-	}
+    /**
+     * Returns the red color component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function red(): int {
+        return $this->r;
+    }
 
-	/**
-	 * Returns the red color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function redF(): float {
-		return $this->r / 255;
-	}
+    /**
+     * Returns the red color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function redF(): float {
+        return $this->r / 255;
+    }
 
-	/**
-	 * Returns the green color component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function green(): int {
-		return $this->g;
-	}
+    /**
+     * Returns the green color component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function green(): int {
+        return $this->g;
+    }
 
-	/**
-	 * Returns the green color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function greenF(): float {
-		return $this->g / 255;
-	}
+    /**
+     * Returns the green color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function greenF(): float {
+        return $this->g / 255;
+    }
 
-	/**
-	 * Returns the green blue component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function blue(): int {
-		return $this->b;
-	}
+    /**
+     * Returns the green blue component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function blue(): int {
+        return $this->b;
+    }
 
-	/**
-	 * Returns the blue color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function blueF(): float {
-		return $this->g / 255;
-	}
+    /**
+     * Returns the blue color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function blueF(): float {
+        return $this->g / 255;
+    }
 
-	/**
-	 * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
-	 *
-	 * @since 25.0.0
-	 */
-	public function name(): string {
-		return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
-	}
+    /**
+     * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
+     *
+     * @since 25.0.0
+     */
+    public function name(): string {
+        return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
+    }
 
-	/**
-	 * Mix two colors
-	 *
-	 * @param int $steps the number of intermediate colors that should be generated for the palette
-	 * @param Color $color1 the first color
-	 * @param Color $color2 the second color
-	 * @return list<Color>
-	 * @since 25.0.0
-	 */
-	public static function mixPalette(int $steps, Color $color1, Color $color2): array {
-		$palette = [$color1];
-		$step = self::stepCalc($steps, [$color1, $color2]);
-		for ($i = 1; $i < $steps; $i++) {
-			$r = intval($color1->red() + ($step[0] * $i));
-			$g = intval($color1->green() + ($step[1] * $i));
-			$b = intval($color1->blue() + ($step[2] * $i));
-			$palette[] = new Color($r, $g, $b);
-		}
-		return $palette;
-	}
+    /**
+     * Mix two colors
+     *
+     * @param int $steps the number of intermediate colors that should be generated for the palette
+     * @param Color $color1 the first color
+     * @param Color $color2 the second color
+     * @return list<Color>
+     * @since 25.0.0
+     */
+    public static function mixPalette(int $steps, Color $color1, Color $color2): array {
+        $palette = [$color1];
+        $step = self::stepCalc($steps, [$color1, $color2]);
+        for ($i = 1; $i < $steps; $i++) {
+            $r = intval($color1->red() + ($step[0] * $i));
+            $g = intval($color1->green() + ($step[1] * $i));
+            $b = intval($color1->blue() + ($step[2] * $i));
+            $palette[] = new Color($r, $g, $b);
+        }
+        return $palette;
+    }
 
-	/**
-	 * Alpha blend another color with a given opacity to this color
-	 *
-	 * @return Color The new color
-	 * @since 25.0.0
-	 */
-	public function alphaBlending(float $opacity, Color $source): Color {
-		return new Color(
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
-		);
-	}
+    /**
+     * Alpha blend another color with a given opacity to this color
+     *
+     * @return Color The new color
+     * @since 25.0.0
+     */
+    public function alphaBlending(float $opacity, Color $source): Color {
+        return new Color(
+            (int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
+            (int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
+            (int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
+        );
+    }
 
-	/**
-	 * Calculate steps between two Colors
-	 * @param int $steps start color
-	 * @param Color[] $ends end color
-	 * @return array{0: float, 1: float, 2: float} [r,g,b] steps for each color to go from $steps to $ends
-	 * @since 25.0.0
-	 */
-	private static function stepCalc(int $steps, array $ends): array {
-		$step = [];
-		$step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
-		$step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
-		$step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
-		return $step;
-	}
+    /**
+     * Calculate steps between two Colors
+     * @param int $steps start color
+     * @param Color[] $ends end color
+     * @return array{0: float, 1: float, 2: float} [r,g,b] steps for each color to go from $steps to $ends
+     * @since 25.0.0
+     */
+    private static function stepCalc(int $steps, array $ends): array {
+        $step = [];
+        $step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
+        $step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
+        $step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
+        return $step;
+    }
 }