Skip to content

Commit 09a8b77

Browse files
committed
Merge branch 'master' of github.com:zbateson/mb-wrapper
2 parents 99220c6 + d99d47a commit 09a8b77

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

.gitattributes

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
* text=auto
2+
3+
# Path-based git attributes
4+
# https://git-scm.com/docs/gitattributes
5+
6+
# Ignore all test and documentation with "export-ignore".
7+
/.gitattributes export-ignore
8+
/.github export-ignore
9+
/.gitignore export-ignore
10+
/.php-cs-fixer.dist.php export-ignore
11+
/phpstan.neon export-ignore
12+
/PhpCsFixer.php export-ignore
13+
/tests export-ignore

PhpCsFixer.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
// Comments with annotation should be docblock when used on structural elements.
4343
'comment_to_phpdoc' => false,
4444
// Remove extra spaces in a nullable typehint.
45-
'compact_nullable_typehint' => true,
45+
'compact_nullable_type_declaration' => true,
4646
// Concatenation should be spaced according configuration.
4747
'concat_space' => ['spacing'=>'one'],
4848
// The PHP constants `true`, `false`, and `null` MUST be written using the correct casing.
@@ -70,7 +70,7 @@
7070
// Replace core functions calls returning constants with the constants.
7171
'function_to_constant' => true,
7272
// Ensure single space between function's argument and its typehint.
73-
'function_typehint_space' => true,
73+
'type_declaration_spaces' => true,
7474
// Renames PHPDoc tags.
7575
'general_phpdoc_tag_rename' => true,
7676
// Function `implode` must be called with 2 arguments in the documented order.
@@ -112,9 +112,9 @@
112112
// Add leading `\` before function invocation to speed up resolving.
113113
'native_function_invocation' => ['include'=>['@all','trans']],
114114
// Native type hints for functions should use the correct case.
115-
'native_function_type_declaration_casing' => true,
115+
'native_type_declaration_casing' => true,
116116
// All instances created with new keyword must be followed by braces.
117-
'new_with_braces' => true,
117+
'new_with_parentheses' => true,
118118
// Master functions shall be used instead of aliases.
119119
'no_alias_functions' => true,
120120
// Master language constructs shall be used instead of aliases.
@@ -149,8 +149,6 @@
149149
'no_short_bool_cast' => true,
150150
// When making a method or function call, there MUST NOT be a space between the method or function name and the opening parenthesis.
151151
'no_spaces_after_function_name' => true,
152-
// There MUST NOT be a space after the opening parenthesis. There MUST NOT be a space before the closing parenthesis.
153-
'no_spaces_inside_parenthesis' => true,
154152
// Removes `@param`, `@return` and `@var` tags that don't provide any useful information.
155153
'no_superfluous_phpdoc_tags' => true,
156154
// Remove trailing whitespace at the end of non-blank lines.
@@ -160,15 +158,15 @@
160158
// Removes unneeded parentheses around control statements.
161159
'no_unneeded_control_parentheses' => false,
162160
// Removes unneeded curly braces that are superfluous and aren't part of a control structure's body.
163-
'no_unneeded_curly_braces' => true,
161+
'no_unneeded_braces' => true,
164162
// A `final` class must not have `final` methods and `private` methods must not be `final`.
165163
'no_unneeded_final_method' => true,
166164
// In function arguments there must not be arguments with default values before non-default ones.
167165
'no_unreachable_default_argument_value' => true,
168166
// Variables must be set `null` instead of using `(unset)` casting.
169167
'no_unset_cast' => true,
170168
// Properties should be set to `null` instead of using `unset`.
171-
'no_unset_on_property' => true,
169+
'no_unset_on_property' => false,
172170
// Unused `use` statements must be removed.
173171
'no_unused_imports' => true,
174172
// There should not be useless `else` cases.
@@ -230,7 +228,7 @@
230228
// A PHP file without end tag must always end with a single empty line feed.
231229
'single_blank_line_at_eof' => true,
232230
// There should be exactly one blank line before a namespace declaration.
233-
'single_blank_line_before_namespace' => true,
231+
'blank_lines_before_namespace' => ['max_line_breaks' => 2, 'min_line_breaks' => 2],
234232
// There MUST NOT be more than one property or constant declared per statement.
235233
'single_class_element_per_statement' => true,
236234
// There MUST be one use keyword per declaration.
@@ -243,6 +241,8 @@
243241
'single_quote' => true,
244242
// Each trait `use` must be done as single statement.
245243
'single_trait_insert_per_statement' => true,
244+
// There MUST NOT be a space after the opening parenthesis. There MUST NOT be a space before the closing parenthesis.
245+
'spaces_inside_parentheses' => true,
246246
// Replace all `<>` with `!=`.
247247
'standardize_not_equals' => true,
248248
// Lambdas not (indirect) referencing `$this` must be declared `static`.

0 commit comments

Comments
 (0)