Skip to content

Commit

Permalink
csfixed
Browse files Browse the repository at this point in the history
  • Loading branch information
hiqsol committed Aug 7, 2016
1 parent 56e6197 commit f7b9c92
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
17 changes: 9 additions & 8 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,41 @@ return Symfony\CS\Config\Config::create()
->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers([
'header_comment', /// Add, replace or remove header comment
'-long_array_syntax', /// Arrays should use the long syntax
'-php4_constructor', /// Convert PHP4-style constructors to __construct. Warning! This could change code behavior
'-phpdoc_var_to_type', /// @var should always be written as @type
'-align_double_arrow', /// Align double arrow symbols in consecutive lines
'-unalign_double_arrow', /// Unalign double arrow symbols in consecutive lines
'-align_equals', /// Align equals symbols in consecutive lines
'-unalign_equals', /// Unalign equals symbols in consecutive lines
'-blankline_after_open_tag', /// Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
'-phpdoc_no_empty_return', /// @return void and @return null annotations should be omitted from phpdocs
'-empty_return', /// A return statement wishing to return nothing should be simply "return"
'-return', /// An empty line feed should precede a return statement
'-blank_line_before_return', /// n empty line feed should precede a return statement
'-phpdoc_align', /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
'-phpdoc_params', /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
'-phpdoc_scalar', /// Scalar types should always be written in the same form. "int", not "integer"; "bool", not "boolean"
'-phpdoc_separation', /// Annotations of a different type are separated by a single blank line
'-phpdoc_to_comment', /// Docblocks should only be used on structural elements
'header_comment', /// Add, replace or remove header comment
'-method_argument_space', /// In method arguments and method call, there MUST NOT be a space before each comma and there MUST be one space after each comma
'-concat_without_spaces', /// Concatenation should be used without spaces
'concat_with_spaces', /// Concatenation should be used with at least one whitespace around
'ereg_to_preg', /// Replace deprecated ereg regular expression functions with preg. Warning! This could change code behavior
'multiline_spaces_before_semicolon', /// Multi-line whitespace before closing semicolon are prohibited
'newline_after_open_tag', /// Ensure there is no code on the same line as the PHP open tag
'blank_line_after_opening_tag', /// Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
'single_blank_line_before_namespace', /// There should be no blank lines before a namespace declaration
'ordered_use', /// Ordering use statements
'ordered_imports', /// Ordering use statements
'phpdoc_order', /// Annotations in phpdocs should be ordered so that @param come first, then @throws, then @return
'pre_increment', /// Pre incrementation/decrementation should be used if possible
'short_array_syntax', /// PHP arrays should use the PHP 5.4 short-syntax
'strict', /// Comparison should be strict. Warning! This could change code behavior
'strict_comparison', /// Comparison should be strict. (Risky fixer!)
'strict_param', /// Functions should be used with $strict param. Warning! This could change code behavior
'no_multiline_whitespace_before_semicolons', /// Multi-line whitespace before closing semicolon are prohibited
])
->finder(
Symfony\CS\Finder\DefaultFinder::create()
->in(__DIR__)
->notPath('vendor')
->notPath('runtime')
->notPath('web/assets')
->notPath('tests/unit/UnitTester.php')
)
;
1 change: 1 addition & 0 deletions src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public function createUrl($route = null)
{
$params = is_array($route) ? $route : [$route];
$params[0] = '/' . $this->id . '/' . (strpos($params[0], '/') !== false ? $params[0] : 'cart/' . ($params[0] ?: 'index'));

return Url::toRoute($params);
}

Expand Down
1 change: 1 addition & 0 deletions src/controllers/CartController.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public function actionUpdateQuantity()
$position = $this->getCart()->getPositionById($id);
if ($position) {
$this->getCart()->update($position, $quantity);

return $this->redirect('index');
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/views/cart/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
[
'attribute' => 'no',
'label' => '#',
'value' => function ($model) { static $no;return ++$no; },
'value' => function ($model) {
static $no;

return ++$no;
},
'headerOptions' => ['width' => '4%', 'style' => 'text-align: center'],
'contentOptions' => ['style' => 'text-align: center; vertical-align: middle;'],
],
Expand Down

0 comments on commit f7b9c92

Please sign in to comment.