Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
allejo committed Aug 18, 2020
2 parents b05a232 + 652a197 commit 42c8f56
Show file tree
Hide file tree
Showing 51 changed files with 1,947 additions and 188 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ public/generated/
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###

###> friendsofphp/php-cs-fixer ###
/.php_cs
/.php_cs.cache
###< friendsofphp/php-cs-fixer ###
15 changes: 15 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LICENSE.md file that was distributed with this source code.
HEADER;

return PhpCsFixer\Config::create()
->registerCustomFixers(new PhpCsFixerCustomFixers\Fixers())
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
Expand Down Expand Up @@ -56,6 +57,20 @@ return PhpCsFixer\Config::create()
'equal' => false,
'identical' => false,
],
PhpCsFixerCustomFixers\Fixer\DataProviderNameFixer::name() => [
'prefix' => 'dataProvider_test',
'suffix' => '',
],
PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoCommentedOutCodeFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\PhpdocNoIncorrectVarAnnotationFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\PhpdocSingleLineVarFixer::name() => true,
PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer::name() => true,
])
->setFinder($finder)
;
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: php
php:
- "7.4snapshot"
- "7.4"
- "7.3"
- "7.2"

Expand All @@ -11,7 +11,7 @@ install:
- composer install --no-interaction --no-progress

script:
- bin/phpunit
- composer test

notifications:
email: false
Expand Down
1 change: 1 addition & 0 deletions assets/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

@import 'component/flag-cap-timeline';
@import 'component/graphs';
@import 'component/map-card';
@import 'component/map-thumbnail';
@import 'component/replay-summary';
@import 'component/score-card';
42 changes: 42 additions & 0 deletions assets/sass/component/_map-card.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.map-card {
border: $border-default;
}

.map-card__no-preview {
margin-bottom: 0;
padding-bottom: 100%;
position: relative;
width: 100%;

span {
position: absolute;
text-align: center;
top: 50%;
transform: translateY(-50%);
width: 100%;
}
}

.map-card__title {
@include padding(x, 3);
@include padding(y, 2);

align-items: center;
border-top: $border-default;
display: flex;
}

.map-card__title__count,
.map-card__title__name {
margin-bottom: 0;
}

.map-card__title__name {
}

.map-card__title__count {
@include font-size(h5);

flex-grow: 1;
text-align: right;
}
1 change: 1 addition & 0 deletions assets/sass/component/_map-thumbnail.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.map-thumbnail {
display: block;
margin: 0 auto;
max-width: 100%;
}
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"symfony/process": "^4.0",
"symfony/security-bundle": "^4.0",
"symfony/serializer-pack": "*",
"symfony/string": "^5.1",
"symfony/swiftmailer-bundle": "^3.1",
"symfony/translation": "^4.0",
"symfony/twig-bundle": "^4.0",
Expand All @@ -34,6 +35,9 @@
"symfony/yaml": "^4.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"kubawerlos/php-cs-fixer-custom-fixers": "^2.3",
"phpstan/phpstan": "^0.12.37",
"symfony/debug-pack": "*",
"symfony/maker-bundle": "^1.0",
"symfony/profiler-pack": "*",
Expand Down Expand Up @@ -77,7 +81,9 @@
],
"post-update-cmd": [
"@auto-scripts"
]
],
"fix": "php-cs-fixer fix",
"test": "simple-phpunit"
},
"conflict": {
"symfony/symfony": "*"
Expand Down
Loading

0 comments on commit 42c8f56

Please sign in to comment.