ArthurHoaro / web-thumbnailer

src/WebThumbnailer/Finder/UrlRegexFinder.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if (preg_match($this->urlRegex, $this->url, $matches) !== 0) {
             $total = count($matches);
             for ($i = 1; $i < $total; $i++) {
-                $this->thumbnailUrl = str_replace('${' . $i . '}', $matches[$i], $this->thumbnailUrl);
+                $this->thumbnailUrl = str_replace('${'.$i.'}', $matches[$i], $this->thumbnailUrl);
             }
 
             // Match only options (not ${number})

src/WebThumbnailer/Finder/FinderCommon.php

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
     {
         $chosenOption = $this->getOptionValue($option);
 
-        return str_replace('${' . $option . '}', $chosenOption, $thumbnailUrl);
+        return str_replace('${'.$option.'}', $chosenOption, $thumbnailUrl);
     }
 
     /**
@@ -59,14 +59,14 @@ 
     protected function getOptionValue(string $option)
     {
         // If the provided option is not defined in the Finder rules.
-        if (empty($this->finderOptions) || ! in_array($option, array_keys($this->finderOptions))) {
-            throw new BadRulesException('Unknown option "' . $option . '" for the finder "' . $this->getName() . '"');
+        if (empty($this->finderOptions) || !in_array($option, array_keys($this->finderOptions))) {
+            throw new BadRulesException('Unknown option "'.$option.'" for the finder "'.$this->getName().'"');
         }
 
         // User option is defined.
         // Any defined option must provide a replacement value in rules under the `param` key.
         if (
-            ! empty($this->userOptions[$option])
+            !empty($this->userOptions[$option])
             && is_string($this->userOptions[$option])
             && isset($this->finderOptions[$option][$this->userOptions[$option]]['param'])
         ) {
@@ -74,15 +74,15 @@ 
         }
 
         // If no user option has been found, and no default value is provided: error.
-        if (! isset($this->finderOptions[$option]['default'])) {
-            $error = 'No default set for option "' . $option . '" for the finder "' . $this->getName() . '"';
+        if (!isset($this->finderOptions[$option]['default'])) {
+            $error = 'No default set for option "'.$option.'" for the finder "'.$this->getName().'"';
             throw new BadRulesException($error);
         }
 
         // Use default option replacement.
         $default = $this->finderOptions[$option]['default'];
         if (!isset($this->finderOptions[$option][$default]['param'])) {
-            $error = 'No default parameter set for option "' . $option . '" for the finder "' . $this->getName() . '"';
+            $error = 'No default parameter set for option "'.$option.'" for the finder "'.$this->getName().'"';
             throw new BadRulesException($error);
         }
 
@@ -92,7 +92,7 @@ 
     /** @inheritdoc */
     public function isHotlinkAllowed(): bool
     {
-        if (! isset($this->finderOptions['hotlink_allowed']) ||  $this->finderOptions['hotlink_allowed'] === true) {
+        if (!isset($this->finderOptions['hotlink_allowed']) || $this->finderOptions['hotlink_allowed'] === true) {
             return true;
         }
 

src/WebThumbnailer/Finder/FinderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         try {
             list($domain, $finder, $rules, $options) = static::getThumbnailMeta($domain, $url);
 
-            $className = '\\WebThumbnailer\\Finder\\' . $finder . 'Finder';
+            $className = '\\WebThumbnailer\\Finder\\'.$finder.'Finder';
             if (!class_exists($className)) {
                 throw new UnsupportedDomainException();
             }
@@ -65,7 +65,7 @@ 
         $jsonFiles = ConfigManager::get('settings.rules_filename', ['rules.json']);
         $allRules = [];
         foreach ($jsonFiles as $file) {
-            $allRules = array_merge($allRules, DataUtils::loadJson(FileUtils::RESOURCES_PATH . $file));
+            $allRules = array_merge($allRules, DataUtils::loadJson(FileUtils::RESOURCES_PATH.$file));
         }
 
         $domain = null;

src/WebThumbnailer/Finder/FlickRFinder.php

Spacing +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
 
         $size = $this->getOptionValue('size');
         // One size is actually no suffix...
-        $size = ! empty($size) ? '_' . $size : '';
-        $thumb = preg_replace('#(.*)_\w(\.\w+)$#i', '$1' . $size . '$2', $thumb);
+        $size = !empty($size) ? '_'.$size : '';
+        $thumb = preg_replace('#(.*)_\w(\.\w+)$#i', '$1'.$size.'$2', $thumb);
 
         return $thumb;
     }

src/WebThumbnailer/Finder/DefaultFinder.php

Spacing +7 added lines, -7 removed lines

@@ -60,16 +60,16 @@ 
             return $this->url;
         }
 
-        if (empty($thumbnail) && ! empty($headers) && strpos($headers[0], '200') === false) {
+        if (empty($thumbnail) && !empty($headers) && strpos($headers[0], '200') === false) {
             return false;
         }
 
         // With curl, the thumb is extracted during the download
-        if ($this->webAccess instanceof WebAccessCUrl && ! empty($thumbnail)) {
+        if ($this->webAccess instanceof WebAccessCUrl && !empty($thumbnail)) {
             return $thumbnail;
         }
 
-        return ! empty($content) ? static::extractMetaTag($content) : false;
+        return !empty($content) ? static::extractMetaTag($content) : false;
     }
 
     /**
@@ -99,7 +99,7 @@ 
          *
          * @return int|false length of $data or false if we need to stop the download
          */
-        return function (&$ch, $data) use ($url, &$content, &$thumbnail, &$isRedirected) {
+        return function(&$ch, $data) use ($url, &$content, &$thumbnail, &$isRedirected) {
             $content .= $data;
             $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
             if (!empty($responseCode) && in_array($responseCode, [301, 302])) {
@@ -111,7 +111,7 @@ 
             }
             // After a redirection, the content type will keep the previous request value
             // until it finds the next content-type header.
-            if (! $isRedirected || strpos(strtolower($data), 'content-type') !== false) {
+            if (!$isRedirected || strpos(strtolower($data), 'content-type') !== false) {
                 $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
             }
             // we look for image, and ignore application/octet-stream,
@@ -155,10 +155,10 @@ 
         $propertiesKey = ['property', 'name', 'itemprop'];
         $properties = implode('|', $propertiesKey);
         // Try to retrieve OpenGraph image.
-        $ogRegex = '#<meta[^>]+(?:' . $properties . ')=["\']?og:image["\'\s][^>]*content=["\']?(.*?)["\'\s>]#';
+        $ogRegex = '#<meta[^>]+(?:'.$properties.')=["\']?og:image["\'\s][^>]*content=["\']?(.*?)["\'\s>]#';
         // If the attributes are not in the order property => content (e.g. Github)
         // New regex to keep this readable... more or less.
-        $ogRegexReverse = '#<meta[^>]+content=["\']?([^"\'\s]+)[^>]+(?:' . $properties . ')=["\']?og:image["\'\s/>]#';
+        $ogRegexReverse = '#<meta[^>]+content=["\']?([^"\'\s]+)[^>]+(?:'.$properties.')=["\']?og:image["\'\s/>]#';
 
         if (
             preg_match($ogRegex, $content, $matches) > 0

src/WebThumbnailer/Finder/QueryRegexFinder.php

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
         }
 
         // With curl, the thumb is extracted during the download
-        if ($this->webAccess instanceof WebAccessCUrl && ! empty($thumbnail)) {
+        if ($this->webAccess instanceof WebAccessCUrl && !empty($thumbnail)) {
             return $thumbnail;
         }
 
@@ -116,7 +116,7 @@ 
          *
          * @return int|false length of $data or false if we need to stop the download
          */
-        return function (&$ch, $data) use (&$content, &$thumbnail, &$isRedirected) {
+        return function(&$ch, $data) use (&$content, &$thumbnail, &$isRedirected) {
             $content .= $data;
             $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
 
@@ -129,7 +129,7 @@ 
             }
             // After a redirection, the content type will keep the previous request value
             // until it finds the next content-type header.
-            if (! $isRedirected || strpos(strtolower($data), 'content-type') !== false) {
+            if (!$isRedirected || strpos(strtolower($data), 'content-type') !== false) {
                 $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
             }
             if (!empty($contentType) && strpos($contentType, 'text/html') === false) {
@@ -160,7 +160,7 @@ 
         if (preg_match($this->urlRegex, $content, $matches) !== 0) {
             $total = count($matches);
             for ($i = 1; $i < $total; $i++) {
-                $thumbnailUrl = str_replace('${' . $i . '}', $matches[$i], $thumbnailUrl);
+                $thumbnailUrl = str_replace('${'.$i.'}', $matches[$i], $thumbnailUrl);
             }
 
             // Match only options (not ${number})

src/WebThumbnailer/Application/WebAccess/WebAccessCUrl.php

Spacing +5 added lines, -5 removed lines

@@ -63,12 +63,12 @@ 
             $maxBytes = ConfigManager::get('settings.default.max_img_dl', 16777216);
         }
 
-        $cookie = ConfigManager::get('settings.path.cache') . '/cookie.txt';
+        $cookie = ConfigManager::get('settings.path.cache').'/cookie.txt';
         $userAgent =
             'Mozilla/5.0 (X11; Linux x86_64; rv:45.0; WebThumbnailer)'
             . ' Gecko/20100101 Firefox/45.0';
         $acceptLanguage =
-            substr(setlocale(LC_COLLATE, 0), 0, 2) . ',en-US;q=0.7,en;q=0.3';
+            substr(setlocale(LC_COLLATE, 0), 0, 2).',en-US;q=0.7,en;q=0.3';
         $maxRedirs = 6;
 
         $ch = curl_init($url);
@@ -83,7 +83,7 @@ 
         curl_setopt(
             $ch,
             CURLOPT_HTTPHEADER,
-            ['Accept-Language: ' . $acceptLanguage]
+            ['Accept-Language: '.$acceptLanguage]
         );
         curl_setopt($ch, CURLOPT_MAXREDIRS, $maxRedirs);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -100,7 +100,7 @@ 
         curl_setopt(
             $ch,
             CURLOPT_PROGRESSFUNCTION,
-            function ($arg0, $arg1, $arg2) use ($maxBytes) {
+            function($arg0, $arg1, $arg2) use ($maxBytes) {
                 $downloaded = $arg2;
                 // Non-zero return stops downloading
                 return ($downloaded > $maxBytes) ? 1 : 0;
@@ -121,7 +121,7 @@ 
         curl_close($ch);
 
         if (!is_string($response)) {
-            return [[0 => 'curl_exec() error #' . $errorNo . ': ' . $errorStr], false];
+            return [[0 => 'curl_exec() error #'.$errorNo.': '.$errorStr], false];
         }
 
         // Formatting output like the fallback method

src/WebThumbnailer/Application/CacheManager.php

Spacing +20 added lines, -20 removed lines

@@ -51,7 +51,7 @@ 
             static::rebuildCacheFolders();
             return static::getCachePath($type, true);
         } elseif (!$path) {
-            throw new IOException('Cache folders are not writable: ' . $cache);
+            throw new IOException('Cache folders are not writable: '.$cache);
         }
         return $path;
     }
@@ -94,12 +94,12 @@ 
         }
 
         if ($type === static::TYPE_THUMB) {
-            $suffix = $width . $height . ($crop ? '1' : '0') . '.jpg';
+            $suffix = $width.$height.($crop ? '1' : '0').'.jpg';
         } else {
-            $suffix = $width . $height;
+            $suffix = $width.$height;
         }
 
-        return $domainFolder . static::getThumbFilename($url) . $suffix;
+        return $domainFolder.static::getThumbFilename($url).$suffix;
     }
 
     /**
@@ -148,10 +148,10 @@ 
     protected static function createDomainThumbCacheFolder(string $domain, string $type): void
     {
         $cachePath = static::getCachePath($type);
-        $domainFolder = $cachePath . $domain;
+        $domainFolder = $cachePath.$domain;
         if (!file_exists($domainFolder)) {
             mkdir($domainFolder, 0775, false);
-            touch($domainFolder . '/' . static::$CLEAN_FILE);
+            touch($domainFolder.'/'.static::$CLEAN_FILE);
         }
         static::createHtaccessFile($cachePath, $type === static::TYPE_THUMB);
     }
@@ -169,13 +169,13 @@ 
     protected static function createHtaccessFile(string $path, bool $allowed = false): void
     {
         $apacheVersion = ConfigManager::get('settings.apache_version', '');
-        $htaccessFile = $path . '.htaccess';
+        $htaccessFile = $path.'.htaccess';
         if (file_exists($htaccessFile)) {
             return;
         }
-        $templateFile = file_exists(FileUtils::RESOURCES_PATH . 'htaccess' . $apacheVersion . '_template')
-            ? FileUtils::RESOURCES_PATH . 'htaccess' . $apacheVersion . '_template'
-            : FileUtils::RESOURCES_PATH . 'htaccess_template';
+        $templateFile = file_exists(FileUtils::RESOURCES_PATH.'htaccess'.$apacheVersion.'_template')
+            ? FileUtils::RESOURCES_PATH.'htaccess'.$apacheVersion.'_template'
+            : FileUtils::RESOURCES_PATH.'htaccess_template';
         $template = new \Text_Template($templateFile);
         $template->setVar([
             'new_all' => $allowed ? 'granted' : 'denied',
@@ -210,7 +210,7 @@ 
     protected static function checkCacheType(string $type): bool
     {
         if ($type != static::TYPE_THUMB && $type != static::TYPE_FINDER) {
-            throw new CacheException('Unknown cache type ' . $type);
+            throw new CacheException('Unknown cache type '.$type);
         }
 
         return true;
@@ -225,20 +225,20 @@ 
     protected static function rebuildCacheFolders(): void
     {
         $mainFolder = ConfigManager::get('settings.path.cache', 'cache/');
-        if (! is_dir($mainFolder)) {
+        if (!is_dir($mainFolder)) {
             mkdir($mainFolder, 0755);
         }
-        if (! is_dir($mainFolder . static::TYPE_THUMB)) {
-            mkdir($mainFolder . static::TYPE_THUMB, 0755);
+        if (!is_dir($mainFolder.static::TYPE_THUMB)) {
+            mkdir($mainFolder.static::TYPE_THUMB, 0755);
         }
-        if (! is_readable($mainFolder . static::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep')) {
-            touch($mainFolder . static::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep');
+        if (!is_readable($mainFolder.static::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep')) {
+            touch($mainFolder.static::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep');
         }
-        if (! is_dir($mainFolder . static::TYPE_FINDER)) {
-            mkdir($mainFolder . static::TYPE_FINDER, 0755);
+        if (!is_dir($mainFolder.static::TYPE_FINDER)) {
+            mkdir($mainFolder.static::TYPE_FINDER, 0755);
         }
-        if (! is_readable($mainFolder . static::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep')) {
-            touch($mainFolder . static::TYPE_FINDER . DIRECTORY_SEPARATOR . '.gitkeep');
+        if (!is_readable($mainFolder.static::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep')) {
+            touch($mainFolder.static::TYPE_FINDER.DIRECTORY_SEPARATOR.'.gitkeep');
         }
     }