Skip to content

Commit

Permalink
Merge branch '4.4' into 4.5
Browse files Browse the repository at this point in the history
# Conflicts:
#	.php_cs.dist
#	CHANGELOG.md
#	composer.json
#	src/Resources/contao-manager/lexik_maintenance.yml
  • Loading branch information
leofeyer committed Jun 15, 2018
2 parents 4cc4414 + 9b32fd5 commit 423a683
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
8 changes: 3 additions & 5 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ return PhpCsFixer\Config::create()
'heredoc_to_nowdoc' => true,
'linebreak_after_opening_tag' => true,
'list_syntax' => ['syntax' => 'short'],
'native_function_invocation' => [
'include' => ['@compiler_optimized'],
],
'no_null_property_initialization' => true,
'no_superfluous_elseif' => true,
'no_unreachable_default_argument_value' => true,
Expand All @@ -52,11 +55,6 @@ return PhpCsFixer\Config::create()
'strict_comparison' => true,
'strict_param' => true,
'void_return' => true,
// Remove when https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3222 has been merged
'LeoFeyer/optimize_native_functions' => true,
])
->registerCustomFixers([
new LeoFeyer\PhpCsFixer\OptimizeNativeFunctionsFixer()
])
->setFinder($finder)
->setRiskyAllowed(true)
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ script:
- php vendor/bin/phpunit $COVERAGE

after_script:
- if [[ $COVERAGE ]]; then php vendor/bin/coveralls; fi
- if [[ $COVERAGE ]]; then php vendor/bin/php-coveralls; fi
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Contao manager bundle change log

## DEV

* Disable the maintenance mode for local requests (see #1492).

## 4.5.7 (2018-04-04)

* Warm up the cache in the Composer script handler (see #59).
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
"require-dev": {
"composer/composer": "^1.0",
"contao/test-case": "^1.1",
"friendsofphp/php-cs-fixer": "^2.6",
"leofeyer/optimize-native-functions-fixer": "^1.0",
"friendsofphp/php-cs-fixer": "^2.12",
"php-coveralls/php-coveralls": "^2.1",
"ocramius/proxy-manager": "^2.0",
"php-http/message-factory": "^1.0.2",
"phpunit/phpunit": "^6.1",
"satooshi/php-coveralls": "^1.0",
"symfony/console": "^3.3.7",
"symfony/phpunit-bridge": "^3.3"
},
Expand Down
1 change: 1 addition & 0 deletions src/Resources/skeleton/app/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ swiftmailer:
lexik_maintenance:
authorized:
path: ^/contao($|/)
ips: ['127.0.0.1']
attributes:
_bypass_maintenance: true
driver:
Expand Down

0 comments on commit 423a683

Please sign in to comment.