Skip to content

Commit

Permalink
5.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
cmpbiendl committed Sep 10, 2021
1 parent ac6ccbb commit 7ecb150
Show file tree
Hide file tree
Showing 11,837 changed files with 647,362 additions and 817,812 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Update PHP-CS-Fixer
1fdfcfe49a86386d2fb628a5da1d24648f743162

# Enable native_function_invocation
7aa98dceb6d50650bff35d903ecc9a3b71ccd85e

# Apply more strict PHP Codestyle
321f6f4eeb3f234a111c970b705bd330b43fb4af
84 changes: 84 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?php

use PhpCsFixer\Config;
use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocParamTypeFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer;
use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
use PhpCsFixerCustomFixers\Fixers;

$finder = PhpCsFixer\Finder::create()
->in(__DIR__ . '/engine/Shopware')
->in(__DIR__ . '/tests')
->in(__DIR__ . '/recovery')
->exclude('Plugins/Community')
->exclude('Plugins/Local')
->exclude('install/templates')
->exclude('update/templates')
->notPath('LegacyPhpDumper.php')
->notPath('MemoryLimitTest.php');

$header = <<<EOF
Shopware 5
Copyright (c) shopware AG
According to our dual licensing model, this program can be used either
under the terms of the GNU Affero General Public License, version 3,
or under a proprietary license.
The texts of the GNU Affero General Public License with an additional
permission and of our proprietary license can be found at and
in the LICENSE file you have received along with this program.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
"Shopware" is a registered trademark of shopware AG.
The licensing of the program under the AGPLv3 does not imply a
trademark license. Therefore any rights, title and interest in
our trademarks remain entirely with us.
EOF;

return (new Config())
->registerCustomFixers(new Fixers())
->setRiskyAllowed(true)
->setCacheFile('var/cache/php-cs-fixer')
->setRules([
'@PSR12' => true,
'@Symfony' => true,

'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']],
'concat_space' => ['spacing' => 'one'],
'doctrine_annotation_indentation' => true,
'doctrine_annotation_spaces' => true,
'general_phpdoc_annotation_remove' => [
'annotations' => ['copyright', 'category'],
],
'header_comment' => ['header' => $header, 'separate' => 'bottom', 'comment_type' => 'PHPDoc'],
'no_useless_else' => true,
'no_useless_return' => true,
'no_superfluous_phpdoc_tags' => true,
'phpdoc_line_span' => true,
'phpdoc_order' => true,
'phpdoc_summary' => false,
'phpdoc_var_annotation_correct_order' => true,
'php_unit_test_case_static_method_calls' => true,
'single_line_throw' => false,
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
'operator_linebreak' => ['only_booleans' => true],
'native_function_invocation' => true,

NoUselessCommentFixer::name() => true,
SingleSpaceAfterStatementFixer::name() => true,
SingleSpaceBeforeStatementFixer::name() => true,
PhpdocParamTypeFixer::name() => true,
NoSuperfluousConcatenationFixer::name() => true,
NoUselessStrlenFixer::name() => true,
NoUselessParenthesisFixer::name() => true,
])
->setFinder($finder);
149 changes: 79 additions & 70 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "shopware/shopware",
"description": "Shopware is the next generation of open source e-commerce software made in Germany",
"keywords": ["shopware", "shop"],
"version": "5.6.10",
"version": "5.7.3",
"homepage": "http://www.shopware.com",
"type": "shopware-core",
"license": [
Expand All @@ -11,21 +11,21 @@
],
"support": {
"forum": "https://forum.shopware.com",
"chat": "https://gitter.im/shopware/shopware",
"wiki": "https://docs.shopware.com/",
"chat": "https://slack.shopware.com",
"wiki": "https://developers.shopware.com/",
"source": "https://github.com/shopware/shopware",
"issues": "https://issues.shopware.com"
},
"require": {
"php": "^7.2",
"php": "^7.4 || ^8.0",
"ext-ctype": "*",
"ext-curl": "*",
"ext-date": "*",
"ext-dom": "*",
"ext-filter": "*",
"ext-gd": "*",
"ext-hash": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
Expand All @@ -36,77 +36,85 @@
"ext-xml": "*",
"ext-zip": "*",
"ext-zlib": "*",
"ext-intl": "*",
"lib-libxml": "*",
"symfony/http-kernel": "3.4.43",
"symfony/http-foundation": "3.4.43",
"symfony/config": "3.4.43",
"symfony/class-loader": "3.4.43",
"symfony/dependency-injection": "3.4.43",
"symfony/validator": "3.4.43",
"symfony/filesystem": "3.4.43",
"symfony/translation": "3.4.43",
"symfony/finder": "3.4.43",
"symfony/console": "3.4.43",
"symfony/form": "3.4.43",
"symfony/process": "3.4.43",
"symfony/serializer": "3.4.43",
"symfony/options-resolver": "3.4.43",
"symfony/expression-language": "3.4.43",
"symfony/web-link": "3.4.43",
"monolog/monolog": "1.25.3",
"doctrine/common": "2.11.0",
"doctrine/collections": "1.6.4",
"doctrine/dbal": "2.6.3",
"doctrine/orm": "2.6.6",
"doctrine/cache": "1.8.2",
"doctrine/persistence": "1.2.0",
"beberlei/assert": "2.9.9",
"zendframework/zend-escaper": "2.5.2",
"oyejorge/less.php": "1.7.0.14",
"guzzlehttp/guzzle": "5.3.4",
"egulias/email-validator": "1.2.16",
"elasticsearch/elasticsearch": "6.7.2",
"ongr/elasticsearch-dsl": "6.0.3",
"cocur/slugify": "3.1",
"bcremer/line-reader": "0.2.0",
"ramsey/uuid": "3.5.2",
"setasign/fpdf": "1.8.2",
"setasign/fpdi": "1.6.2",
"bcremer/line-reader": "1.0.1",
"beberlei/assert": "3.2.7",
"beberlei/doctrineextensions": "1.2.7",
"cocur/slugify": "4.0.0",
"composer/package-versions-deprecated": "*",
"doctrine/cache": "1.10.2",
"doctrine/collections": "1.6.7",
"doctrine/common": "3.0.2",
"doctrine/dbal": "2.12.1",
"doctrine/orm": "2.7.5",
"doctrine/persistence": "2.0.0",
"elasticsearch/elasticsearch": "^7",
"fig/link-util": "1.1.1",
"guzzlehttp/guzzle": "7.1.0",
"guzzlehttp/psr7": "1.6.1",
"laminas/laminas-code": "3.4.1",
"laminas/laminas-escaper": "2.6.1",
"league/flysystem": "~1.1.4",
"league/flysystem-aws-s3-v3": "1.0.28",
"monolog/monolog": "2.1.1",
"mpdf/mpdf": "8.0.7",
"ocramius/proxy-manager": "2.2.3",
"mpdf/mpdf": "7.1.9",
"php-http/curl-client": "1.7.1",
"guzzlehttp/psr7": "1.4.2",
"php-http/message": "1.6.0",
"psr/link": "1.0.0",
"fig/link-util": "1.0.0",
"league/flysystem": "1.0.63",
"league/flysystem-aws-s3-v3": "1.0.23",
"superbalist/flysystem-google-storage": "6.0.0",
"stecman/symfony-console-completion": "0.10.1",
"beberlei/doctrineextensions": "1.2.6",
"composer/package-versions-deprecated": "^1.8"
"ongr/elasticsearch-dsl": "7.1.3",
"php-http/message": "1.8.0",
"ramsey/uuid": "4.1.1",
"setasign/fpdf": "1.8.2",
"setasign/fpdi": "2.3.4",
"stecman/symfony-console-completion": "0.11.0",
"superbalist/flysystem-google-storage": "7.2.2",
"symfony/class-loader": "v3.4.45",
"symfony/config": "~4.4.14",
"symfony/console": "~4.4.14",
"symfony/dependency-injection": "~4.4.14",
"symfony/expression-language": "~4.4.14",
"symfony/filesystem": "~4.4.14",
"symfony/finder": "~4.4.14",
"symfony/form": "~4.4.14",
"symfony/http-foundation": "~4.4.14",
"symfony/http-kernel": "~4.4.14",
"symfony/options-resolver": "~4.4.14",
"symfony/process": "~4.4.14",
"symfony/serializer": "~4.4.14",
"symfony/validator": "~4.4.14",
"symfony/web-link": "~4.4.14",
"wikimedia/less.php": "3.1.0"
},
"replace": {
"paragonie/random_compat": "2.*",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-iconv": "*",
"symfony/polyfill-php72": "*",
"symfony/polyfill-php71": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php56": "*"
},
"suggest": {
"ext-apcu": "*",
"ext-zend-opcache": "*"
},
"require-dev": {
"phpunit/phpunit": "~7.0",
"behat/behat": "v3.5.0",
"behat/gherkin": "v4.6.0",
"behat/mink": "v1.7.1",
"behat/mink-extension": "v2.2",
"behat/mink-goutte-driver": "~1.2",
"behat/mink-selenium2-driver": "1.3.1",
"behat/mink-browserkit-driver": "1.3.3",
"sensiolabs/behat-page-object-extension": "~2.1.0",
"symfony/dom-crawler": "~2.8.52",
"friendsofphp/php-cs-fixer": "~2.16",
"symfony/yaml": "3.4.43",
"kubawerlos/php-cs-fixer-custom-fixers": "^1.17",
"php-parallel-lint/php-var-dump-check": "^0.4",
"phpstan/phpstan": "0.12.33"
"behat/behat": "3.7.0",
"behat/gherkin": "4.6.2",
"behat/mink": "1.8.1",
"behat/mink-selenium2-driver": "1.4.0",
"friends-of-behat/mink-extension": "2.4.0",
"friendsofphp/php-cs-fixer": "3.0.0",
"kubawerlos/php-cs-fixer-custom-fixers": "v2.5.0",
"php-parallel-lint/php-var-dump-check": "^0.5",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan": "0.12.85",
"phpstan/phpstan-doctrine": "0.12.33",
"phpstan/phpstan-phpunit": "0.12.18",
"phpstan/phpstan-symfony": "0.12.30",
"phpunit/phpunit": "^9.4",
"sensiolabs/behat-page-object-extension": "~2.3.2",
"symfony/browser-kit": "~4.4.14",
"symfony/dom-crawler": "~4.4.14"
},
"include-path": [
"engine/Library/"
Expand Down Expand Up @@ -143,8 +151,9 @@
"autoloader-suffix": "Shopware",
"optimize-autoloader": true,
"platform": {
"php": "7.2.0"
}
"php": "7.4.0"
},
"sort-packages": true
},
"scripts": {
"cs-check": "php-cs-fixer fix --dry-run -v",
Expand Down
Loading

0 comments on commit 7ecb150

Please sign in to comment.