Skip to content

Commit

Permalink
Minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
claudiodekker committed Dec 8, 2021
1 parent 00b085e commit 74ee153
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
.env
.env.backup
.phpunit.result.cache
.php-cs-fixer.php
.php-cs-fixer.cache
docker-compose.override.yml
Homestead.json
Homestead.yaml
Expand Down
190 changes: 190 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
<?php

$finder = Symfony\Component\Finder\Finder::create()
->notPath('bootstrap')
->notPath('node_modules')
->notPath('storage')
->notPath('vendor')
->in(__DIR__)
->name('*.php')
->notName('*.blade.php');

return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'@PSR2' => true,
'align_multiline_comment' => [
'comment_type' => 'phpdocs_like',
],
'array_indentation' => true,
'array_syntax' => [
'syntax' => 'short',
],
'binary_operator_spaces' => [
'operators' => [
'=>' => null,
'=' => 'single_space',
],
],
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => [
'statements' => [
'return',
],
],
'braces' => false,
'cast_spaces' => true,
'class_attributes_separation' => [
'elements' => [
'method' => 'one',
],
],
'class_definition' => false,
'clean_namespace' => true,
'compact_nullable_typehint' => true,
'concat_space' => [
'spacing' => 'none',
],
'constant_case' => [
'case' => 'lower',
],
'declare_equal_normalize' => true,
'elseif' => true,
'encoding' => true,
'full_opening_tag' => true,
'function_declaration' => true,
'function_typehint_space' => true,
'heredoc_to_nowdoc' => true,
'include' => true,
'increment_style' => [
'style' => 'post',
],
'indentation_type' => true,
'integer_literal_case' => true,
'lambda_not_used_import' => true,
'line_ending' => true,
'list_syntax' => [
'syntax' => 'short',
],
'lowercase_cast' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'method_argument_space' => [
'on_multiline' => 'ignore',
],
'multiline_whitespace_before_semicolons' => true,
'native_function_casing' => true,
'native_function_type_declaration_casing' => true,
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => true,
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_closing_tag' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => [
'tokens' => [
'extra',
'throw',
'use',
],
],
'no_space_around_double_colon' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => [
'use' => 'echo',
],
'no_multiline_whitespace_around_double_arrow' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_after_function_name' => true,
'no_spaces_around_offset' => [
'positions' => [
'inside',
],
],
'no_spaces_inside_parenthesis' => true,
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_curly_braces' => true,
'no_unset_cast' => true,
'no_unused_imports' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'not_operator_with_successor_space' => true,
'object_operator_without_whitespace' => true,
'ordered_imports' => [
'sort_algorithm' => 'alpha',
],
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_alias_tag' => [
'replacements' => [
'type' => 'var',
],
],
'phpdoc_no_access' => 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' => true,
'return_type_declaration' => [
'space_before' => 'none',
],
'short_scalar_cast' => true,
'single_blank_line_at_eof' => true,
'single_blank_line_before_namespace' => true,
'single_class_element_per_statement' => true,
'single_import_per_statement' => true,
'single_line_after_imports' => true,
'single_line_comment_style' => [
'comment_types' => [
'hash',
],
],
'single_quote' => true,
'space_after_semicolon' => true,
'standardize_not_equals' => true,
'switch_case_semicolon_to_colon' => true,
'switch_case_space' => true,
'switch_continue_to_break' => true,
'ternary_operator_spaces' => true,
'trailing_comma_in_multiline' => [
'elements' => [
'arrays',
],
],
'trim_array_spaces' => true,
'types_spaces' => [
'space' => 'none',
],
'unary_operator_spaces' => true,
'visibility_required' => [
'elements' => [
'method',
'property',
],
],
'whitespace_after_comma_in_array' => true,
// Risky
'no_alias_functions' => true,
'no_unreachable_default_argument_value' => true,
'self_accessor' => true,
'psr_autoloading' => true,
])
->setFinder($finder);
23 changes: 0 additions & 23 deletions .php_cs.dist

This file was deleted.

2 changes: 1 addition & 1 deletion resources/js/Pages/Contacts/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</search-filter>
<Link class="btn-indigo" href="/contacts/create">
<span>Create</span>
<span class="hidden md:inline">Contact</span>
<span class="hidden md:inline">&nbsp;Contact</span>
</Link>
</div>
<div class="bg-white rounded-md shadow overflow-x-auto">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Organizations/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</search-filter>
<Link class="btn-indigo" href="/organizations/create">
<span>Create</span>
<span class="hidden md:inline">Organization</span>
<span class="hidden md:inline">&nbsp;Organization</span>
</Link>
</div>
<div class="bg-white rounded-md shadow overflow-x-auto">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Users/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</search-filter>
<Link class="btn-indigo" href="/users/create">
<span>Create</span>
<span class="hidden md:inline">User</span>
<span class="hidden md:inline">&nbsp;User</span>
</Link>
</div>
<div class="bg-white rounded-md shadow overflow-x-auto">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Shared/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="flex items-center cursor-pointer select-none group">
<div class="text-gray-700 group-hover:text-indigo-600 focus:text-indigo-600 mr-1 whitespace-nowrap">
<span>{{ auth.user.first_name }}</span>
<span class="hidden md:inline">{{ auth.user.last_name }}</span>
<span class="hidden md:inline">&nbsp;{{ auth.user.last_name }}</span>
</div>
<icon class="w-5 h-5 group-hover:fill-indigo-600 fill-gray-700 focus:fill-indigo-600" name="cheveron-down" />
</div>
Expand Down

0 comments on commit 74ee153

Please sign in to comment.