Skip to content

Commit

Permalink
Separated Composer packages
Browse files Browse the repository at this point in the history
  • Loading branch information
gilbertsoft committed Aug 9, 2022
1 parent 1f03b4a commit d7d65d6
Show file tree
Hide file tree
Showing 522 changed files with 8,402 additions and 1,316 deletions.
9 changes: 7 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@ indent_size = 2
indent_style = tab

# ReST-Files
[*.rst]
indent_size = 3
[*.{rst,rst.txt}]
indent_size = 4
max_line_length = 80

# Markdown-Files
[*.md]
max_line_length = 80

# YAML-Files
[*.{yaml,yml}]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ jobs:
COVERALLS_PARALLEL: true
COVERALLS_FLAG_NAME: php-${{ matrix.php-version }}-${{ matrix.dependencies }}
run: |
composer exec phpcov -- merge --clover var/log/coverage/clover.xml var/log/coverage
composer exec phpcov -- merge --clover ../var/log/coverage/clover.xml ../var/log/coverage
composer global require ${{ env.COMPOSER_INSTALL_FLAGS }} ${{ env.COMPOSER_FLAGS }} php-coveralls/php-coveralls
composer global exec php-coveralls -- --coverage_clover=var/log/coverage/clover.xml -vvv --json_path=var/log/coverage/coveralls-upload.json
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/.vscode/
/bin/*
!/bin/console
/public/base-packages/
/public/p/
/public/p2/
/public/aliases.json
Expand Down
65 changes: 65 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
The TYPO3 project - inspiring people to share!
EOF;

/*
// Return a Code Sniffing configuration using
// all sniffers needed for PSR-2
// and additionally:
Expand Down Expand Up @@ -94,3 +95,67 @@
__DIR__ . '/tests',
])
);
*/
($config = \TYPO3\CodingStandards\CsFixerConfig::create())
->setHeader($header, true)
->addRules([
'@PSR12' => true,
/*
'@DoctrineAnnotation' => true,
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_after_opening_tag' => true,
'braces' => ['allow_single_line_closure' => true],
'cast_spaces' => ['space' => 'none'],
'compact_nullable_typehint' => true,
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
'dir_constant' => true,
'function_typehint_space' => true,
'general_phpdoc_annotation_remove' => ['annotations' => ['author']],
'header_comment' => ['header' => $header],
'lowercase_cast' => true,
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'modernize_types_casting' => true,
'native_function_casing' => true,
'new_with_braces' => true,
'no_alias_functions' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_null_property_initialization' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_superfluous_elseif' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_whitespace_in_blank_line' => true,
'ordered_imports' => true,
'php_unit_construct' => ['assertions' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame']],
'php_unit_mock_short_will_return' => true,
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
'phpdoc_no_access' => true,
'phpdoc_no_empty_return' => true,
'phpdoc_no_package' => true,
'phpdoc_scalar' => true,
'phpdoc_trim' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
'return_type_declaration' => ['space_before' => 'none'],
'self_accessor' => true,
'single_quote' => true,
'single_trait_insert_per_statement' => true,
'whitespace_after_comma_in_array' => true,
*/
])
->getFinder()->in([
__DIR__ . '/migrations',
__DIR__ . '/src',
__DIR__ . '/tests',
]);
return $config;
2 changes: 2 additions & 0 deletions base-packages/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/*
!/.gitignore
22 changes: 15 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@
"ext-iconv": "*",
"ext-json": "*",
"ext-sqlite3": "*",
"ext-zip": "*",
"composer/composer": "^2.3",
"composer/semver": "^3.3",
"doctrine/collections": "^1.6",
"doctrine/dbal": "^3.3",
"doctrine/doctrine-bundle": "^2.7",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/inflector": "^2.0",
"doctrine/orm": "^2.12",
"doctrine/persistence": "^2.5",
"easycorp/easyadmin-bundle": "^4.3",
"erusev/parsedown": "^1.7",
"guzzlehttp/guzzle": "^7.4",
"guzzlehttp/promises": "^1.5",
Expand All @@ -59,6 +63,8 @@
"symfony/dependency-injection": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/expression-language": "^5.4",
"symfony/filesystem": "^5.4",
"symfony/finder": "^5.4",
"symfony/flex": "^2.2",
"symfony/form": "^5.4",
"symfony/framework-bundle": "^5.4",
Expand All @@ -70,13 +76,15 @@
"symfony/mime": "^5.4",
"symfony/monolog-bundle": "^3.1",
"symfony/notifier": "^5.4",
"symfony/options-resolver": "^5.4",
"symfony/process": "^5.4",
"symfony/property-access": "^5.4",
"symfony/property-info": "^5.4",
"symfony/proxy-manager-bridge": "^5.4",
"symfony/routing": "^5.4",
"symfony/runtime": "^5.4",
"symfony/security-bundle": "^5.4",
"symfony/security-http": "^5.4",
"symfony/serializer": "^5.4",
"symfony/translation": "^5.4",
"symfony/twig-bundle": "^5.4",
Expand All @@ -92,7 +100,7 @@
"bamarni/composer-bin-plugin": "^1.7",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"ergebnis/composer-normalize": "^2.18",
"fakerphp/faker": "^1.19",
"fakerphp/faker": "^1.20",
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "^5.4",
"symfony/css-selector": "^5.4",
Expand Down Expand Up @@ -153,22 +161,22 @@
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": true,
"target-directory": "tools"
},
"symfony": {
"allow-contrib": false,
"id": "01C8T4G8QYJT0T9Q9SWDHVW8AC",
"require": "5.4.*"
"require": "^5.4"
}
},
"scripts": {
"post-install-cmd": [
"@auto-scripts",
"@tools:setup:install"
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts",
"@tools:setup:update"
"@auto-scripts"
],
"auto-scripts": {
"cache:clear --no-optional-warmers": "symfony-cmd",
Expand All @@ -192,7 +200,7 @@
],
"ci:composer:require-checker:reset": [
"@composer remove doctrine/data-fixtures --ansi --no-interaction --no-progress --no-update",
"@composer require doctrine/doctrine-fixtures-bundle:^3.4 fakerphp/faker:^1.19 --dev --ansi --no-interaction --no-progress"
"@composer require doctrine/doctrine-fixtures-bundle:^3.4 fakerphp/faker:^1.20 --dev --ansi --no-interaction --no-progress"
],
"ci:composer:validate": "@composer validate --strict",
"ci:dynamic": [
Expand Down
Loading

0 comments on commit d7d65d6

Please sign in to comment.