Skip to content

Commit

Permalink
Merge pull request #72 from contao/master
Browse files Browse the repository at this point in the history
Merge 4.4.0
  • Loading branch information
Arne Stappen authored Jun 15, 2017
2 parents b4627de + 4bce7fa commit 2d6bd9c
Show file tree
Hide file tree
Showing 726 changed files with 15,145 additions and 7,057 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ trim_trailing_whitespace = true
indent_style = space
indent_size = 4

[*.min.{css,js}]
[*.{html5,svg,min.css,min.js}]
insert_final_newline = false
228 changes: 228 additions & 0 deletions .ide-toolbox.metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
{
"registrar":[
{
"provider":"contao_system_classes",
"language":"php",
"signature":[
"Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface:getAdapter",
"Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface:createInstance"
],
"signatures":[
{
"class": "Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface",
"method": "getAdapter",
"type": "type"
},
{
"class": "Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface",
"method": "createInstance",
"type": "type"
}
]
},
{
"provider":"contao_model_classes",
"language":"php",
"signature":[
"Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface:getAdapter"
],
"signatures":[
{
"class": "Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface",
"method": "getAdapter",
"type": "type"
}
]
},
{
"provider":"contao_framework_classes",
"language":"php",
"signature":[
"Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface:getAdapter"
],
"signatures":[
{
"class": "Contao\\CoreBundle\\Framework\\ContaoFrameworkInterface",
"method": "getAdapter",
"type": "type"
}
]
},
{
"provider": "contao_datacontainers",
"language": "php",
"signature": [
"Contao\\Controller:loadDataContainer",
"Contao\\DcaLoader:__construct",
"Contao\\System:loadLanguageFile"
]
},
{
"provider": "contao_languagefiles",
"language": "php",
"signature": [
"Contao\\System:loadLanguageFile"
]
},
{
"provider": "contao_model_options",
"language": "php",
"signatures": [
{
"class": "\\Contao\\Model",
"method": "findBy",
"type": "array_key",
"index": 2
},
{
"class": "\\Contao\\Model",
"method": "findOneBy",
"type": "array_key",
"index": 2
}
]
},
{
"provider": "contao_model_return",
"language": "php",
"signatures": [
{
"class": "\\Contao\\Model",
"method": "findBy",
"index": 2,
"array": "return"
}
]
}
],
"providers": [
{
"name": "contao_system_classes",
"defaults": {
"icon": "com.jetbrains.php.PhpIcons.CLASS"
},
"source": {
"contributor": "sub_classes",
"parameter": "Contao\\System"
}
},
{
"name": "contao_model_classes",
"defaults": {
"icon": "com.jetbrains.php.PhpIcons.CLASS"
},
"source": {
"contributor": "sub_classes",
"parameter": "Contao\\Model"
}
},
{
"name": "contao_framework_classes",
"defaults": {
"icon": "com.jetbrains.php.PhpIcons.CLASS"
},
"items": [
{
"lookup_string": "Contao\\System",
"type": "Contao\\System"
}, {
"lookup_string": "Contao\\Config",
"type": "Contao\\Config"
}
]
},
{
"name": "contao_datacontainers",
"lookup_strings": [
"tl_article",
"tl_content",
"tl_cron",
"tl_files",
"tl_form",
"tl_form_field",
"tl_image_size",
"tl_image_size_item",
"tl_layout",
"tl_log",
"tl_member",
"tl_member_group",
"tl_module",
"tl_page",
"tl_settings",
"tl_style",
"tl_style_sheet",
"tl_templates",
"tl_theme",
"tl_undo",
"tl_user",
"tl_user_group"
]
},
{
"name": "contao_languagefiles",
"lookup_strings": [
"default",
"explain",
"tl_article",
"tl_content",
"tl_cron",
"tl_files",
"tl_form",
"tl_form_field",
"tl_image_size",
"tl_image_size_item",
"tl_layout",
"tl_log",
"tl_member",
"tl_member_group",
"tl_module",
"tl_page",
"tl_settings",
"tl_style",
"tl_style_sheet",
"tl_templates",
"tl_theme",
"tl_undo",
"tl_user",
"tl_user_group"
]
},
{
"name": "contao_model_options",
"items": [
{
"lookup_string": "column",
"type_text": "string|array"
},
{
"lookup_string": "value",
"type_text": "string|array"
},
{
"lookup_string": "order",
"type_text": "SQL"
},
{
"lookup_string": "limit",
"type_text": "integer"
},
{
"lookup_string": "offset",
"type_text": "integer"
},
{
"lookup_string": "return",
"type_text": "Model|Collection|Array"
},
{
"lookup_string": "table",
"type_text": "string"
}
]
},
{
"name": "contao_model_return",
"lookup_strings": ["Model", "Collection", "Array"]
}
]
}
17 changes: 16 additions & 1 deletion .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,25 @@ $finder = PhpCsFixer\Finder::create()
return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'psr0' => false,
'strict_comparison' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
'heredoc_to_nowdoc' => true,
'header_comment' => ['header' => $header],
'strict_comparison' => true,
'ordered_imports' => true,
'ordered_class_elements' => true,
'php_unit_strict' => true,
'phpdoc_order' => true,
'no_useless_return' => true,
'no_useless_else' => true,
'no_unreachable_default_argument_value' => true,
'combine_consecutive_unsets' => true,
'general_phpdoc_annotation_remove' => [
'expectedException',
'expectedExceptionMessage',
],
])
->setFinder($finder)
->setRiskyAllowed(true)
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ checks:
interface_name: '^[A-Z][a-zA-Z0-9]*Interface$'
type_name: '^[A-Z][a-zA-Z0-9]*$'
exception_name: '^[A-Z][a-zA-Z0-9]*Exception$'
isser_method_name: '^(?:is|can|has|grants|should|may|supports)'
isser_method_name: '^(?:is|can|has|grants|should|may|requires|supports)'
more_specific_types_in_doc_comments: true
missing_arguments: true
method_calls_on_non_object: true
Expand Down
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ sudo: false
env:
global:
- COMPOSER_ALLOW_XDEBUG=0
- SYMFONY_DEPRECATIONS_HELPER=weak

matrix:
include:
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.0
- php: 7.1
- php: 7.1
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
- php: 7.0
env: COVERAGE='--exclude-group legacy --coverage-clover build/logs/clover.xml'
- php: 7.1
env: COVERAGE='--exclude-group contao3 --coverage-clover build/logs/clover.xml'
fast_finish: true

before_install:
Expand Down
Loading

0 comments on commit 2d6bd9c

Please sign in to comment.