diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-21 12:03:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-21 12:03:51 +0300 |
commit | 0d88fed88f412f78f32e84ff7b86facb324cf138 (patch) | |
tree | 84a293de2148b21901d384ade1a68b8214d9ca9a | |
parent | 5bf18f8ae07cbc4d5c337c03aea2f7a857c91101 (diff) | |
parent | 0de4a1881082953cee887bc016134aad9ca03ef9 (diff) |
Merge pull request #213 from rullzer/to/githubactions
Move to github actions
-rw-r--r-- | .github/workflows/lint.yml | 54 | ||||
-rw-r--r-- | .php_cs.dist | 17 | ||||
-rw-r--r-- | .travis.yml | 45 | ||||
-rw-r--r-- | composer.json | 18 | ||||
-rw-r--r-- | composer/autoload.php | 7 | ||||
-rw-r--r-- | composer/composer.json | 13 | ||||
-rw-r--r-- | composer/composer/ClassLoader.php | 445 | ||||
-rw-r--r-- | composer/composer/LICENSE | 21 | ||||
-rw-r--r-- | composer/composer/autoload_classmap.php | 17 | ||||
-rw-r--r-- | composer/composer/autoload_namespaces.php | 9 | ||||
-rw-r--r-- | composer/composer/autoload_psr4.php | 10 | ||||
-rw-r--r-- | composer/composer/autoload_real.php | 46 | ||||
-rw-r--r-- | composer/composer/autoload_static.php | 43 | ||||
-rw-r--r-- | composer/composer/installed.json | 1 | ||||
-rw-r--r-- | lib/AppInfo/Application.php | 5 | ||||
-rw-r--r-- | lib/Command/DeleteOld.php | 3 | ||||
-rw-r--r-- | lib/Command/Generate.php | 6 | ||||
-rw-r--r-- | lib/Command/PreGenerate.php | 3 | ||||
-rw-r--r-- | lib/Command/TimestampFormatter.php | 2 | ||||
-rw-r--r-- | lib/Listeners/PostWriteListener.php | 1 | ||||
-rw-r--r-- | lib/Migration/Version020000Date20180823071939.php | 1 | ||||
-rw-r--r-- | lib/SizeHelper.php | 10 |
22 files changed, 104 insertions, 673 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..97ea55a --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,54 @@ +name: Lint + +on: + pull_request: + push: + branches: + - master + - stable* + +jobs: + php: + runs-on: ubuntu-latest + + strategy: + matrix: + php-versions: ['7.3', '7.4', '8.0'] + + name: php${{ matrix.php-versions }} + steps: + - uses: actions/checkout@v2 + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Lint + run: composer run lint + + php-cs-fixer: + runs-on: ubuntu-latest + + strategy: + matrix: + php-versions: ['7.4'] + + name: cs php${{ matrix.php-versions }} + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Set up php + uses: shivammathur/setup-php@master + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Install dependencies + run: composer i + + - name: Run coding standards check + run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) + diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000..8a0cb43 --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,17 @@ +<?php + +declare(strict_types=1); + +require_once './vendor/autoload.php'; + +use Nextcloud\CodingStandard\Config; + +$config = new Config(); +$config + ->getFinder() + ->notPath('build') + ->notPath('l10n') + ->notPath('src') + ->notPath('vendor') + ->in(__DIR__); +return $config; diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 66f01ba..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -language: php -php: - - 7 - - 7.1 - - 7.2 - -env: - global: - - CORE_BRANCH=master - - APP_NAME=previewgenerator - matrix: - - DB=sqlite - -branches: - only: - - master - - /^stable\d+(\.\d+)?$/ - -before_install: - - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - - . ./before_install.sh $APP_NAME $CORE_BRANCH $DB - - # Add some output debugging information - - cd ../server - - ./occ check - - ./occ status - - ./occ app:list - - ./occ app:enable $APP_NAME - -script: - - cd apps/$APP_NAME/ - - # Test the app - - sh -c "find . -name \*.php -exec php -l \"{}\" \;;" - - cd ../../ - #- sh -c "./occ app:check-code $APP_NAME -c private -c strong-comparison;" - #- sh -c "./occ app:check-code $APP_NAME -c deprecation;" - - cd apps/$APP_NAME/ - - # Run phpunit tests - - cd tests/ - - sh -c "phpunit --configuration phpunit.xml" - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..815a61b --- /dev/null +++ b/composer.json @@ -0,0 +1,18 @@ +{ + "name": "rullzer/previewgenerator", + "config": { + "optimize-autoloader": true, + "classmap-authoritative": true, + "platform": { + "php": "7.3" + } + }, + "scripts": { + "cs:fix": "php-cs-fixer fix", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l" + }, + "require-dev": { + "nextcloud/coding-standard": "^0.3.0" + } +} diff --git a/composer/autoload.php b/composer/autoload.php deleted file mode 100644 index 9d93afc..0000000 --- a/composer/autoload.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - -// autoload.php @generated by Composer - -require_once __DIR__ . '/composer/autoload_real.php'; - -return ComposerAutoloaderInitPreviewGenerator::getLoader(); diff --git a/composer/composer.json b/composer/composer.json deleted file mode 100644 index 5805e88..0000000 --- a/composer/composer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "config" : { - "vendor-dir": ".", - "optimize-autoloader": true, - "classmap-authoritative": true, - "autoloader-suffix": "PreviewGenerator" - }, - "autoload" : { - "psr-4": { - "OCA\\PreviewGenerator\\": "../lib/" - } - } -} diff --git a/composer/composer/ClassLoader.php b/composer/composer/ClassLoader.php deleted file mode 100644 index fce8549..0000000 --- a/composer/composer/ClassLoader.php +++ /dev/null @@ -1,445 +0,0 @@ -<?php - -/* - * This file is part of Composer. - * - * (c) Nils Adermann <naderman@naderman.de> - * Jordi Boggiano <j.boggiano@seld.be> - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Composer\Autoload; - -/** - * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. - * - * $loader = new \Composer\Autoload\ClassLoader(); - * - * // register classes with namespaces - * $loader->add('Symfony\Component', __DIR__.'/component'); - * $loader->add('Symfony', __DIR__.'/framework'); - * - * // activate the autoloader - * $loader->register(); - * - * // to enable searching the include path (eg. for PEAR packages) - * $loader->setUseIncludePath(true); - * - * In this example, if you try to use a class in the Symfony\Component - * namespace or one of its children (Symfony\Component\Console for instance), - * the autoloader will first look for the class under the component/ - * directory, and it will then fallback to the framework/ directory if not - * found before giving up. - * - * This class is loosely based on the Symfony UniversalClassLoader. - * - * @author Fabien Potencier <fabien@symfony.com> - * @author Jordi Boggiano <j.boggiano@seld.be> - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ - */ -class ClassLoader -{ - // PSR-4 - private $prefixLengthsPsr4 = array(); - private $prefixDirsPsr4 = array(); - private $fallbackDirsPsr4 = array(); - - // PSR-0 - private $prefixesPsr0 = array(); - private $fallbackDirsPsr0 = array(); - - private $useIncludePath = false; - private $classMap = array(); - private $classMapAuthoritative = false; - private $missingClasses = array(); - private $apcuPrefix; - - public function getPrefixes() - { - if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); - } - - return array(); - } - - public function getPrefixesPsr4() - { - return $this->prefixDirsPsr4; - } - - public function getFallbackDirs() - { - return $this->fallbackDirsPsr0; - } - - public function getFallbackDirsPsr4() - { - return $this->fallbackDirsPsr4; - } - - public function getClassMap() - { - return $this->classMap; - } - - /** - * @param array $classMap Class to filename map - */ - public function addClassMap(array $classMap) - { - if ($this->classMap) { - $this->classMap = array_merge($this->classMap, $classMap); - } else { - $this->classMap = $classMap; - } - } - - /** - * Registers a set of PSR-0 directories for a given prefix, either - * appending or prepending to the ones previously set for this prefix. - * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories - */ - public function add($prefix, $paths, $prepend = false) - { - if (!$prefix) { - if ($prepend) { - $this->fallbackDirsPsr0 = array_merge( - (array) $paths, - $this->fallbackDirsPsr0 - ); - } else { - $this->fallbackDirsPsr0 = array_merge( - $this->fallbackDirsPsr0, - (array) $paths - ); - } - - return; - } - - $first = $prefix[0]; - if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; - - return; - } - if ($prepend) { - $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, - $this->prefixesPsr0[$first][$prefix] - ); - } else { - $this->prefixesPsr0[$first][$prefix] = array_merge( - $this->prefixesPsr0[$first][$prefix], - (array) $paths - ); - } - } - - /** - * Registers a set of PSR-4 directories for a given namespace, either - * appending or prepending to the ones previously set for this namespace. - * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories - * - * @throws \InvalidArgumentException - */ - public function addPsr4($prefix, $paths, $prepend = false) - { - if (!$prefix) { - // Register directories for the root namespace. - if ($prepend) { - $this->fallbackDirsPsr4 = array_merge( - (array) $paths, - $this->fallbackDirsPsr4 - ); - } else { - $this->fallbackDirsPsr4 = array_merge( - $this->fallbackDirsPsr4, - (array) $paths - ); - } - } elseif (!isset($this->prefixDirsPsr4[$prefix])) { - // Register directories for a new namespace. - $length = strlen($prefix); - if ('\\' !== $prefix[$length - 1]) { - throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); - } - $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; - } elseif ($prepend) { - // Prepend directories for an already registered namespace. - $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, - $this->prefixDirsPsr4[$prefix] - ); - } else { - // Append directories for an already registered namespace. - $this->prefixDirsPsr4[$prefix] = array_merge( - $this->prefixDirsPsr4[$prefix], - (array) $paths - ); - } - } - - /** - * Registers a set of PSR-0 directories for a given prefix, - * replacing any others previously set for this prefix. - * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 base directories - */ - public function set($prefix, $paths) - { - if (!$prefix) { - $this->fallbackDirsPsr0 = (array) $paths; - } else { - $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; - } - } - - /** - * Registers a set of PSR-4 directories for a given namespace, - * replacing any others previously set for this namespace. - * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-4 base directories - * - * @throws \InvalidArgumentException - */ - public function setPsr4($prefix, $paths) - { - if (!$prefix) { - $this->fallbackDirsPsr4 = (array) $paths; - } else { - $length = strlen($prefix); - if ('\\' !== $prefix[$length - 1]) { - throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); - } - $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; - } - } - - /** - * Turns on searching the include path for class files. - * - * @param bool $useIncludePath - */ - public function setUseIncludePath($useIncludePath) - { - $this->useIncludePath = $useIncludePath; - } - - /** - * Can be used to check if the autoloader uses the include path to check - * for classes. - * - * @return bool - */ - public function getUseIncludePath() - { - return $this->useIncludePath; - } - - /** - * Turns off searching the prefix and fallback directories for classes - * that have not been registered with the class map. - * - * @param bool $classMapAuthoritative - */ - public function setClassMapAuthoritative($classMapAuthoritative) - { - $this->classMapAuthoritative = $classMapAuthoritative; - } - - /** - * Should class lookup fail if not found in the current class map? - * - * @return bool - */ - public function isClassMapAuthoritative() - { - return $this->classMapAuthoritative; - } - - /** - * APCu prefix to use to cache found/not-found classes, if the extension is enabled. - * - * @param string|null $apcuPrefix - */ - public function setApcuPrefix($apcuPrefix) - { - $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; - } - - /** - * The APCu prefix in use, or null if APCu caching is not enabled. - * - * @return string|null - */ - public function getApcuPrefix() - { - return $this->apcuPrefix; - } - - /** - * Registers this instance as an autoloader. - * - * @param bool $prepend Whether to prepend the autoloader or not - */ - public function register($prepend = false) - { - spl_autoload_register(array($this, 'loadClass'), true, $prepend); - } - - /** - * Unregisters this instance as an autoloader. - */ - public function unregister() - { - spl_autoload_unregister(array($this, 'loadClass')); - } - - /** - * Loads the given class or interface. - * - * @param string $class The name of the class - * @return bool|null True if loaded, null otherwise - */ - public function loadClass($class) - { - if ($file = $this->findFile($class)) { - includeFile($file); - - return true; - } - } - - /** - * Finds the path to the file where the class is defined. - * - * @param string $class The name of the class - * - * @return string|false The path if found, false otherwise - */ - public function findFile($class) - { - // class map lookup - if (isset($this->classMap[$class])) { - return $this->classMap[$class]; - } - if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { - return false; - } - if (null !== $this->apcuPrefix) { - $file = apcu_fetch($this->apcuPrefix.$class, $hit); - if ($hit) { - return $file; - } - } - - $file = $this->findFileWithExtension($class, '.php'); - - // Search for Hack files if we are running on HHVM - if (false === $file && defined('HHVM_VERSION')) { - $file = $this->findFileWithExtension($class, '.hh'); - } - - if (null !== $this->apcuPrefix) { - apcu_add($this->apcuPrefix.$class, $file); - } - - if (false === $file) { - // Remember that this class does not exist. - $this->missingClasses[$class] = true; - } - - return $file; - } - - private function findFileWithExtension($class, $ext) - { - // PSR-4 lookup - $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; - - $first = $class[0]; - if (isset($this->prefixLengthsPsr4[$first])) { - $subPath = $class; - while (false !== $lastPos = strrpos($subPath, '\\')) { - $subPath = substr($subPath, 0, $lastPos); - $search = $subPath . '\\'; - if (isset($this->prefixDirsPsr4[$search])) { - $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); - foreach ($this->prefixDirsPsr4[$search] as $dir) { - if (file_exists($file = $dir . $pathEnd)) { - return $file; - } - } - } - } - } - - // PSR-4 fallback dirs - foreach ($this->fallbackDirsPsr4 as $dir) { - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { - return $file; - } - } - - // PSR-0 lookup - if (false !== $pos = strrpos($class, '\\')) { - // namespaced class name - $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) - . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); - } else { - // PEAR-like class name - $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; - } - - if (isset($this->prefixesPsr0[$first])) { - foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { - if (0 === strpos($class, $prefix)) { - foreach ($dirs as $dir) { - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { - return $file; - } - } - } - } - } - - // PSR-0 fallback dirs - foreach ($this->fallbackDirsPsr0 as $dir) { - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { - return $file; - } - } - - // PSR-0 include paths. - if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { - return $file; - } - - return false; - } -} - -/** - * Scope isolated include. - * - * Prevents access to $this/self from included files. - */ -function includeFile($file) -{ - include $file; -} diff --git a/composer/composer/LICENSE b/composer/composer/LICENSE deleted file mode 100644 index f27399a..0000000 --- a/composer/composer/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ - -Copyright (c) Nils Adermann, Jordi Boggiano - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/composer/composer/autoload_classmap.php b/composer/composer/autoload_classmap.php deleted file mode 100644 index 746f918..0000000 --- a/composer/composer/autoload_classmap.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -// autoload_classmap.php @generated by Composer - -$vendorDir = dirname(dirname(__FILE__)); -$baseDir = $vendorDir; - -return array( - 'OCA\\PreviewGenerator\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', - 'OCA\\PreviewGenerator\\Command\\DeleteOld' => $baseDir . '/../lib/Command/DeleteOld.php', - 'OCA\\PreviewGenerator\\Command\\Generate' => $baseDir . '/../lib/Command/Generate.php', - 'OCA\\PreviewGenerator\\Command\\PreGenerate' => $baseDir . '/../lib/Command/PreGenerate.php', - 'OCA\\PreviewGenerator\\Command\\TimestampFormatter' => $baseDir . '/../lib/Command/TimestampFormatter.php', - 'OCA\\PreviewGenerator\\Listeners\\PostWriteListener' => $baseDir . '/../lib/Listeners/PostWriteListener.php', - 'OCA\\PreviewGenerator\\Migration\\Version020000Date20180823071939' => $baseDir . '/../lib/Migration/Version020000Date20180823071939.php', - 'OCA\\PreviewGenerator\\SizeHelper' => $baseDir . '/../lib/SizeHelper.php', -); diff --git a/composer/composer/autoload_namespaces.php b/composer/composer/autoload_namespaces.php deleted file mode 100644 index 71c9e91..0000000 --- a/composer/composer/autoload_namespaces.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -// autoload_namespaces.php @generated by Composer - -$vendorDir = dirname(dirname(__FILE__)); -$baseDir = $vendorDir; - -return array( -); diff --git a/composer/composer/autoload_psr4.php b/composer/composer/autoload_psr4.php deleted file mode 100644 index 4395b05..0000000 --- a/composer/composer/autoload_psr4.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -// autoload_psr4.php @generated by Composer - -$vendorDir = dirname(dirname(__FILE__)); -$baseDir = $vendorDir; - -return array( - 'OCA\\PreviewGenerator\\' => array($baseDir . '/../lib'), -); diff --git a/composer/composer/autoload_real.php b/composer/composer/autoload_real.php deleted file mode 100644 index 4e42e59..0000000 --- a/composer/composer/autoload_real.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php - -// autoload_real.php @generated by Composer - -class ComposerAutoloaderInitPreviewGenerator -{ - private static $loader; - - public static function loadClassLoader($class) - { - if ('Composer\Autoload\ClassLoader' === $class) { - require __DIR__ . '/ClassLoader.php'; - } - } - - /** - * @return \Composer\Autoload\ClassLoader - */ - public static function getLoader() - { - if (null !== self::$loader) { - return self::$loader; - } - - spl_autoload_register(array('ComposerAutoloaderInitPreviewGenerator', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitPreviewGenerator', 'loadClassLoader')); - - $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); - if ($useStaticLoader) { - require_once __DIR__ . '/autoload_static.php'; - - call_user_func(\Composer\Autoload\ComposerStaticInitPreviewGenerator::getInitializer($loader)); - } else { - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - } - - $loader->setClassMapAuthoritative(true); - $loader->register(true); - - return $loader; - } -} diff --git a/composer/composer/autoload_static.php b/composer/composer/autoload_static.php deleted file mode 100644 index 5198c20..0000000 --- a/composer/composer/autoload_static.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php - -// autoload_static.php @generated by Composer - -namespace Composer\Autoload; - -class ComposerStaticInitPreviewGenerator -{ - public static $prefixLengthsPsr4 = array ( - 'O' => - array ( - 'OCA\\PreviewGenerator\\' => 21, - ), - ); - - public static $prefixDirsPsr4 = array ( - 'OCA\\PreviewGenerator\\' => - array ( - 0 => __DIR__ . '/..' . '/../lib', - ), - ); - - public static $classMap = array ( - 'OCA\\PreviewGenerator\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', - 'OCA\\PreviewGenerator\\Command\\DeleteOld' => __DIR__ . '/..' . '/../lib/Command/DeleteOld.php', - 'OCA\\PreviewGenerator\\Command\\Generate' => __DIR__ . '/..' . '/../lib/Command/Generate.php', - 'OCA\\PreviewGenerator\\Command\\PreGenerate' => __DIR__ . '/..' . '/../lib/Command/PreGenerate.php', - 'OCA\\PreviewGenerator\\Command\\TimestampFormatter' => __DIR__ . '/..' . '/../lib/Command/TimestampFormatter.php', - 'OCA\\PreviewGenerator\\Listeners\\PostWriteListener' => __DIR__ . '/..' . '/../lib/Listeners/PostWriteListener.php', - 'OCA\\PreviewGenerator\\Migration\\Version020000Date20180823071939' => __DIR__ . '/..' . '/../lib/Migration/Version020000Date20180823071939.php', - 'OCA\\PreviewGenerator\\SizeHelper' => __DIR__ . '/..' . '/../lib/SizeHelper.php', - ); - - public static function getInitializer(ClassLoader $loader) - { - return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitPreviewGenerator::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitPreviewGenerator::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitPreviewGenerator::$classMap; - - }, null, ClassLoader::class); - } -} diff --git a/composer/composer/installed.json b/composer/composer/installed.json deleted file mode 100644 index fe51488..0000000 --- a/composer/composer/installed.json +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 10d4841..dc43dca 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> @@ -31,8 +32,7 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\Files\Events\Node\NodeWrittenEvent; class Application extends App implements IBootstrap { - - const APPNAME='previewgenerator'; + public const APPNAME='previewgenerator'; public function __construct() { parent::__construct(self::APPNAME); @@ -43,6 +43,5 @@ class Application extends App implements IBootstrap { } public function boot(IBootContext $context): void { - } } diff --git a/lib/Command/DeleteOld.php b/lib/Command/DeleteOld.php index d0ace74..a9b4d19 100644 --- a/lib/Command/DeleteOld.php +++ b/lib/Command/DeleteOld.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> @@ -92,6 +93,4 @@ class DeleteOld extends Command { //Ignore } } - - } diff --git a/lib/Command/Generate.php b/lib/Command/Generate.php index 68a97c3..d66a9cb 100644 --- a/lib/Command/Generate.php +++ b/lib/Command/Generate.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> @@ -109,7 +110,7 @@ class Generate extends Command { $inputPath = $input->getOption('path'); if ($inputPath) { $inputPath = '/' . trim($inputPath, '/'); - list (, $userId,) = explode('/', $inputPath, 3); + list(, $userId,) = explode('/', $inputPath, 3); $user = $this->userManager->get($userId); if ($user !== null) { $this->generatePathPreviews($user, $inputPath); @@ -167,7 +168,7 @@ class Generate extends Command { foreach ($nodes as $node) { if ($node instanceof Folder) { $this->parseFolder($node); - } else if ($node instanceof File) { + } elseif ($node instanceof File) { $this->parseFile($node); } } @@ -201,5 +202,4 @@ class Generate extends Command { } } } - } diff --git a/lib/Command/PreGenerate.php b/lib/Command/PreGenerate.php index 05f0f3d..52fbcc1 100644 --- a/lib/Command/PreGenerate.php +++ b/lib/Command/PreGenerate.php @@ -34,7 +34,6 @@ use OCP\IPreview; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class PreGenerate extends Command { @@ -137,7 +136,7 @@ class PreGenerate extends Command { } private function startProcessing() { - while(true) { + while (true) { $qb = $this->connection->getQueryBuilder(); $qb->select('*') ->from('preview_generation') diff --git a/lib/Command/TimestampFormatter.php b/lib/Command/TimestampFormatter.php index b716939..eb0d971 100644 --- a/lib/Command/TimestampFormatter.php +++ b/lib/Command/TimestampFormatter.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. @@ -108,7 +109,6 @@ class TimestampFormatter implements OutputFormatterInterface { * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00" */ public function format($message): string { - $timeZone = $this->config->getSystemValue('logtimezone', 'UTC'); $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null; diff --git a/lib/Listeners/PostWriteListener.php b/lib/Listeners/PostWriteListener.php index 25871b0..60576e6 100644 --- a/lib/Listeners/PostWriteListener.php +++ b/lib/Listeners/PostWriteListener.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> diff --git a/lib/Migration/Version020000Date20180823071939.php b/lib/Migration/Version020000Date20180823071939.php index 7cebcd4..951d53a 100644 --- a/lib/Migration/Version020000Date20180823071939.php +++ b/lib/Migration/Version020000Date20180823071939.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> diff --git a/lib/SizeHelper.php b/lib/SizeHelper.php index c49b253..62c6838 100644 --- a/lib/SizeHelper.php +++ b/lib/SizeHelper.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2017, Roeland Jago Douma <roeland@famdouma.nl> @@ -27,7 +28,6 @@ namespace OCA\PreviewGenerator; use OCP\IConfig; class SizeHelper { - public static function calculateSizes(IConfig $config): array { /* * First calculate the systems max sizes @@ -43,19 +43,19 @@ class SizeHelper { $maxH = (int)$config->getSystemValue('preview_max_y', 4096); $s = 32; - while($s <= $maxW || $s <= $maxH) { + while ($s <= $maxW || $s <= $maxH) { $sizes['square'][] = $s; $s *= 2; } $w = 32; - while($w <= $maxW) { + while ($w <= $maxW) { $sizes['width'][] = $w; $w *= 2; } $h = 32; - while($h <= $maxH) { + while ($h <= $maxH) { $sizes['height'][] = $h; $h *= 2; } @@ -66,7 +66,7 @@ class SizeHelper { * Note that only powers of 2 matter but if users supply different * stuff it is their own fault and we just ignore it */ - $getCustomSizes = function(IConfig $config, $key) { + $getCustomSizes = function (IConfig $config, $key) { $TXT = $config->getAppValue('previewgenerator', $key, ''); $values = []; if ($TXT !== '') { |