Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
@StyleCIBot
Paramtamtam authored and StyleCIBot committed Aug 1, 2017
1 parent 98f64da commit 90f5888
Showing 1 changed file with 141 additions and 141 deletions.
282 changes: 141 additions & 141 deletions app/Services/HostsParser/HostsParser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace App\Services\HostsParser;

use Carbon\Carbon;
use Exception;
use Carbon\Carbon;
use GuzzleHttp\Client;
use Illuminate\Support\Str;
use Psr\Http\Message\ResponseInterface;
Expand Down Expand Up @@ -118,7 +118,7 @@ public function addSource($source_uri)

foreach ((array) $source_uri as $uri) {
$uri = urldecode($uri);
if ($this->isValidUri($uri) && !in_array($uri, $this->sources_list)) {
if ($this->isValidUri($uri) && ! in_array($uri, $this->sources_list)) {
array_push($this->sources_list, $uri);
}
}
Expand All @@ -138,43 +138,6 @@ public function isValidUri($uri)
return $this->validate($uri, 'url');
}

/**
* @param string $value
* @param string|string[] $rules
*
* @return bool
*/
protected function validate($value, $rules)
{
static $stack = [];

if (is_array($rules) && !empty($rules)) {
$rules = implode('|', $rules);
}

if (is_string($value) && !empty($value) && is_string($rules) && !empty($rules)) {
if (!isset($stack[$value])) {
$stack[$value] = !$this->getValidationFactory()
->make(['value' => $value], ['value' => 'required|' . $rules])
->fails();
}

return (bool) $stack[$value];
}

return false;
}

/**
* Get a validation factory instance.
*
* @return \Illuminate\Contracts\Validation\Factory
*/
protected function getValidationFactory()
{
return app('validator');
}

/**
* Add hostname to the excluded hosts stack.
*
Expand All @@ -190,7 +153,7 @@ public function addExcludedHosts($hosts_names)

foreach ((array) $hosts_names as $hostname) {
$hostname = urldecode(trim($hostname));
if ($this->isValidHostname($hostname) && !in_array($hostname, $this->excluded_hosts)) {
if ($this->isValidHostname($hostname) && ! in_array($hostname, $this->excluded_hosts)) {
array_push($this->excluded_hosts, $hostname);
}
}
Expand All @@ -209,8 +172,8 @@ public function isValidHostname($hostname)
{
//static $regexp = '((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*'
// . '([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))';
if (is_string($hostname) && !empty($hostname)) {
if (strpos($hostname, ' ') === false) { // It's faster
if (is_string($hostname) && ! empty($hostname)) {
if (mb_strpos($hostname, ' ') === false) { // It's faster
//if ((bool) preg_match('/^' . $regexp . '$/', $hostname)) {
return true;
}
Expand Down Expand Up @@ -275,7 +238,7 @@ public function makeRequest($uri)
$http_client = new Client($this->getDefaultHttpClientOptions());
$response = $http_client->request('get', $uri);
$content = $this->normalizeNewLineCodes($response->getBody()->getContents());
if (is_string($content) && !empty($content)) {
if (is_string($content) && ! empty($content)) {
if ($this->cache_enabled) {
$this->getCacheRepository()
->put($cache_key, $content, (int) config('limits.source.cache.lifetime', 600));
Expand All @@ -289,22 +252,6 @@ public function makeRequest($uri)
return false;
}

/**
* Get a cache repository instance.
*
* @return \Illuminate\Cache\Repository
*/
protected function getCacheRepository()
{
static $instance = null;

if (is_null($instance)) {
$instance = app('cache');
}

return $instance;
}

/**
* Add comment message.
*
Expand All @@ -321,67 +268,6 @@ public function addComment($messages)
return $this;
}

/**
* Get default HTTP client options.
*
* @return array
*/
protected function getDefaultHttpClientOptions()
{
return [
'timeout' => $this->getHttpClientTimeout(),
'connect_timeout' => $this->getHttpClientTimeout(),

'allow_redirects' => [
'max' => config('limits.max_redirects_count', 5),
'protocols' => config('limits.sources_protocols', ['http', 'https']),
],

'headers' => [
'User-Agent' => $this->getUserAgent(),
],

// Cancel download, if found header with value in content-length more then we have in config
'on_headers' => function (ResponseInterface $response) {
$content_length = $response->getHeaderLine('Content-Length');
if (!empty($content_length) && is_scalar($content_length)) {
if ((intval($content_length, 10) / 1024) > $this->getDownloadFileSizeLimit()) {
throw new Exception('The file is too big (detected by header "Content-Length")');
}
}

$content_type = $response->getHeaderLine('Content-Type');
if (!empty($content_type) && is_scalar($content_type)) {
if (!Str::contains(Str::lower((string) $content_type), 'text/plain')) {
throw new Exception(sprintf('Invalid content type header (%s)', $content_type));
}
}
},

// Cancel download, if downloaded content size more then limit, declared in config
'progress' => function ($download_total, $downloaded_bytes) {
if ((intval($downloaded_bytes, 10) / 1024) > $this->getDownloadFileSizeLimit()) {
throw new Exception('The file is too big (detected by "progress" callback)');
}
},

// Set to false to disable throwing exceptions on an HTTP protocol errors (i.e., 4xx and 5xx responses)
'http_errors' => true,

'verify' => false,
];
}

/**
* Get HTTP client timeout.
*
* @return int
*/
protected function getHttpClientTimeout()
{
return 10;
}

/**
* Get user-agent string fo a work.
*
Expand All @@ -393,22 +279,6 @@ public function getUserAgent()
. 'Safari/537.32';
}

/**
* Get download file size limit (in kilobytes).
*
* @return int
*/
protected function getDownloadFileSizeLimit()
{
static $limit = null;

if (is_null($limit)) {
$limit = (int) config('limits.source_file_size', 2048);
}

return $limit;
}

/**
* Normalize new line characters.
*
Expand All @@ -418,7 +288,7 @@ protected function getDownloadFileSizeLimit()
*/
public function normalizeNewLineCodes($string)
{
if (is_scalar($string) && !empty($string)) {
if (is_scalar($string) && ! empty($string)) {
return (string) preg_replace(
"/\n{2,}/",
"\n\n",
Expand All @@ -438,7 +308,7 @@ public function addHostsNames($hosts_names)
{
foreach ((array) $hosts_names as $hostname) {
$hostname = urldecode(trim($hostname));
if ($this->isValidHostname($hostname) && !in_array($hostname, $this->hosts)) {
if ($this->isValidHostname($hostname) && ! in_array($hostname, $this->hosts)) {
array_push($this->hosts, $hostname);
}
}
Expand All @@ -457,11 +327,11 @@ public function extractHostsNamesFromHostsFile($raw_content)
{
$result = [];

if (is_string($raw_content) && !empty($raw_content)) {
if (is_string($raw_content) && ! empty($raw_content)) {
$pattern = '~([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})[\s\t]+(?P<domain_names>[^\s\\\/]+)~m';
preg_match_all($pattern, $raw_content, $matches);

if (isset($matches['domain_names']) && !empty($matches['domain_names'])) {
if (isset($matches['domain_names']) && ! empty($matches['domain_names'])) {
$result = array_filter(array_map(function ($hostname) {
$hostname = urldecode(trim($hostname));

Expand Down Expand Up @@ -538,7 +408,7 @@ public function render($limit = 0, $entry_comment = 'ADBlock', $format = 'router

$entry_comment = str_replace(' ', '', $entry_comment);
foreach ($hosts as $host) {
// $result .= sprintf(
// $result .= sprintf(
// "add address=%s name=%s comment=%s\n",
// $this->redirect_to,
// $host,
Expand Down Expand Up @@ -571,4 +441,134 @@ public function getExcludedHosts()
{
return $this->excluded_hosts;
}

/**
* @param string $value
* @param string|string[] $rules
*
* @return bool
*/
protected function validate($value, $rules)
{
static $stack = [];

if (is_array($rules) && ! empty($rules)) {
$rules = implode('|', $rules);
}

if (is_string($value) && ! empty($value) && is_string($rules) && ! empty($rules)) {
if (! isset($stack[$value])) {
$stack[$value] = ! $this->getValidationFactory()
->make(['value' => $value], ['value' => 'required|' . $rules])
->fails();
}

return (bool) $stack[$value];
}

return false;
}

/**
* Get a validation factory instance.
*
* @return \Illuminate\Contracts\Validation\Factory
*/
protected function getValidationFactory()
{
return app('validator');
}

/**
* Get a cache repository instance.
*
* @return \Illuminate\Cache\Repository
*/
protected function getCacheRepository()
{
static $instance = null;

if (is_null($instance)) {
$instance = app('cache');
}

return $instance;
}

/**
* Get default HTTP client options.
*
* @return array
*/
protected function getDefaultHttpClientOptions()
{
return [
'timeout' => $this->getHttpClientTimeout(),
'connect_timeout' => $this->getHttpClientTimeout(),

'allow_redirects' => [
'max' => config('limits.max_redirects_count', 5),
'protocols' => config('limits.sources_protocols', ['http', 'https']),
],

'headers' => [
'User-Agent' => $this->getUserAgent(),
],

// Cancel download, if found header with value in content-length more then we have in config
'on_headers' => function (ResponseInterface $response) {
$content_length = $response->getHeaderLine('Content-Length');
if (! empty($content_length) && is_scalar($content_length)) {
if ((intval($content_length, 10) / 1024) > $this->getDownloadFileSizeLimit()) {
throw new Exception('The file is too big (detected by header "Content-Length")');
}
}

$content_type = $response->getHeaderLine('Content-Type');
if (! empty($content_type) && is_scalar($content_type)) {
if (! Str::contains(Str::lower((string) $content_type), 'text/plain')) {
throw new Exception(sprintf('Invalid content type header (%s)', $content_type));
}
}
},

// Cancel download, if downloaded content size more then limit, declared in config
'progress' => function ($download_total, $downloaded_bytes) {
if ((intval($downloaded_bytes, 10) / 1024) > $this->getDownloadFileSizeLimit()) {
throw new Exception('The file is too big (detected by "progress" callback)');
}
},

// Set to false to disable throwing exceptions on an HTTP protocol errors (i.e., 4xx and 5xx responses)
'http_errors' => true,

'verify' => false,
];
}

/**
* Get HTTP client timeout.
*
* @return int
*/
protected function getHttpClientTimeout()
{
return 10;
}

/**
* Get download file size limit (in kilobytes).
*
* @return int
*/
protected function getDownloadFileSizeLimit()
{
static $limit = null;

if (is_null($limit)) {
$limit = (int) config('limits.source_file_size', 2048);
}

return $limit;
}
}

0 comments on commit 90f5888

Please sign in to comment.