Skip to content

Update php-csfixer rules to address problem in 2.7 & new multiline rule #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bighappyface merged 2 commits into from
Oct 2, 2017
Merged

Update php-csfixer rules to address problem in 2.7 & new multiline rule #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89a5d5
Update php-csfixer rules to address problem in 2.7 & new multiline rule
erayd Sep 30, 2017
d52247c
PHP-5.3 is not available on trusty, so explicitly specify precise for…
erayd Sep 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .php_cs.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $config
'@PSR2' => true,
'@Symfony' => true,
// additionally
'align_multiline_comment' => array('comment_type' => 'phpdocs_like'),
'array_syntax' => array('syntax' => 'long'),
'binary_operator_spaces' => false,
'concat_space' => array('spacing' => 'one'),
Expand All @@ -24,6 +25,7 @@ $config
'pre_increment' => false,
'trailing_comma_in_multiline_array' => false,
'simplified_null_return' => false,
'yoda_style' => null,
))
->setFinder($finder)
;
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ matrix:
fast_finish: true
include:
- php: 5.3
dist: precise
- php: 5.4
- php: 5.5
- php: 5.6
Expand Down
12 changes: 6 additions & 6 deletions src/JsonSchema/Constraints/CollectionConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ protected function validateItems(&$value, $schema = null, JsonPointer $path = nu

$validator->check($v, $schema->items, $k_path, $i);
}
unset($v); // remove dangling reference to prevent any future bugs
// caused by accidentally using $v elsewhere
unset($v); /* remove dangling reference to prevent any future bugs
* caused by accidentally using $v elsewhere */
$this->addErrors($typeValidator->getErrors());
$this->addErrors($validator->getErrors());
} else {
Expand All @@ -110,8 +110,8 @@ protected function validateItems(&$value, $schema = null, JsonPointer $path = nu
$this->errors = $initErrors;
}
}
unset($v); // remove dangling reference to prevent any future bugs
// caused by accidentally using $v elsewhere
unset($v); /* remove dangling reference to prevent any future bugs
* caused by accidentally using $v elsewhere */
}
} else {
// Defined item type definitions
Expand Down Expand Up @@ -140,8 +140,8 @@ protected function validateItems(&$value, $schema = null, JsonPointer $path = nu
}
}
}
unset($v); // remove dangling reference to prevent any future bugs
// caused by accidentally using $v elsewhere
unset($v); /* remove dangling reference to prevent any future bugs
* caused by accidentally using $v elsewhere */

// Treat when we have more schema definitions than values, not for empty arrays
if (count($value) > 0) {
Expand Down