ArthurHoaro / web-thumbnailer

src/WebThumbnailer/Utils/ImageUtils.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
      */
     public static function generateThumbnail($imageStr, $target, $maxWidth, $maxHeight, $crop = false)
     {
-        if (! touch($target)) {
+        if (!touch($target)) {
             throw new ImageConvertException('Target file is not writable.');
         }
 
-        if ($crop && ($maxWidth == 0  || $maxHeight == 0)) {
+        if ($crop && ($maxWidth == 0 || $maxHeight == 0)) {
             throw new ImageConvertException('Both width and height must be provided for cropping');
         }
 
@@ -67,7 +67,7 @@ 
             throw new ImageConvertException('Could not generate the thumbnail from source image.');
         }
 
-        if (! imagecopyresized(
+        if (!imagecopyresized(
             $targetImg,
             $sourceImg,
             0,
@@ -108,7 +108,7 @@ 
         $diffHeight = !empty($maxHeight) ? $originalHeight - $maxHeight : false;
 
         if (($diffHeight === false && $diffWidth !== false)
-            || ($diffWidth > $diffHeight && ! $crop)
+            || ($diffWidth > $diffHeight && !$crop)
             || ($diffWidth < $diffHeight && $crop)
         ) {
             $finalWidth = $maxWidth;

src/WebThumbnailer/Finder/FinderCommon.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
     protected function replaceOption($thumbnailUrl, $option)
     {
         $chosenOption = $this->getOptionValue($option);
-        return str_replace('${'. $option .'}', $chosenOption, $thumbnailUrl);
+        return str_replace('${'.$option.'}', $chosenOption, $thumbnailUrl);
     }
 
     /**
@@ -72,13 +72,13 @@ 
     protected function getOptionValue($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])
+        if (!empty($this->userOptions[$option])
             && is_string($this->userOptions[$option])
             && isset($this->finderOptions[$option][$this->userOptions[$option]]['param'])
         ) {
@@ -86,15 +86,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);
         }
 
@@ -106,7 +106,7 @@ 
      */
     public function isHotlinkAllowed()
     {
-        if (! isset($this->finderOptions['hotlink_allowed'])
+        if (!isset($this->finderOptions['hotlink_allowed'])
             ||  $this->finderOptions['hotlink_allowed'] === true
         ) {
             return true;

src/WebThumbnailer/Application/WebAccess/WebAccessCUrl.php

Spacing +6 added lines, -6 removed lines

@@ -59,12 +59,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);
@@ -79,7 +79,7 @@ 
         curl_setopt(
             $ch,
             CURLOPT_HTTPHEADER,
-            ['Accept-Language: ' . $acceptLanguage]
+            ['Accept-Language: '.$acceptLanguage]
         );
         curl_setopt($ch, CURLOPT_MAXREDIRS, $maxRedirs);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -91,12 +91,12 @@ 
         curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie);
 
         // Max download size management
-        curl_setopt($ch, CURLOPT_BUFFERSIZE, 1024*16);
+        curl_setopt($ch, CURLOPT_BUFFERSIZE, 1024 * 16);
         curl_setopt($ch, CURLOPT_NOPROGRESS, false);
         curl_setopt(
             $ch,
             CURLOPT_PROGRESSFUNCTION,
-            function ($arg0, $arg1, $arg2, $arg3, $arg4 = 0) use ($maxBytes) {
+            function($arg0, $arg1, $arg2, $arg3, $arg4 = 0) use ($maxBytes) {
                 $downloaded = $arg2;
                 // Non-zero return stops downloading
                 return ($downloaded > $maxBytes) ? 1 : 0;
@@ -117,7 +117,7 @@ 
         curl_close($ch);
 
         if ($response === false) {
-            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/Thumbnailer.php

Spacing +9 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
         }
 
         if (empty($thumburl)) {
-            $error = 'No thumbnail could be found using '. $this->finder->getName() .' finder: '. $this->url;
+            $error = 'No thumbnail could be found using '.$this->finder->getName().' finder: '.$this->url;
             throw new ThumbnailNotFoundException($error);
         }
 
@@ -139,7 +139,7 @@ 
      */
     protected function thumbnailStrictHotlink($thumburl)
     {
-        if (! $this->finder->isHotlinkAllowed()) {
+        if (!$this->finder->isHotlinkAllowed()) {
             throw new ThumbnailNotFoundException('Hotlink is not supported for this URL.');
         }
         return $thumburl;
@@ -158,7 +158,7 @@ 
      */
     protected function thumbnailHotlink($thumburl)
     {
-        if (! $this->finder->isHotlinkAllowed()) {
+        if (!$this->finder->isHotlinkAllowed()) {
             return $this->thumbnailDownload($thumburl);
         }
         return $thumburl;
@@ -209,13 +209,13 @@ 
 
         if (strpos($headers[0], '200') === false) {
             throw new DownloadException(
-                'Unreachable thumbnail URL. HTTP '. $headers[0] .'.'. PHP_EOL .
-                ' - thumbnail URL: '. $thumburl
+                'Unreachable thumbnail URL. HTTP '.$headers[0].'.'.PHP_EOL.
+                ' - thumbnail URL: '.$thumburl
             );
         }
 
         if (empty($data)) {
-            throw new DownloadException('Couldn\'t download the thumbnail at '. $thumburl);
+            throw new DownloadException('Couldn\'t download the thumbnail at '.$thumburl);
         }
 
         // Resize and save it locally.
@@ -227,7 +227,7 @@ 
             $this->options[WebThumbnailer::CROP]
         );
 
-        if (! is_file($thumbPath)) {
+        if (!is_file($thumbPath)) {
             throw new ImageConvertException('Thumbnail was not generated.');
         }
 
@@ -307,7 +307,7 @@ 
     {
         // Width
         $width = 0;
-        if (! empty($options[WebThumbnailer::MAX_WIDTH])) {
+        if (!empty($options[WebThumbnailer::MAX_WIDTH])) {
             if (SizeUtils::isMetaSize($options[WebThumbnailer::MAX_WIDTH])) {
                 $width = SizeUtils::getMetaSize($options[WebThumbnailer::MAX_WIDTH]);
             } elseif (is_int($options[WebThumbnailer::MAX_WIDTH])
@@ -357,7 +357,7 @@ 
             if (count(array_intersect($incompatibleFlags, $options)) > 1) {
                 $error = 'Only one of these flags can be set between: ';
                 foreach ($incompatibleFlags as $flag) {
-                    $error .= $flag .' ';
+                    $error .= $flag.' ';
                 }
                 throw new BadRulesException($error);
             }

src/WebThumbnailer/Finder/DefaultFinder.php

Spacing +7 added lines, -7 removed lines

@@ -62,16 +62,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) ? self::extractMetaTag($content) : false;
+        return !empty($content) ? self::extractMetaTag($content) : false;
     }
 
     /**
@@ -101,7 +101,7 @@ 
          *
          * @return int|bool 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])) {
@@ -113,7 +113,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
             || preg_match($ogRegexReverse, $content, $matches) > 0

src/WebThumbnailer/Utils/UrlUtils.php

Spacing +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
      */
     public static function getDomain($url)
     {
-        if (! parse_url($url, PHP_URL_SCHEME)) {
-            $url = 'http://' . $url;
+        if (!parse_url($url, PHP_URL_SCHEME)) {
+            $url = 'http://'.$url;
         }
         return strtolower(parse_url($url, PHP_URL_HOST));
     }

src/WebThumbnailer/Application/ConfigManager.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
      * @var array List of JSON configuration file path.
      */
     public static $configFiles = [
-        FileUtils::RESOURCES_PATH . 'settings.json',
+        FileUtils::RESOURCES_PATH.'settings.json',
     ];
 
     /**
@@ -67,7 +67,7 @@ 
     public static function clear()
     {
         self::$configFiles = [
-            FileUtils::RESOURCES_PATH . 'settings.json',
+            FileUtils::RESOURCES_PATH.'settings.json',
         ];
         self::reload();
     }
@@ -109,7 +109,7 @@ 
      */
     protected static function getConfig($settings, $config)
     {
-        if (! is_array($settings) || count($settings) == 0) {
+        if (!is_array($settings) || count($settings) == 0) {
             return self::$NOT_FOUND;
         }
 

src/WebThumbnailer/Application/CacheManager.php

Spacing +20 added lines, -20 removed lines

@@ -26,7 +26,7 @@ 
     /**
      * Thumbnails image cache.
      */
-    const TYPE_THUMB  = 'thumb';
+    const TYPE_THUMB = 'thumb';
     /**
      * Finder cache.
      */
@@ -56,7 +56,7 @@ 
             self::rebuildCacheFolders();
             return self::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;
     }
@@ -86,11 +86,11 @@ 
         self::createDomainThumbCacheFolder($domainHash, $type);
         $domainFolder = FileUtils::getPath(self::getCachePath($type), $domainHash);
         if ($type === self::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 . self::getThumbFilename($url) . $suffix;
+        return $domainFolder.self::getThumbFilename($url).$suffix;
     }
 
     /**
@@ -108,7 +108,7 @@ 
     public static function isCacheValid($cacheFile, $domain, $type)
     {
         $out = false;
-        $cacheDuration = ConfigManager::get('settings.cache_duration', 3600*24*31);
+        $cacheDuration = ConfigManager::get('settings.cache_duration', 3600 * 24 * 31);
 
         if (is_readable($cacheFile)
             && ($cacheDuration < 0 || (time() - filemtime($cacheFile)) < $cacheDuration)
@@ -130,10 +130,10 @@ 
     protected static function createDomainThumbCacheFolder($domain, $type)
     {
         $cachePath = self::getCachePath($type);
-        $domainFolder = $cachePath . $domain;
+        $domainFolder = $cachePath.$domain;
         if (!file_exists($domainFolder)) {
             mkdir($domainFolder, 0775, false);
-            touch($domainFolder . '/' . self::$CLEAN_FILE);
+            touch($domainFolder.'/'.self::$CLEAN_FILE);
         }
         self::createHtaccessFile($cachePath, $type === self::TYPE_THUMB);
     }
@@ -148,13 +148,13 @@ 
     protected static function createHtaccessFile($path, $allowed = false)
     {
         $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',
@@ -187,7 +187,7 @@ 
     protected static function checkCacheType($type)
     {
         if ($type != self::TYPE_THUMB && $type != self::TYPE_FINDER) {
-            throw new CacheException('Unknown cache type '. $type);
+            throw new CacheException('Unknown cache type '.$type);
         }
     }
 
@@ -197,19 +197,19 @@ 
     protected static function rebuildCacheFolders()
     {
         $mainFolder = ConfigManager::get('settings.path.cache', 'cache/');
-        if (! is_dir($mainFolder)) {
+        if (!is_dir($mainFolder)) {
             mkdir($mainFolder, 0755);
         }
-        if (! is_dir($mainFolder.self::TYPE_THUMB)) {
+        if (!is_dir($mainFolder.self::TYPE_THUMB)) {
             mkdir($mainFolder.self::TYPE_THUMB, 0755);
         }
-        if (! is_readable($mainFolder . self::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep')) {
-            touch($mainFolder . self::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep');
+        if (!is_readable($mainFolder.self::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep')) {
+            touch($mainFolder.self::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep');
         }
-        if (! is_dir($mainFolder.self::TYPE_FINDER)) {
-            mkdir($mainFolder . self::TYPE_FINDER, 0755);
+        if (!is_dir($mainFolder.self::TYPE_FINDER)) {
+            mkdir($mainFolder.self::TYPE_FINDER, 0755);
         }
-        if (! is_readable($mainFolder . self::TYPE_THUMB . DIRECTORY_SEPARATOR . '.gitkeep')) {
+        if (!is_readable($mainFolder.self::TYPE_THUMB.DIRECTORY_SEPARATOR.'.gitkeep')) {
             touch($mainFolder.self::TYPE_FINDER.DIRECTORY_SEPARATOR.'.gitkeep');
         }
     }

src/WebThumbnailer/Finder/FinderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         try {
             list($domain, $finder, $rules, $options) = self::getThumbnailMeta($domain, $url);
 
-            $className = '\\WebThumbnailer\\Finder\\' . $finder . 'Finder';
+            $className = '\\WebThumbnailer\\Finder\\'.$finder.'Finder';
             if (!class_exists($className)) {
                 throw new UnsupportedDomainException();
             }
@@ -67,7 +67,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;