Skip to content
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.

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

chore: merge develop into staging #948

Merged
merged 27 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9922907
fix: add cache-transactions to development data command (#938)
ItsANameToo Sep 24, 2021
27f1925
refactor: removal of unused aggregates and their tests (#947)
Highjhacker Sep 27, 2021
735dc79
docker: updates (#946)
adrian69 Sep 27, 2021
7f7274d
fix: `scrollToQuery` incorrect targets (#944)
alfonsobries Sep 27, 2021
03dc5b4
refactor: change multivote to switch vote (#943)
alfonsobries Sep 27, 2021
27a2ad4
fix: ensure it reloads the page when use back button on safari (#942)
alfonsobries Sep 27, 2021
33b8d68
feat: add recipients count next to multipayment transactions (#940)
alfonsobries Sep 27, 2021
0339fb7
fix: sync navbar price and price blocks in home page (#935)
alfonsobries Sep 27, 2021
52eaa4a
chore: update readme (#950)
ItsANameToo Sep 27, 2021
58b0fe1
refactor: optimize delegate voters count command (#945)
alfonsobries Sep 27, 2021
a145ce1
chore: remove plus sign on multipayment (#955)
alfonsobries Sep 28, 2021
fff4e00
refactor: update page metadata (#951)
leMaur Sep 28, 2021
b5f310b
chore: update dependencies (#952)
alexbarnsley Sep 28, 2021
f5e9a6e
refactor: optimize delegate resignation ids command (#949)
leMaur Sep 28, 2021
002667e
refactor: upgrade oudated npm dependencies (#954)
alfonsobries Sep 28, 2021
a998779
fix: remove id on all svg icons (#941)
alfonsobries Sep 28, 2021
9d727ad
chore: update dependencies (#956)
leMaur Sep 28, 2021
73bd0df
Merge branch 'staging' into develop
ItsANameToo Sep 28, 2021
420d9a1
fix: pagination not changing page query (#958)
ItsANameToo Sep 28, 2021
e612af3
chore: update dependencies (#957)
faustbrian Sep 29, 2021
c677b64
feat: add metadata images per section (#959)
alfonsobries Sep 29, 2021
d103eea
chore: update dependencies (#960)
faustbrian Sep 29, 2021
2fd3849
refactor: use datetime local timezone format (#930)
alexbarnsley Sep 29, 2021
6040488
chore: update changelog
ItsANameToo Sep 29, 2021
668f446
fix: delegate table loading state (#961)
ItsANameToo Sep 29, 2021
5489a4b
fix: search page pagination (#963)
leMaur Sep 29, 2021
110235f
chore: update changelog
ItsANameToo Sep 29, 2021
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ npm-debug.log
yarn-error.log
.coverage
coverage.xml
.php_cs.cache
.php-cs-fixer.cache
.env.bak.vessel
.DS_Store
auth.json
TxtVoteReport.txt
TxtVoteReport.txt
193 changes: 193 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
<?php

declare(strict_types=1);

use PhpCsFixer\Config;
use PhpCsFixer\Finder;

$rules = [
'array_syntax' => ['syntax' => 'short'],
'binary_operator_spaces' => [
'default' => 'single_space',
'operators' => [
'=' => 'align',
'=>' => 'align',
],
],
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => [
'statements' => [
'break',
'continue',
'declare',
'return',
'throw',
'try',
],
],
'braces' => true,
'cast_spaces' => true,
'class_attributes_separation' => [
'elements' => [
'const' => 'one',
'method' => 'one',
'property' => 'one',
],
],
'class_definition' => true,
'concat_space' => ['spacing' => 'none'],
'constant_case' => ['case' => 'lower'],
'declare_equal_normalize' => true,
'declare_strict_types' => true,
'echo_tag_syntax' => ['format' => 'long'],
'elseif' => true,
'encoding' => true,
'final_internal_class' => true,
'full_opening_tag' => true,
'fully_qualified_strict_types' => true,
'function_declaration' => true,
'function_typehint_space' => true,
'heredoc_to_nowdoc' => true,
'include' => true,
'increment_style' => ['style' => 'post'],
'indentation_type' => true,
'linebreak_after_opening_tag' => true,
'line_ending' => true,
'lowercase_cast' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_method_casing' => true,
'magic_constant_casing' => true,
'method_argument_space' => true,
'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
'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_closing_tag' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => [
'tokens' => [
'extra',
'throw',
'use',
'use_trait',
],
],
'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' => [
'statements' => [
'break',
'clone',
'continue',
'echo_print',
'return',
'switch_case',
'yield',
],
],
'no_unreachable_default_argument_value' => 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,
'normalize_index_brace' => true,
'not_operator_with_successor_space' => true,
'object_operator_without_whitespace' => true,
'ordered_imports' => ['sort_algorithm' => 'alpha'],
'php_unit_strict' => true,
'php_unit_test_class_requires_covers' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_align' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_access' => true,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_order' => true,
'phpdoc_scalar' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_to_comment' => true,
'phpdoc_trim' => true,
'phpdoc_types' => true,
'phpdoc_var_without_name' => true,
'psr_autoloading' => true,
'self_accessor' => true,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'simplified_null_return' => true,
'single_blank_line_at_eof' => true,
'single_blank_line_before_namespace' => true,
'single_class_element_per_statement' => [
'elements' => [
'const',
'property',
],
],
'single_import_per_statement' => true,
'single_line_after_imports' => true,
'single_line_comment_style' => [
'comment_types' => ['hash'],
],
'single_quote' => true,
'single_trait_insert_per_statement' => true,
'space_after_semicolon' => true,
'standardize_not_equals' => true,
'strict_comparison' => true,
'strict_param' => true,
'switch_case_semicolon_to_colon' => true,
'switch_case_space' => true,
'ternary_operator_spaces' => true,
'trailing_comma_in_multiline' => [
'elements' => ['arrays'],
],
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'visibility_required' => [
'elements' => [
'property',
'method',
'const',
],
],
'whitespace_after_comma_in_array' => true,
];

$finder = Finder::create()
->notPath('bootstrap')
->notPath('storage')
->notPath('vendor')
->in(getcwd())
->name('*.php')
->notName('*.blade.php')
->notName('index.php')
->notName('server.php')
->notName('_ide_helper.php')
->ignoreDotFiles(true)
->ignoreVCS(true);

return (new Config())
->setFinder($finder)
->setRules($rules)
->setRiskyAllowed(true)
->setCacheFile(__DIR__.'/.php-cs-fixer.cache')
->setUsingCache(true);
145 changes: 0 additions & 145 deletions .php_cs

This file was deleted.

Loading