Skip to content

Commit

Permalink
CS fix
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuravljov committed Apr 27, 2018
1 parent a5f473e commit c9ba0cb
Show file tree
Hide file tree
Showing 83 changed files with 387 additions and 239 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 80

[*.md]
trim_trailing_whitespace = false
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ vendor

# composer lock files
composer.lock

# PHP CS Fixer
.php_cs.cache
124 changes: 124 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?php
$header = <<<'EOF'
@link http://www.yiiframework.com/
@copyright Copyright (c) 2008 Yii Software LLC
@license http://www.yiiframework.com/license/
EOF;

$finder = PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
;

return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@PSR2' => true,
'array_syntax' => [
'syntax' => 'short',
],
'binary_operator_spaces' => [
'align_double_arrow' => false,
'align_equals' => false,
],
'blank_line_after_opening_tag' => true,
'cast_spaces' => true,
'concat_space' => [
'spacing' => 'one',
],
'dir_constant' => true,
'ereg_to_preg' => true,
'function_typehint_space' => true,
'hash_to_slash_comment' => true,
'include' => true,
'heredoc_to_nowdoc' => true,
'is_null' => [
'use_yoda_style' => false,
],
'linebreak_after_opening_tag' => true,
'lowercase_cast' => true,
'magic_constant_casing' => true,
'modernize_types_casting' => true,
'native_function_casing' => true,
'new_with_braces' => true,
'no_alias_functions' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_consecutive_blank_lines' => [
'tokens' => [
'break',
'continue',
'return',
'throw',
'use',
'use_trait',
'parenthesis_brace_block',
'square_brace_block',
],
],
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_multiline_whitespace_before_semicolons' => true,
'no_php4_constructor' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_around_offset' => true,
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'non_printable_character' => true,
'normalize_index_brace' => true,
'object_operator_without_whitespace' => true,
'ordered_imports' => [
'sortAlgorithm' => 'alpha',
'importsOrder' => [
'const',
'function',
'class',
],
],
'php_unit_construct' => true,
'php_unit_dedicate_assert' => true,
'php_unit_fqcn_annotation' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_indent' => true,
'phpdoc_no_access' => true,
'phpdoc_no_empty_return' => true,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_return_self_reference' => true,
'phpdoc_scalar' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_trim' => true,
'phpdoc_types' => true,
'phpdoc_var_without_name' => false,
'protected_to_private' => true,
'psr4' => true,
'self_accessor' => true,
'short_scalar_cast' => true,
'single_blank_line_before_namespace' => true,
'single_quote' => true,
'standardize_not_equals' => true,
'ternary_operator_spaces' => true,
'trailing_comma_in_multiline_array' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'whitespace_after_comma_in_array' => true,
'header_comment' => [
'header' => $header,
'commentType' => 'PHPDoc',
'separate' => 'bottom',
],
])
->setFinder($finder)
;
4 changes: 2 additions & 2 deletions src/ErrorEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace yii\queue;

/**
* Class ErrorEvent
* Error Event.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand All @@ -22,4 +22,4 @@ class ErrorEvent extends ExecEvent
* @var bool
*/
public $retry;
}
}
2 changes: 1 addition & 1 deletion src/ExecEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace yii\queue;

/**
* Class ExecEvent
* Exec Event.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Job.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
namespace yii\queue;

/**
* Interface Job
* Job Interface.
*
* @deprecated Will be removed in 2.1.0. Use JobInterface instead of Job.
*
* @author Roman Zhuravlev <[email protected]>
*/
interface Job extends JobInterface
{
}
}
4 changes: 2 additions & 2 deletions src/JobEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use yii\base\Event;

/**
* Class JobEvent
* Job Event.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand All @@ -33,4 +33,4 @@ class JobEvent extends Event
* @var int time to reserve in seconds of the job
*/
public $ttr;
}
}
4 changes: 2 additions & 2 deletions src/JobInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace yii\queue;

/**
* Interface JobInterface
* Job Interface.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand All @@ -18,4 +18,4 @@ interface JobInterface
* @param Queue $queue which pushed and is handling the job
*/
public function execute($queue);
}
}
2 changes: 1 addition & 1 deletion src/LogBehavior.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use yii\base\Behavior;

/**
* Class LogBehavior
* Log Behavior.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand Down
4 changes: 2 additions & 2 deletions src/PushEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace yii\queue;

/**
* Class PushEvent
* Push Event.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand All @@ -22,4 +22,4 @@ class PushEvent extends JobEvent
* @var mixed
*/
public $priority;
}
}
17 changes: 8 additions & 9 deletions src/Queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use yii\queue\serializers\SerializerInterface;

/**
* Base Queue
* Base Queue.
*
* @property null|int $workerPid
* @since 2.0.2
Expand Down Expand Up @@ -92,7 +92,7 @@ public function init()
}

/**
* Sets TTR for job execute
* Sets TTR for job execute.
*
* @param int|mixed $value
* @return $this
Expand All @@ -104,7 +104,7 @@ public function ttr($value)
}

/**
* Sets delay for later execute
* Sets delay for later execute.
*
* @param int|mixed $value
* @return $this
Expand All @@ -116,7 +116,7 @@ public function delay($value)
}

/**
* Sets job priority
* Sets job priority.
*
* @param mixed $value
* @return $this
Expand All @@ -128,7 +128,7 @@ public function priority($value)
}

/**
* Pushes job into queue
* Pushes job into queue.
*
* @param JobInterface|mixed $job
* @return string|null id of a job message
Expand Down Expand Up @@ -177,7 +177,6 @@ abstract protected function pushMessage($message, $ttr, $delay, $priority);
/**
* Uses for CLI drivers and gets process ID of a worker.
*
* @return null
* @since 2.0.2
*/
public function getWorkerPid()
Expand Down Expand Up @@ -255,7 +254,7 @@ public function handleError($id, $job, $ttr, $attempt, $error)
*/
public function isWaiting($id)
{
return $this->status($id) === Queue::STATUS_WAITING;
return $this->status($id) === self::STATUS_WAITING;
}

/**
Expand All @@ -264,7 +263,7 @@ public function isWaiting($id)
*/
public function isReserved($id)
{
return $this->status($id) === Queue::STATUS_RESERVED;
return $this->status($id) === self::STATUS_RESERVED;
}

/**
Expand All @@ -273,7 +272,7 @@ public function isReserved($id)
*/
public function isDone($id)
{
return $this->status($id) === Queue::STATUS_DONE;
return $this->status($id) === self::STATUS_DONE;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/RetryableJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
namespace yii\queue;

/**
* Interface RetryableJob
* Retryable Job Interface.
*
* @deprecated Will be removed in 2.1.0. Use RetryableJobInterface instead of RetryableJob.
*
* @author Roman Zhuravlev <[email protected]>
*/
interface RetryableJob extends RetryableJobInterface
{
}
}
4 changes: 2 additions & 2 deletions src/RetryableJobInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace yii\queue;

/**
* Interface RetryableJobInterface
* Retryable Job Interface.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand All @@ -25,4 +25,4 @@ public function getTtr();
* @return bool
*/
public function canRetry($attempt, $error);
}
}
4 changes: 2 additions & 2 deletions src/cli/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use yii\console\Controller as ConsoleController;

/**
* Class Action
* Base Command Action.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand Down Expand Up @@ -54,4 +54,4 @@ protected function format($string)
{
return call_user_func_array([$this->controller, 'ansiFormat'], func_get_args());
}
}
}
4 changes: 2 additions & 2 deletions src/cli/Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use yii\console\ExitCode;

/**
* Class Command
* Base Command.
*
* @author Roman Zhuravlev <[email protected]>
*/
Expand Down Expand Up @@ -153,7 +153,7 @@ public function actionExec($id, $ttr, $attempt, $pid)
*/
protected function handleMessage($id, $message, $ttr, $attempt)
{
// Executes child process
// Executes child process
$cmd = strtr('php yii queue/exec "id" "ttr" "attempt" "pid"', [
'php' => $this->phpBinary,
'yii' => $_SERVER['SCRIPT_FILENAME'],
Expand Down
Loading

0 comments on commit c9ba0cb

Please sign in to comment.