From a0399fe6daefa8987e79e5cbb5d80d7b5f458d9d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Jan 2019 10:28:35 +0100 Subject: [PATCH] fixed usage of short array notation in tests --- test/Twig/Tests/Fixtures/autoescape/block.test | 4 ++-- test/Twig/Tests/Fixtures/autoescape/name.test | 4 ++-- .../multiline_array_with_undefined_variable.test | 2 +- .../multiline_array_with_undefined_variable_again.test | 2 +- .../multiline_function_with_undefined_variable.test | 2 +- .../exceptions/multiline_tag_with_undefined_variable.test | 2 +- .../exceptions/undefined_template_in_child_template.test | 2 +- test/Twig/Tests/Fixtures/expressions/_self.test | 2 +- test/Twig/Tests/Fixtures/expressions/array.test | 2 +- test/Twig/Tests/Fixtures/expressions/array_call.test | 2 +- test/Twig/Tests/Fixtures/expressions/binary.test | 2 +- test/Twig/Tests/Fixtures/expressions/bitwise.test | 2 +- test/Twig/Tests/Fixtures/expressions/comparison.test | 2 +- test/Twig/Tests/Fixtures/expressions/divisibleby.test | 2 +- test/Twig/Tests/Fixtures/expressions/dotdot.test | 2 +- test/Twig/Tests/Fixtures/expressions/ends_with.test | 2 +- test/Twig/Tests/Fixtures/expressions/grouping.test | 2 +- test/Twig/Tests/Fixtures/expressions/literals.test | 2 +- test/Twig/Tests/Fixtures/expressions/magic_call.test | 2 +- test/Twig/Tests/Fixtures/expressions/matches.test | 2 +- test/Twig/Tests/Fixtures/expressions/method_call.test | 4 ++-- .../Twig/Tests/Fixtures/expressions/negative_numbers.test | 2 +- .../Fixtures/expressions/operators_as_variables.test | 2 +- test/Twig/Tests/Fixtures/expressions/postfix.test | 2 +- test/Twig/Tests/Fixtures/expressions/power.test | 2 +- test/Twig/Tests/Fixtures/expressions/sameas.test | 2 +- test/Twig/Tests/Fixtures/expressions/starts_with.test | 2 +- test/Twig/Tests/Fixtures/expressions/strings.test | 2 +- .../Twig/Tests/Fixtures/expressions/ternary_operator.test | 2 +- .../Fixtures/expressions/ternary_operator_noelse.test | 2 +- .../Fixtures/expressions/ternary_operator_nothen.test | 2 +- .../expressions/two_word_operators_as_variables.test | 2 +- test/Twig/Tests/Fixtures/expressions/unary.test | 2 +- .../Tests/Fixtures/expressions/unary_macro_arguments.test | 2 +- .../Twig/Tests/Fixtures/expressions/unary_precedence.test | 2 +- test/Twig/Tests/Fixtures/filters/abs.test | 2 +- test/Twig/Tests/Fixtures/filters/batch.test | 2 +- test/Twig/Tests/Fixtures/filters/batch_float.test | 2 +- .../Tests/Fixtures/filters/batch_with_empty_fill.test | 2 +- .../Tests/Fixtures/filters/batch_with_exact_elements.test | 2 +- test/Twig/Tests/Fixtures/filters/batch_with_fill.test | 2 +- test/Twig/Tests/Fixtures/filters/batch_with_keys.test | 2 +- .../Tests/Fixtures/filters/batch_with_zero_elements.test | 2 +- test/Twig/Tests/Fixtures/filters/convert_encoding.test | 2 +- test/Twig/Tests/Fixtures/filters/date_namedargs.test | 2 +- test/Twig/Tests/Fixtures/filters/default.test | 4 ++-- test/Twig/Tests/Fixtures/filters/dynamic_filter.test | 2 +- test/Twig/Tests/Fixtures/filters/escape.test | 2 +- test/Twig/Tests/Fixtures/filters/escape_html_attr.test | 2 +- test/Twig/Tests/Fixtures/filters/escape_javascript.test | 2 +- .../Fixtures/filters/escape_non_supported_charset.test | 2 +- test/Twig/Tests/Fixtures/filters/first.test | 2 +- test/Twig/Tests/Fixtures/filters/force_escape.test | 2 +- test/Twig/Tests/Fixtures/filters/format.test | 2 +- test/Twig/Tests/Fixtures/filters/join.test | 2 +- test/Twig/Tests/Fixtures/filters/json_encode.test | 2 +- test/Twig/Tests/Fixtures/filters/last.test | 2 +- test/Twig/Tests/Fixtures/filters/length_utf8.test | 2 +- test/Twig/Tests/Fixtures/filters/merge.test | 2 +- test/Twig/Tests/Fixtures/filters/nl2br.test | 2 +- test/Twig/Tests/Fixtures/filters/number_format.test | 2 +- .../Tests/Fixtures/filters/number_format_default.test | 2 +- test/Twig/Tests/Fixtures/filters/replace.test | 2 +- test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test | 2 +- test/Twig/Tests/Fixtures/filters/reverse.test | 2 +- test/Twig/Tests/Fixtures/filters/round.test | 2 +- test/Twig/Tests/Fixtures/filters/slice.test | 2 +- test/Twig/Tests/Fixtures/filters/sort.test | 2 +- test/Twig/Tests/Fixtures/filters/special_chars.test | 2 +- test/Twig/Tests/Fixtures/filters/split.test | 2 +- test/Twig/Tests/Fixtures/filters/split_utf8.test | 2 +- test/Twig/Tests/Fixtures/filters/static_calls.test | 2 +- test/Twig/Tests/Fixtures/filters/trim.test | 2 +- test/Twig/Tests/Fixtures/filters/urlencode.test | 2 +- .../Twig/Tests/Fixtures/filters/urlencode_deprecated.test | 2 +- test/Twig/Tests/Fixtures/functions/attribute.test | 2 +- test/Twig/Tests/Fixtures/functions/block.test | 2 +- .../Twig/Tests/Fixtures/functions/block_without_name.test | 2 +- test/Twig/Tests/Fixtures/functions/constant.test | 2 +- test/Twig/Tests/Fixtures/functions/cycle.test | 2 +- test/Twig/Tests/Fixtures/functions/date_namedargs.test | 2 +- test/Twig/Tests/Fixtures/functions/dump.test | 4 ++-- test/Twig/Tests/Fixtures/functions/dump_array.test | 4 ++-- test/Twig/Tests/Fixtures/functions/dynamic_function.test | 2 +- .../Twig/Tests/Fixtures/functions/include/assignment.test | 2 +- .../Tests/Fixtures/functions/include/autoescaping.test | 2 +- test/Twig/Tests/Fixtures/functions/include/basic.test | 2 +- .../Twig/Tests/Fixtures/functions/include/expression.test | 2 +- .../Tests/Fixtures/functions/include/ignore_missing.test | 2 +- test/Twig/Tests/Fixtures/functions/include/missing.test | 2 +- .../Tests/Fixtures/functions/include/missing_nested.test | 2 +- test/Twig/Tests/Fixtures/functions/include/sandbox.test | 2 +- .../Fixtures/functions/include/sandbox_disabling.test | 2 +- .../include/sandbox_disabling_ignore_missing.test | 2 +- .../Fixtures/functions/include/template_instance.test | 2 +- .../Fixtures/functions/include/templates_as_array.test | 2 +- .../Tests/Fixtures/functions/include/with_context.test | 2 +- .../Tests/Fixtures/functions/include/with_variables.test | 2 +- test/Twig/Tests/Fixtures/functions/magic_call.test | 2 +- test/Twig/Tests/Fixtures/functions/magic_call53.test | 2 +- test/Twig/Tests/Fixtures/functions/max.test | 2 +- test/Twig/Tests/Fixtures/functions/min.test | 2 +- test/Twig/Tests/Fixtures/functions/range.test | 2 +- .../functions/recursive_block_with_inheritance.test | 2 +- test/Twig/Tests/Fixtures/functions/source.test | 2 +- test/Twig/Tests/Fixtures/functions/special_chars.test | 2 +- test/Twig/Tests/Fixtures/functions/static_calls.test | 2 +- .../Tests/Fixtures/functions/template_from_string.test | 2 +- test/Twig/Tests/Fixtures/macros/default_values.test | 2 +- test/Twig/Tests/Fixtures/macros/nested_calls.test | 2 +- test/Twig/Tests/Fixtures/macros/reserved_variables.test | 2 +- test/Twig/Tests/Fixtures/macros/simple.test | 2 +- test/Twig/Tests/Fixtures/macros/varargs.test | 2 +- test/Twig/Tests/Fixtures/macros/with_filters.test | 2 +- .../Tests/Fixtures/regression/block_names_unicity.test | 2 +- .../Tests/Fixtures/regression/combined_debug_info.test | 2 +- test/Twig/Tests/Fixtures/regression/empty_token.test | 2 +- test/Twig/Tests/Fixtures/regression/issue_1143.test | 2 +- test/Twig/Tests/Fixtures/regression/multi_word_tests.test | 2 +- .../Tests/Fixtures/regression/simple_xml_element.test | 2 +- .../Tests/Fixtures/regression/strings_like_numbers.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/blocks.test | 2 +- .../Tests/Fixtures/tags/autoescape/double_escaping.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/functions.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/literal.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/nested.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/objects.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/raw.test | 2 +- .../Tests/Fixtures/tags/autoescape/strategy.legacy.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/strategy.test | 2 +- test/Twig/Tests/Fixtures/tags/autoescape/type.test | 2 +- .../Twig/Tests/Fixtures/tags/autoescape/with_filters.test | 2 +- .../Fixtures/tags/autoescape/with_filters_arguments.test | 2 +- .../Fixtures/tags/autoescape/with_pre_escape_filters.test | 2 +- .../tags/autoescape/with_preserves_safety_filters.test | 2 +- test/Twig/Tests/Fixtures/tags/block/basic.test | 2 +- .../Twig/Tests/Fixtures/tags/block/block_unique_name.test | 2 +- test/Twig/Tests/Fixtures/tags/block/special_chars.test | 2 +- .../Twig/Tests/Fixtures/tags/deprecated/block.legacy.test | 2 +- .../Twig/Tests/Fixtures/tags/deprecated/macro.legacy.test | 2 +- .../Tests/Fixtures/tags/deprecated/template.legacy.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/basic.test | 2 +- .../Tests/Fixtures/tags/embed/complex_dynamic_parent.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/error_line.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/multiple.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/nested.test | 2 +- test/Twig/Tests/Fixtures/tags/embed/with_extends.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/json_encode.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/multiple.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/nested.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test | 2 +- test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test | 2 +- test/Twig/Tests/Fixtures/tags/for/condition.test | 4 ++-- test/Twig/Tests/Fixtures/tags/for/context.test | 2 +- test/Twig/Tests/Fixtures/tags/for/else.test | 8 ++++---- test/Twig/Tests/Fixtures/tags/for/inner_variables.test | 2 +- test/Twig/Tests/Fixtures/tags/for/keys.test | 2 +- test/Twig/Tests/Fixtures/tags/for/keys_and_values.test | 2 +- test/Twig/Tests/Fixtures/tags/for/loop_context.test | 2 +- test/Twig/Tests/Fixtures/tags/for/loop_context_local.test | 2 +- test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test | 2 +- .../Tests/Fixtures/tags/for/loop_not_defined_cond.test | 2 +- test/Twig/Tests/Fixtures/tags/for/nested_else.test | 2 +- test/Twig/Tests/Fixtures/tags/for/objects.test | 2 +- test/Twig/Tests/Fixtures/tags/for/objects_countable.test | 2 +- test/Twig/Tests/Fixtures/tags/for/recursive.test | 2 +- test/Twig/Tests/Fixtures/tags/for/values.test | 2 +- test/Twig/Tests/Fixtures/tags/from.test | 2 +- test/Twig/Tests/Fixtures/tags/if/basic.test | 6 +++--- test/Twig/Tests/Fixtures/tags/if/expression.test | 6 +++--- test/Twig/Tests/Fixtures/tags/include/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/include/expression.test | 2 +- test/Twig/Tests/Fixtures/tags/include/ignore_missing.test | 2 +- test/Twig/Tests/Fixtures/tags/include/missing.test | 2 +- test/Twig/Tests/Fixtures/tags/include/missing_nested.test | 2 +- test/Twig/Tests/Fixtures/tags/include/only.test | 2 +- .../Tests/Fixtures/tags/include/template_instance.test | 2 +- .../Tests/Fixtures/tags/include/templates_as_array.test | 2 +- test/Twig/Tests/Fixtures/tags/include/with_variables.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/basic.test | 2 +- .../Twig/Tests/Fixtures/tags/inheritance/conditional.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/empty.test | 2 +- .../Tests/Fixtures/tags/inheritance/extends_as_array.test | 2 +- .../inheritance/extends_as_array_with_empty_name.test | 2 +- .../tags/inheritance/extends_as_array_with_null_name.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/multiple.test | 2 +- .../Tests/Fixtures/tags/inheritance/multiple_dynamic.test | 2 +- .../Tests/Fixtures/tags/inheritance/nested_blocks.test | 2 +- .../tags/inheritance/nested_blocks_parent_only.test | 2 +- .../Fixtures/tags/inheritance/nested_inheritance.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/parent.test | 2 +- .../Tests/Fixtures/tags/inheritance/parent_change.test | 4 ++-- .../Tests/Fixtures/tags/inheritance/parent_isolation.test | 2 +- .../Tests/Fixtures/tags/inheritance/parent_nested.test | 2 +- .../inheritance/parent_without_extends_but_traits.test | 2 +- .../Fixtures/tags/inheritance/template_instance.test | 2 +- test/Twig/Tests/Fixtures/tags/inheritance/use.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/external.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/from.test | 2 +- .../Fixtures/tags/macro/from_with_reserved_name.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/global.test | 2 +- .../Fixtures/tags/macro/import_with_reserved_nam.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/reserved_name.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/self_import.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/special_chars.test | 2 +- test/Twig/Tests/Fixtures/tags/macro/super_globals.test | 2 +- test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test | 2 +- .../Fixtures/tags/raw/mixed_usage_with_raw.legacy.test | 2 +- .../Fixtures/tags/raw/whitespace_control.legacy.test | 2 +- test/Twig/Tests/Fixtures/tags/sandbox/simple.test | 2 +- test/Twig/Tests/Fixtures/tags/set/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/set/capture-empty.test | 2 +- test/Twig/Tests/Fixtures/tags/set/capture.test | 2 +- test/Twig/Tests/Fixtures/tags/set/expression.test | 2 +- test/Twig/Tests/Fixtures/tags/spaceless/simple.test | 2 +- test/Twig/Tests/Fixtures/tags/special_chars.test | 2 +- test/Twig/Tests/Fixtures/tags/trim_block.test | 2 +- test/Twig/Tests/Fixtures/tags/use/aliases.test | 2 +- test/Twig/Tests/Fixtures/tags/use/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/use/deep.test | 2 +- test/Twig/Tests/Fixtures/tags/use/deep_empty.test | 2 +- test/Twig/Tests/Fixtures/tags/use/inheritance.test | 2 +- test/Twig/Tests/Fixtures/tags/use/inheritance2.test | 2 +- test/Twig/Tests/Fixtures/tags/use/multiple.test | 2 +- test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test | 2 +- test/Twig/Tests/Fixtures/tags/use/parent_block.test | 2 +- test/Twig/Tests/Fixtures/tags/use/parent_block2.test | 2 +- test/Twig/Tests/Fixtures/tags/use/parent_block3.test | 2 +- test/Twig/Tests/Fixtures/tags/use/use_with_parent.test | 2 +- test/Twig/Tests/Fixtures/tags/verbatim/basic.test | 2 +- .../Fixtures/tags/verbatim/mixed_usage_with_raw.test | 2 +- .../Tests/Fixtures/tags/verbatim/whitespace_control.test | 2 +- test/Twig/Tests/Fixtures/tags/with/basic.test | 2 +- test/Twig/Tests/Fixtures/tags/with/expression.test | 2 +- test/Twig/Tests/Fixtures/tags/with/nested.test | 2 +- test/Twig/Tests/Fixtures/tags/with/with_no_hash.test | 2 +- test/Twig/Tests/Fixtures/tags/with/with_only.test | 2 +- test/Twig/Tests/Fixtures/tests/constant.test | 2 +- test/Twig/Tests/Fixtures/tests/defined.test | 2 +- test/Twig/Tests/Fixtures/tests/defined_for_attribute.test | 2 +- test/Twig/Tests/Fixtures/tests/defined_for_blocks.test | 2 +- test/Twig/Tests/Fixtures/tests/defined_for_constants.test | 2 +- test/Twig/Tests/Fixtures/tests/dynamic_test.test | 2 +- test/Twig/Tests/Fixtures/tests/even.test | 2 +- test/Twig/Tests/Fixtures/tests/in.test | 2 +- test/Twig/Tests/Fixtures/tests/null_coalesce.test | 2 +- test/Twig/Tests/Fixtures/tests/odd.test | 2 +- .../Tests/LegacyFixtures/autoescape/filename.legacy.test | 4 ++-- .../LegacyFixtures/functions/undefined_block.legacy.test | 2 +- test/Twig/Tests/LegacyFixtures/test.legacy.test | 2 +- 256 files changed, 272 insertions(+), 272 deletions(-) diff --git a/test/Twig/Tests/Fixtures/autoescape/block.test b/test/Twig/Tests/Fixtures/autoescape/block.test index 1290973a5..a80b80c37 100644 --- a/test/Twig/Tests/Fixtures/autoescape/block.test +++ b/test/Twig/Tests/Fixtures/autoescape/block.test @@ -14,8 +14,8 @@ blocks and autoescape {% set _content = block('content')|raw %} {{ _content|raw }} --DATA-- -return array('br' => '
') +return ['br' => '
'] --CONFIG-- -return array('autoescape' => 'name') +return ['autoescape' => 'name'] --EXPECT-- <br /> diff --git a/test/Twig/Tests/Fixtures/autoescape/name.test b/test/Twig/Tests/Fixtures/autoescape/name.test index 98e89399a..5ad573cf0 100644 --- a/test/Twig/Tests/Fixtures/autoescape/name.test +++ b/test/Twig/Tests/Fixtures/autoescape/name.test @@ -12,9 +12,9 @@ --TEMPLATE(index.txt.twig)-- {{ br -}} --DATA-- -return array('br' => '
') +return ['br' => '
'] --CONFIG-- -return array('autoescape' => 'name') +return ['autoescape' => 'name'] --EXPECT-- <br /> \u003Cbr\u0020\/\u003E diff --git a/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test b/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test index 7ff2eedb7..8bb3c5f24 100644 --- a/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test +++ b/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test @@ -13,6 +13,6 @@ Exception for multiline array with undefined variable foo2: foo2, } %} --DATA-- -return array('foobar' => 'foobar') +return ['foobar' => 'foobar'] --EXCEPTION-- Twig_Error_Runtime: Variable "foo2" does not exist in "index.twig" at line 11. diff --git a/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test b/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test index c425069bf..5ef5e4900 100644 --- a/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test +++ b/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test @@ -13,6 +13,6 @@ Exception for multiline array with undefined variable foo2: foo2, } %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Runtime: Variable "foobar" does not exist in "index.twig" at line 7. diff --git a/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test b/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test index 2f94a5ee9..07b82c0c4 100644 --- a/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test +++ b/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test @@ -7,6 +7,6 @@ Exception for multile function with undefined variable --TEMPLATE(foo)-- Foo --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Runtime: Variable "with_context" does not exist in "index.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test b/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test index 7b3b1daf9..74803c095 100644 --- a/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test +++ b/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test @@ -7,6 +7,6 @@ Exception for multiline tag with undefined variable --TEMPLATE(foo)-- Foo --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Runtime: Variable "vars" does not exist in "index.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test b/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test index 1992510b2..1f23723d1 100644 --- a/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test +++ b/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test @@ -10,6 +10,6 @@ Exception for an undefined template in a child template {% block sidebar %} {% endblock %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Loader: Template "include.twig" is not defined in "index.twig" at line 5. diff --git a/test/Twig/Tests/Fixtures/expressions/_self.test b/test/Twig/Tests/Fixtures/expressions/_self.test index 32fed8fd0..fb88f4c85 100644 --- a/test/Twig/Tests/Fixtures/expressions/_self.test +++ b/test/Twig/Tests/Fixtures/expressions/_self.test @@ -3,6 +3,6 @@ _self returns the template name --TEMPLATE-- {{ _self }} --DATA-- -return array() +return [] --EXPECT-- index.twig diff --git a/test/Twig/Tests/Fixtures/expressions/array.test b/test/Twig/Tests/Fixtures/expressions/array.test index c69b1192f..c296856de 100644 --- a/test/Twig/Tests/Fixtures/expressions/array.test +++ b/test/Twig/Tests/Fixtures/expressions/array.test @@ -38,7 +38,7 @@ Twig supports array notation {{ ary|keys|join(',') }} {{ ary|join(',') }} --DATA-- -return array('bar' => 'bar', 'foo' => array('bar' => 'bar')) +return ['bar' => 'bar', 'foo' => array('bar' => 'bar')] --EXPECT-- 1,2 foo,bar diff --git a/test/Twig/Tests/Fixtures/expressions/array_call.test b/test/Twig/Tests/Fixtures/expressions/array_call.test index f3df328fe..887418c0c 100644 --- a/test/Twig/Tests/Fixtures/expressions/array_call.test +++ b/test/Twig/Tests/Fixtures/expressions/array_call.test @@ -6,7 +6,7 @@ Twig supports method calls {{ items[foo] }} {{ items[items[foo]] }} --DATA-- -return array('foo' => 'bar', 'items' => array('foo' => 'bar', 'bar' => 'foo')) +return ['foo' => 'bar', 'items' => array('foo' => 'bar', 'bar' => 'foo')] --EXPECT-- bar bar diff --git a/test/Twig/Tests/Fixtures/expressions/binary.test b/test/Twig/Tests/Fixtures/expressions/binary.test index f5e68456d..b4e8be58d 100644 --- a/test/Twig/Tests/Fixtures/expressions/binary.test +++ b/test/Twig/Tests/Fixtures/expressions/binary.test @@ -22,7 +22,7 @@ Twig supports binary operations (+, -, *, /, ~, %, and, or) {{ foo ~ bar }} {{ 20 // 7 }} --DATA-- -return array('foo' => 'bar', 'bar' => 'foo') +return ['foo' => 'bar', 'bar' => 'foo'] --EXPECT-- 2 1 diff --git a/test/Twig/Tests/Fixtures/expressions/bitwise.test b/test/Twig/Tests/Fixtures/expressions/bitwise.test index 74fe6cabb..c2bda1cc6 100644 --- a/test/Twig/Tests/Fixtures/expressions/bitwise.test +++ b/test/Twig/Tests/Fixtures/expressions/bitwise.test @@ -6,7 +6,7 @@ Twig supports bitwise operations {{ 1 b-xor 5 }} {{ (1 and 0 b-or 0) is same as(1 and (0 b-or 0)) ? 'ok' : 'ko' }} --DATA-- -return array() +return [] --EXPECT-- 1 5 diff --git a/test/Twig/Tests/Fixtures/expressions/comparison.test b/test/Twig/Tests/Fixtures/expressions/comparison.test index 726b85075..2811634f7 100644 --- a/test/Twig/Tests/Fixtures/expressions/comparison.test +++ b/test/Twig/Tests/Fixtures/expressions/comparison.test @@ -6,7 +6,7 @@ Twig supports comparison operators (==, !=, <, >, >=, <=) {{ 1 == 1 }}/{{ 1 == 2 }} {{ 1 != 1 }}/{{ 1 != 2 }} --DATA-- -return array() +return [] --EXPECT-- ///1 1//1/1 diff --git a/test/Twig/Tests/Fixtures/expressions/divisibleby.test b/test/Twig/Tests/Fixtures/expressions/divisibleby.test index 238dd2790..f1bf5681e 100644 --- a/test/Twig/Tests/Fixtures/expressions/divisibleby.test +++ b/test/Twig/Tests/Fixtures/expressions/divisibleby.test @@ -9,7 +9,7 @@ Twig supports the "divisible by" operator by (3) ? 'OK' }} --DATA-- -return array() +return [] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/expressions/dotdot.test b/test/Twig/Tests/Fixtures/expressions/dotdot.test index 9cd0676ce..f57e13791 100644 --- a/test/Twig/Tests/Fixtures/expressions/dotdot.test +++ b/test/Twig/Tests/Fixtures/expressions/dotdot.test @@ -11,7 +11,7 @@ Twig supports the .. operator {% for i in 0 + 1 .. 10 - 1 %}{{ i }} {% endfor %} --DATA-- -return array('foo' => array(1, 10)) +return ['foo' => array(1, 10)] --EXPECT-- 0 1 2 3 4 5 6 7 8 9 10 a b c d e f g h i j k l m n o p q r s t u v w x y z diff --git a/test/Twig/Tests/Fixtures/expressions/ends_with.test b/test/Twig/Tests/Fixtures/expressions/ends_with.test index 9ad5e5e8e..c8086d6d4 100644 --- a/test/Twig/Tests/Fixtures/expressions/ends_with.test +++ b/test/Twig/Tests/Fixtures/expressions/ends_with.test @@ -12,7 +12,7 @@ Twig supports the "ends with" operator {{ false ends with false ? 'OK' : 'KO' }} {{ false ends with '' ? 'OK' : 'KO' }} --DATA-- -return array() +return [] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/expressions/grouping.test b/test/Twig/Tests/Fixtures/expressions/grouping.test index 79f8e0b0d..069ebf793 100644 --- a/test/Twig/Tests/Fixtures/expressions/grouping.test +++ b/test/Twig/Tests/Fixtures/expressions/grouping.test @@ -3,6 +3,6 @@ Twig supports grouping of expressions --TEMPLATE-- {{ (2 + 2) / 2 }} --DATA-- -return array() +return [] --EXPECT-- 2 diff --git a/test/Twig/Tests/Fixtures/expressions/literals.test b/test/Twig/Tests/Fixtures/expressions/literals.test index 7ae3bae95..308e8df2a 100644 --- a/test/Twig/Tests/Fixtures/expressions/literals.test +++ b/test/Twig/Tests/Fixtures/expressions/literals.test @@ -10,7 +10,7 @@ Twig supports literals 7 {{ null }} 8 {{ NULL }} --DATA-- -return array() +return [] --EXPECT-- 1 1 2 1 diff --git a/test/Twig/Tests/Fixtures/expressions/magic_call.test b/test/Twig/Tests/Fixtures/expressions/magic_call.test index 1a27a2d6f..60417e04f 100644 --- a/test/Twig/Tests/Fixtures/expressions/magic_call.test +++ b/test/Twig/Tests/Fixtures/expressions/magic_call.test @@ -21,7 +21,7 @@ class TestClassForMagicCallAttributes } } -return array('foo' => new TestClassForMagicCallAttributes()) +return ['foo' => new TestClassForMagicCallAttributes()] --EXPECT-- foo_from_call bar_from_getbar diff --git a/test/Twig/Tests/Fixtures/expressions/matches.test b/test/Twig/Tests/Fixtures/expressions/matches.test index b6c771657..95459c3b0 100644 --- a/test/Twig/Tests/Fixtures/expressions/matches.test +++ b/test/Twig/Tests/Fixtures/expressions/matches.test @@ -5,7 +5,7 @@ Twig supports the "matches" operator {{ 'foo' matches '/^fo/' ? 'OK' : 'KO' }} {{ 'foo' matches '/O/i' ? 'OK' : 'KO' }} --DATA-- -return array() +return [] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/expressions/method_call.test b/test/Twig/Tests/Fixtures/expressions/method_call.test index 5f801e635..ac1ee1c34 100644 --- a/test/Twig/Tests/Fixtures/expressions/method_call.test +++ b/test/Twig/Tests/Fixtures/expressions/method_call.test @@ -12,9 +12,9 @@ Twig supports method calls {{ items.foo.in }} {{ items.foo.not }} --DATA-- -return array('foo' => 'bar', 'items' => array('foo' => new TwigTestFoo(), 'bar' => 'foo')) +return ['foo' => 'bar', 'items' => array('foo' => new TwigTestFoo(), 'bar' => 'foo')] --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- foo foo diff --git a/test/Twig/Tests/Fixtures/expressions/negative_numbers.test b/test/Twig/Tests/Fixtures/expressions/negative_numbers.test index 1853b1b06..c2a6e3402 100644 --- a/test/Twig/Tests/Fixtures/expressions/negative_numbers.test +++ b/test/Twig/Tests/Fixtures/expressions/negative_numbers.test @@ -8,7 +8,7 @@ Twig manages negative numbers correctly {{ 5 + -1 }} {{ 5 + - 1 }} --DATA-- -return array() +return [] --EXPECT-- -1 -1 diff --git a/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test b/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test index fe29d08bb..f2b057d15 100644 --- a/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test +++ b/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test @@ -7,7 +7,7 @@ Twig allows to use named operators as variable names {{ in }} {{ is }} --DATA-- -return array('matches' => array(1, 2, 3), 'in' => 'in', 'is' => 'is') +return ['matches' => array(1, 2, 3), 'in' => 'in', 'is' => 'is'] --EXPECT-- 1 2 diff --git a/test/Twig/Tests/Fixtures/expressions/postfix.test b/test/Twig/Tests/Fixtures/expressions/postfix.test index 542c35046..276cbf197 100644 --- a/test/Twig/Tests/Fixtures/expressions/postfix.test +++ b/test/Twig/Tests/Fixtures/expressions/postfix.test @@ -12,7 +12,7 @@ Twig parses postfix expressions {{ macros.foo() }} {{ (macros).foo() }} --DATA-- -return array(); +return [] --EXPECT-- a A diff --git a/test/Twig/Tests/Fixtures/expressions/power.test b/test/Twig/Tests/Fixtures/expressions/power.test index eacc98f86..84fd23692 100644 --- a/test/Twig/Tests/Fixtures/expressions/power.test +++ b/test/Twig/Tests/Fixtures/expressions/power.test @@ -9,7 +9,7 @@ Twig parses power expressions {{ b ** a }} {{ b ** b }} --DATA-- -return array('a' => 4, 'b' => -2); +return ['a' => 4, 'b' => -2] --EXPECT-- 8 -8 diff --git a/test/Twig/Tests/Fixtures/expressions/sameas.test b/test/Twig/Tests/Fixtures/expressions/sameas.test index 601201deb..83f3691f9 100644 --- a/test/Twig/Tests/Fixtures/expressions/sameas.test +++ b/test/Twig/Tests/Fixtures/expressions/sameas.test @@ -11,7 +11,7 @@ Twig supports the "same as" operator as (true) ? 'OK' }} --DATA-- -return array() +return [] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/expressions/starts_with.test b/test/Twig/Tests/Fixtures/expressions/starts_with.test index 75d331e90..a78ff1eac 100644 --- a/test/Twig/Tests/Fixtures/expressions/starts_with.test +++ b/test/Twig/Tests/Fixtures/expressions/starts_with.test @@ -13,7 +13,7 @@ with 'f' ? 'OK' : 'KO' }} {{ 'a' starts with false ? 'OK' : 'KO' }} {{ false starts with '' ? 'OK' : 'KO' }} --DATA-- -return array() +return [] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/expressions/strings.test b/test/Twig/Tests/Fixtures/expressions/strings.test index a9116613e..f402c8939 100644 --- a/test/Twig/Tests/Fixtures/expressions/strings.test +++ b/test/Twig/Tests/Fixtures/expressions/strings.test @@ -4,7 +4,7 @@ Twig supports string interpolation {{ "foo #{"foo #{bar} baz"} baz" }} {{ "foo #{bar}#{bar} baz" }} --DATA-- -return array('bar' => 'BAR'); +return ['bar' => 'BAR'] --EXPECT-- foo foo BAR baz baz foo BARBAR baz diff --git a/test/Twig/Tests/Fixtures/expressions/ternary_operator.test b/test/Twig/Tests/Fixtures/expressions/ternary_operator.test index 0e6fa96e2..37eccc0f5 100644 --- a/test/Twig/Tests/Fixtures/expressions/ternary_operator.test +++ b/test/Twig/Tests/Fixtures/expressions/ternary_operator.test @@ -8,7 +8,7 @@ Twig supports the ternary operator {{ 1 == 1 ? 'foo
':'' }} {{ foo ~ (bar ? ('-' ~ bar) : '') }} --DATA-- -return array('foo' => 'foo', 'bar' => 'bar') +return ['foo' => 'foo', 'bar' => 'bar'] --EXPECT-- YES NO diff --git a/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test b/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test index fdc660fc5..8b0f7284b 100644 --- a/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test +++ b/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test @@ -4,7 +4,7 @@ Twig supports the ternary operator {{ 1 ? 'YES' }} {{ 0 ? 'YES' }} --DATA-- -return array() +return [] --EXPECT-- YES diff --git a/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test b/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test index 9057e8370..ecd6b7546 100644 --- a/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test +++ b/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test @@ -4,7 +4,7 @@ Twig supports the ternary operator {{ 'YES' ?: 'NO' }} {{ 0 ?: 'NO' }} --DATA-- -return array() +return [] --EXPECT-- YES NO diff --git a/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test b/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test index 0eaabb446..ad142918c 100644 --- a/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test +++ b/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test @@ -3,6 +3,6 @@ Twig does not allow to use two-word named operators as variable names --TEMPLATE-- {{ starts with }} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: Unexpected token "operator" of value "starts with" in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/expressions/unary.test b/test/Twig/Tests/Fixtures/expressions/unary.test index b79219a2a..542253119 100644 --- a/test/Twig/Tests/Fixtures/expressions/unary.test +++ b/test/Twig/Tests/Fixtures/expressions/unary.test @@ -5,7 +5,7 @@ Twig supports unary operators (not, -, +) {{ +1 + 1 }}/{{ -1 - 1 }} {{ not (false or true) }} --DATA-- -return array() +return [] --EXPECT-- /1 2/-2 diff --git a/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test b/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test index ad84a9c26..27deba3ef 100644 --- a/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test +++ b/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test @@ -13,7 +13,7 @@ Twig manages negative numbers as default parameters {% macro positive_number1(nb = +1) %}{{ nb }}{% endmacro %} {% macro positive_number2(nb = ++1) %}{{ nb }}{% endmacro %} --DATA-- -return array() +return [] --EXPECT-- -1 1 diff --git a/test/Twig/Tests/Fixtures/expressions/unary_precedence.test b/test/Twig/Tests/Fixtures/expressions/unary_precedence.test index cc6eef8d2..9c56ab12c 100644 --- a/test/Twig/Tests/Fixtures/expressions/unary_precedence.test +++ b/test/Twig/Tests/Fixtures/expressions/unary_precedence.test @@ -6,7 +6,7 @@ Twig unary operators precedence {{ -1 * -1 }} {{ 4 / -1 * 5 }} --DATA-- -return array() +return [] --EXPECT-- -2 0 diff --git a/test/Twig/Tests/Fixtures/filters/abs.test b/test/Twig/Tests/Fixtures/filters/abs.test index 27e93fd63..7518769d4 100644 --- a/test/Twig/Tests/Fixtures/filters/abs.test +++ b/test/Twig/Tests/Fixtures/filters/abs.test @@ -14,7 +14,7 @@ {{ number5|abs }} {{ number6|abs }} --DATA-- -return array('number1' => -5.5, 'number2' => -5, 'number3' => -0, 'number4' => 0, 'number5' => 5, 'number6' => 5.5) +return ['number1' => -5.5, 'number2' => -5, 'number3' => -0, 'number4' => 0, 'number5' => 5, 'number6' => 5.5] --EXPECT-- 5.5 5 diff --git a/test/Twig/Tests/Fixtures/filters/batch.test b/test/Twig/Tests/Fixtures/filters/batch.test index cb6de7f97..5ed29a02c 100644 --- a/test/Twig/Tests/Fixtures/filters/batch.test +++ b/test/Twig/Tests/Fixtures/filters/batch.test @@ -9,7 +9,7 @@ {% endfor %} --DATA-- -return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')) +return ['items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')] --EXPECT--
a
diff --git a/test/Twig/Tests/Fixtures/filters/batch_float.test b/test/Twig/Tests/Fixtures/filters/batch_float.test index e2ec4beb2..6cf06db53 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_float.test +++ b/test/Twig/Tests/Fixtures/filters/batch_float.test @@ -9,7 +9,7 @@
{% endfor %} --DATA-- -return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')) +return ['items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')] --EXPECT--
a
diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test b/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test index af996f246..68f88077c 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test +++ b/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test @@ -11,7 +11,7 @@ {% endfor %} --DATA-- -return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')) +return ['items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test b/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test index 72483f4b5..78b7b626c 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test +++ b/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test @@ -9,7 +9,7 @@ {% endfor %} --DATA-- -return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l')) +return ['items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l')] --EXPECT--
a
diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_fill.test b/test/Twig/Tests/Fixtures/filters/batch_with_fill.test index 746295f1b..f6513e2a3 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_with_fill.test +++ b/test/Twig/Tests/Fixtures/filters/batch_with_fill.test @@ -11,7 +11,7 @@ {% endfor %}
--DATA-- -return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')) +return ['items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_keys.test b/test/Twig/Tests/Fixtures/filters/batch_with_keys.test index 6015380e2..f3279a636 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_with_keys.test +++ b/test/Twig/Tests/Fixtures/filters/batch_with_keys.test @@ -4,7 +4,7 @@ {{ {'foo': 'bar', 'key': 'value'}|batch(4)|first|keys|join(',') }} {{ {'foo': 'bar', 'key': 'value'}|batch(4, 'fill')|first|keys|join(',') }} --DATA-- -return array() +return [] --EXPECT-- foo,key foo,key,0,1 diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test b/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test index b9c058d6b..bc303da8a 100644 --- a/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test +++ b/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test @@ -4,7 +4,7 @@ {{ []|batch(3)|length }} {{ []|batch(3, 'fill')|length }} --DATA-- -return array() +return [] --EXPECT-- 0 0 diff --git a/test/Twig/Tests/Fixtures/filters/convert_encoding.test b/test/Twig/Tests/Fixtures/filters/convert_encoding.test index 380b04bb8..db8acedef 100644 --- a/test/Twig/Tests/Fixtures/filters/convert_encoding.test +++ b/test/Twig/Tests/Fixtures/filters/convert_encoding.test @@ -5,6 +5,6 @@ function_exists('iconv') || function_exists('mb_convert_encoding') --TEMPLATE-- {{ "愛していますか？"|convert_encoding('ISO-2022-JP', 'UTF-8')|convert_encoding('UTF-8', 'ISO-2022-JP') }} --DATA-- -return array() +return [] --EXPECT-- 愛していますか？ diff --git a/test/Twig/Tests/Fixtures/filters/date_namedargs.test b/test/Twig/Tests/Fixtures/filters/date_namedargs.test index 4ecde8a18..2d1aa1344 100644 --- a/test/Twig/Tests/Fixtures/filters/date_namedargs.test +++ b/test/Twig/Tests/Fixtures/filters/date_namedargs.test @@ -6,7 +6,7 @@ {{ date|date('d/m/Y H:i:s P', timezone='America/Chicago') }} --DATA-- date_default_timezone_set('UTC'); -return array('date' => mktime(13, 45, 0, 10, 4, 2010)) +return ['date' => mktime(13, 45, 0, 10, 4, 2010)] --EXPECT-- 04/10/2010 08:45:00 -05:00 04/10/2010 08:45:00 -05:00 diff --git a/test/Twig/Tests/Fixtures/filters/default.test b/test/Twig/Tests/Fixtures/filters/default.test index b8d1d66f5..8cf131a24 100644 --- a/test/Twig/Tests/Fixtures/filters/default.test +++ b/test/Twig/Tests/Fixtures/filters/default.test @@ -54,7 +54,7 @@ return array( 'object' => new TwigTestFoo(), ) --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- Variable: ok @@ -109,7 +109,7 @@ return array( 'object' => new TwigTestFoo(), ) --CONFIG-- -return array('strict_variables' => true) +return ['strict_variables' => true] --EXPECT-- Variable: ok diff --git a/test/Twig/Tests/Fixtures/filters/dynamic_filter.test b/test/Twig/Tests/Fixtures/filters/dynamic_filter.test index 93c5913f2..27dc8784c 100644 --- a/test/Twig/Tests/Fixtures/filters/dynamic_filter.test +++ b/test/Twig/Tests/Fixtures/filters/dynamic_filter.test @@ -4,7 +4,7 @@ dynamic filter {{ 'bar'|foo_path }} {{ 'bar'|a_foo_b_bar }} --DATA-- -return array() +return [] --EXPECT-- foo/bar a/b/bar diff --git a/test/Twig/Tests/Fixtures/filters/escape.test b/test/Twig/Tests/Fixtures/filters/escape.test index a606c1065..131f5b4e7 100644 --- a/test/Twig/Tests/Fixtures/filters/escape.test +++ b/test/Twig/Tests/Fixtures/filters/escape.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ "foo
"|e }} --DATA-- -return array() +return [] --EXPECT-- foo <br /> diff --git a/test/Twig/Tests/Fixtures/filters/escape_html_attr.test b/test/Twig/Tests/Fixtures/filters/escape_html_attr.test index 009a24532..10e327554 100644 --- a/test/Twig/Tests/Fixtures/filters/escape_html_attr.test +++ b/test/Twig/Tests/Fixtures/filters/escape_html_attr.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ '
'|escape('html_attr') }} --DATA-- -return array() +return [] --EXPECT-- <br /> diff --git a/test/Twig/Tests/Fixtures/filters/escape_javascript.test b/test/Twig/Tests/Fixtures/filters/escape_javascript.test index 8e7278119..4c2fb7a36 100644 --- a/test/Twig/Tests/Fixtures/filters/escape_javascript.test +++ b/test/Twig/Tests/Fixtures/filters/escape_javascript.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ "é ♜ 𝌆"|e('js') }} --DATA-- -return array() +return [] --EXPECT-- \u00E9\u0020\u265C\u0020\uD834\uDF06 diff --git a/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test b/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test index bba26a0df..93f34297b 100644 --- a/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test +++ b/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ "愛していますか？
"|e }} --DATA-- -return array() +return [] --EXPECT-- 愛していますか？ <br /> diff --git a/test/Twig/Tests/Fixtures/filters/first.test b/test/Twig/Tests/Fixtures/filters/first.test index aa54645c3..e25d0bf22 100644 --- a/test/Twig/Tests/Fixtures/filters/first.test +++ b/test/Twig/Tests/Fixtures/filters/first.test @@ -8,7 +8,7 @@ {{ 'Ä€é'|first }} {{ ''|first }} --DATA-- -return array('arr' => new ArrayObject(array(1, 2, 3, 4))) +return ['arr' => new ArrayObject(array(1, 2, 3, 4))] --EXPECT-- 1 1 diff --git a/test/Twig/Tests/Fixtures/filters/force_escape.test b/test/Twig/Tests/Fixtures/filters/force_escape.test index eb9cba7cf..7efbe3200 100644 --- a/test/Twig/Tests/Fixtures/filters/force_escape.test +++ b/test/Twig/Tests/Fixtures/filters/force_escape.test @@ -11,7 +11,7 @@ {{ foo }} {% endautoescape %} --DATA-- -return array() +return [] --EXPECT-- foo<br /> \u0020\u0020\u0020\u0020foo\u003Cbr\u0020\/\u003E\n diff --git a/test/Twig/Tests/Fixtures/filters/format.test b/test/Twig/Tests/Fixtures/filters/format.test index 97221ff80..efaf8317a 100644 --- a/test/Twig/Tests/Fixtures/filters/format.test +++ b/test/Twig/Tests/Fixtures/filters/format.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ string|format(foo, 3) }} --DATA-- -return array('string' => '%s/%d', 'foo' => 'bar') +return ['string' => '%s/%d', 'foo' => 'bar'] --EXPECT-- bar/3 diff --git a/test/Twig/Tests/Fixtures/filters/join.test b/test/Twig/Tests/Fixtures/filters/join.test index ad9f887ed..ae6063075 100644 --- a/test/Twig/Tests/Fixtures/filters/join.test +++ b/test/Twig/Tests/Fixtures/filters/join.test @@ -18,7 +18,7 @@ {{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',') }} {{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',','-') }} --DATA-- -return array('foo' => new TwigTestFoo(), 'bar' => new ArrayObject(array(3, 4))) +return ['foo' => new TwigTestFoo(), 'bar' => new ArrayObject(array(3, 4))] --EXPECT-- foo, bar 1, 2 diff --git a/test/Twig/Tests/Fixtures/filters/json_encode.test b/test/Twig/Tests/Fixtures/filters/json_encode.test index 1738d40cd..ea45218f6 100644 --- a/test/Twig/Tests/Fixtures/filters/json_encode.test +++ b/test/Twig/Tests/Fixtures/filters/json_encode.test @@ -5,7 +5,7 @@ {{ foo|json_encode|raw }} {{ [foo, "foo"]|json_encode|raw }} --DATA-- -return array('foo' => new Twig_Markup('foo', 'UTF-8')) +return ['foo' => new Twig_Markup('foo', 'UTF-8')] --EXPECT-- "foo" "foo" diff --git a/test/Twig/Tests/Fixtures/filters/last.test b/test/Twig/Tests/Fixtures/filters/last.test index 1b8031ee8..27328a54b 100644 --- a/test/Twig/Tests/Fixtures/filters/last.test +++ b/test/Twig/Tests/Fixtures/filters/last.test @@ -8,7 +8,7 @@ {{ 'Ä€é'|last }} {{ ''|last }} --DATA-- -return array('arr' => new ArrayObject(array(1, 2, 3, 4))) +return ['arr' => new ArrayObject(array(1, 2, 3, 4))] --EXPECT-- 4 4 diff --git a/test/Twig/Tests/Fixtures/filters/length_utf8.test b/test/Twig/Tests/Fixtures/filters/length_utf8.test index 5d5e24361..be2170715 100644 --- a/test/Twig/Tests/Fixtures/filters/length_utf8.test +++ b/test/Twig/Tests/Fixtures/filters/length_utf8.test @@ -6,7 +6,7 @@ function_exists('mb_get_info') {{ string|length }} {{ markup|length }} --DATA-- -return array('string' => 'été', 'markup' => new Twig_Markup('foo', 'UTF-8')) +return ['string' => 'été', 'markup' => new Twig_Markup('foo', 'UTF-8')] --EXPECT-- 3 3 diff --git a/test/Twig/Tests/Fixtures/filters/merge.test b/test/Twig/Tests/Fixtures/filters/merge.test index 81371a41b..3343fc9cc 100644 --- a/test/Twig/Tests/Fixtures/filters/merge.test +++ b/test/Twig/Tests/Fixtures/filters/merge.test @@ -8,7 +8,7 @@ {{ numerics|merge([4, 5, 6])|join }} {{ traversable.a|merge(traversable.b)|join }} --DATA-- -return array('items' => array('foo' => 'bar'), 'numerics' => array(1, 2, 3), 'traversable' => array('a' => new ArrayObject(array(0 => 1, 1 => 2, 2 => 3)), 'b' => new ArrayObject(array('a' => 'b')))) +return ['items' => array('foo' => 'bar'), 'numerics' => array(1, 2, 3), 'traversable' => array('a' => new ArrayObject(array(0 => 1, 1 => 2, 2 => 3)), 'b' => new ArrayObject(array('a' => 'b')))] --EXPECT-- barfoo foobar diff --git a/test/Twig/Tests/Fixtures/filters/nl2br.test b/test/Twig/Tests/Fixtures/filters/nl2br.test index 6545a9bb0..524ec45f9 100644 --- a/test/Twig/Tests/Fixtures/filters/nl2br.test +++ b/test/Twig/Tests/Fixtures/filters/nl2br.test @@ -4,7 +4,7 @@ {{ "I like Twig.\nYou will like it too.\n\nEverybody like it!"|nl2br }} {{ text|nl2br }} --DATA-- -return array('text' => "If you have some HTML\nit will be escaped.") +return ['text' => "If you have some HTML\nit will be escaped."] --EXPECT-- I like Twig.
You will like it too.
diff --git a/test/Twig/Tests/Fixtures/filters/number_format.test b/test/Twig/Tests/Fixtures/filters/number_format.test index 639a8659f..7f1e2e16a 100644 --- a/test/Twig/Tests/Fixtures/filters/number_format.test +++ b/test/Twig/Tests/Fixtures/filters/number_format.test @@ -8,7 +8,7 @@ {{ 1020.25|number_format(2, ',') }} {{ 1020.25|number_format(2, ',', '.') }} --DATA-- -return array(); +return [] --EXPECT-- 20 20 diff --git a/test/Twig/Tests/Fixtures/filters/number_format_default.test b/test/Twig/Tests/Fixtures/filters/number_format_default.test index 65c1cdb48..c550bb674 100644 --- a/test/Twig/Tests/Fixtures/filters/number_format_default.test +++ b/test/Twig/Tests/Fixtures/filters/number_format_default.test @@ -10,7 +10,7 @@ {{ 1020.25|number_format(2, ',', '.') }} --DATA-- $twig->getExtension('Twig_Extension_Core')->setNumberFormat(2, '!', '='); -return array(); +return [] --EXPECT-- 20!00 20!25 diff --git a/test/Twig/Tests/Fixtures/filters/replace.test b/test/Twig/Tests/Fixtures/filters/replace.test index 06be7e270..80cbc2920 100644 --- a/test/Twig/Tests/Fixtures/filters/replace.test +++ b/test/Twig/Tests/Fixtures/filters/replace.test @@ -5,7 +5,7 @@ {{ 'I like single replace operation only %that%'|replace({'%that%' : '%that%1'}) }} {{ 'I like %this% and %that%.'|replace(traversable) }} --DATA-- -return array('traversable' => new ArrayObject(array('%this%' => 'foo', '%that%' => 'bar'))) +return ['traversable' => new ArrayObject(array('%this%' => 'foo', '%that%' => 'bar'))] --EXPECT-- I liké foo and bar. I like single replace operation only %that%1 diff --git a/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test b/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test index 2143a8690..393b430c9 100644 --- a/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test +++ b/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test @@ -3,6 +3,6 @@ Exception for invalid argument type in replace call --TEMPLATE-- {{ 'test %foo%'|replace(stdClass) }} --DATA-- -return array('stdClass' => new stdClass()) +return ['stdClass' => new stdClass()] --EXCEPTION-- Twig_Error_Runtime: The "replace" filter expects an array or "Traversable" as replace values, got "stdClass" in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/filters/reverse.test b/test/Twig/Tests/Fixtures/filters/reverse.test index 7948ac45f..f50619eed 100644 --- a/test/Twig/Tests/Fixtures/filters/reverse.test +++ b/test/Twig/Tests/Fixtures/filters/reverse.test @@ -8,7 +8,7 @@ {{ {'a': 'c', 'b': 'a'}|reverse(preserveKeys=true)|join(glue=',') }} {{ {'a': 'c', 'b': 'a'}|reverse(preserve_keys=true)|join(glue=',') }} --DATA-- -return array('arr' => new ArrayObject(array(1, 2, 3, 4))) +return ['arr' => new ArrayObject(array(1, 2, 3, 4))] --EXPECT-- 4321 tnemenèvé4321 diff --git a/test/Twig/Tests/Fixtures/filters/round.test b/test/Twig/Tests/Fixtures/filters/round.test index 57806b619..709237543 100644 --- a/test/Twig/Tests/Fixtures/filters/round.test +++ b/test/Twig/Tests/Fixtures/filters/round.test @@ -10,7 +10,7 @@ {{ 21.3|round(-1, 'ceil')}} {{ 21.3|round(-1, 'floor')}} --DATA-- -return array() +return [] --EXPECT-- 3 2 diff --git a/test/Twig/Tests/Fixtures/filters/slice.test b/test/Twig/Tests/Fixtures/filters/slice.test index b49b89fe5..7e851a09d 100644 --- a/test/Twig/Tests/Fixtures/filters/slice.test +++ b/test/Twig/Tests/Fixtures/filters/slice.test @@ -26,7 +26,7 @@ {{ arr[2:]|join('') }} {{ xml|slice(1)|join('')}} --DATA-- -return array('start' => 1, 'length' => 2, 'arr' => new ArrayObject(array(1, 2, 3, 4)), 'xml' => new SimpleXMLElement('12')) +return ['start' => 1, 'length' => 2, 'arr' => new ArrayObject(array(1, 2, 3, 4)), 'xml' => new SimpleXMLElement('12')] --EXPECT-- 23 23 diff --git a/test/Twig/Tests/Fixtures/filters/sort.test b/test/Twig/Tests/Fixtures/filters/sort.test index c67c18ea9..8ba0b9077 100644 --- a/test/Twig/Tests/Fixtures/filters/sort.test +++ b/test/Twig/Tests/Fixtures/filters/sort.test @@ -5,7 +5,7 @@ {{ array2|sort|join }} {{ traversable|sort|join }} --DATA-- -return array('array1' => array(4, 1), 'array2' => array('foo', 'bar'), 'traversable' => new ArrayObject(array(0 => 3, 1 => 2, 2 => 1))) +return ['array1' => array(4, 1), 'array2' => array('foo', 'bar'), 'traversable' => new ArrayObject(array(0 => 3, 1 => 2, 2 => 1))] --EXPECT-- 14 barfoo diff --git a/test/Twig/Tests/Fixtures/filters/special_chars.test b/test/Twig/Tests/Fixtures/filters/special_chars.test index dbaf7dc97..9869ec91c 100644 --- a/test/Twig/Tests/Fixtures/filters/special_chars.test +++ b/test/Twig/Tests/Fixtures/filters/special_chars.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ 'foo'|§ }} --DATA-- -return array() +return [] --EXPECT-- §foo§ diff --git a/test/Twig/Tests/Fixtures/filters/split.test b/test/Twig/Tests/Fixtures/filters/split.test index a093ed79b..92dbf0a05 100644 --- a/test/Twig/Tests/Fixtures/filters/split.test +++ b/test/Twig/Tests/Fixtures/filters/split.test @@ -9,7 +9,7 @@ {{ baz|split('', 2)|join('-') }} {{ foo|split(',', -2)|join('-') }} --DATA-- -return array('foo' => "one,two,three,four,five", 'baz' => '12345',) +return ['foo' => "one,two,three,four,five", 'baz' => '12345',] --EXPECT-- one-two-three-four-five one-two-three-four-five diff --git a/test/Twig/Tests/Fixtures/filters/split_utf8.test b/test/Twig/Tests/Fixtures/filters/split_utf8.test index 305e162fe..bf52e6df7 100644 --- a/test/Twig/Tests/Fixtures/filters/split_utf8.test +++ b/test/Twig/Tests/Fixtures/filters/split_utf8.test @@ -12,7 +12,7 @@ function_exists('mb_get_info') {{ baz|split('', 1)|join('-') }} {{ baz|split('', 2)|join('-') }} --DATA-- -return array('foo' => 'Ä,é,Äほ', 'baz' => 'éÄßごa',) +return ['foo' => 'Ä,é,Äほ', 'baz' => 'éÄßごa',] --EXPECT-- é Ä-é-Äほ diff --git a/test/Twig/Tests/Fixtures/filters/static_calls.test b/test/Twig/Tests/Fixtures/filters/static_calls.test index 4e17b7726..1626db0c9 100644 --- a/test/Twig/Tests/Fixtures/filters/static_calls.test +++ b/test/Twig/Tests/Fixtures/filters/static_calls.test @@ -4,7 +4,7 @@ Filters as static method calls {{ 'foo'|static_call_string }} {{ 'foo'|static_call_array }} --DATA-- -return array('foo' => 'foo') +return ['foo' => 'foo'] --EXPECT-- *foo* *foo* diff --git a/test/Twig/Tests/Fixtures/filters/trim.test b/test/Twig/Tests/Fixtures/filters/trim.test index b1ef7b473..432989ff1 100644 --- a/test/Twig/Tests/Fixtures/filters/trim.test +++ b/test/Twig/Tests/Fixtures/filters/trim.test @@ -11,7 +11,7 @@ {{ "/ foo/"|trim(character_mask="/", side="left") }} {{ " do nothing. "|trim("", "right") }} --DATA-- -return array('text' => " If you have some HTML it will be escaped. ") +return ['text' => " If you have some HTML it will be escaped. "] --EXPECT-- I like Twig. If you have some <strong>HTML</strong> it will be escaped. diff --git a/test/Twig/Tests/Fixtures/filters/urlencode.test b/test/Twig/Tests/Fixtures/filters/urlencode.test index 8726159db..66a682dd3 100644 --- a/test/Twig/Tests/Fixtures/filters/urlencode.test +++ b/test/Twig/Tests/Fixtures/filters/urlencode.test @@ -8,7 +8,7 @@ defined('PHP_QUERY_RFC3986') {{ {}|url_encode|default("default") }} {{ 'spéßi%le%c0d@dspa ce'|url_encode }} --DATA-- -return array() +return [] --EXPECT-- foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce= foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce= diff --git a/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test b/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test index 35e50390d..38d726492 100644 --- a/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test +++ b/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test @@ -8,7 +8,7 @@ defined('PHP_QUERY_RFC3986') {{ {}|url_encode|default("default") }} {{ 'spéßi%le%c0d@dspa ce'|url_encode }} --DATA-- -return array() +return [] --EXPECT-- foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce= foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce= diff --git a/test/Twig/Tests/Fixtures/functions/attribute.test b/test/Twig/Tests/Fixtures/functions/attribute.test index 71b2038aa..0fc3be305 100644 --- a/test/Twig/Tests/Fixtures/functions/attribute.test +++ b/test/Twig/Tests/Fixtures/functions/attribute.test @@ -8,7 +8,7 @@ {{ attribute(obj, method) is defined ? 'ok' : 'ko' }} {{ attribute(obj, nonmethod) is defined ? 'ok' : 'ko' }} --DATA-- -return array('obj' => new TwigTestFoo(), 'method' => 'foo', 'array' => array('foo' => 'bar'), 'item' => 'foo', 'nonmethod' => 'xxx', 'arguments' => array('a', 'b')) +return ['obj' => new TwigTestFoo(), 'method' => 'foo', 'array' => array('foo' => 'bar'), 'item' => 'foo', 'nonmethod' => 'xxx', 'arguments' => array('a', 'b')] --EXPECT-- foo bar diff --git a/test/Twig/Tests/Fixtures/functions/block.test b/test/Twig/Tests/Fixtures/functions/block.test index 8e54059ae..1a4fd5492 100644 --- a/test/Twig/Tests/Fixtures/functions/block.test +++ b/test/Twig/Tests/Fixtures/functions/block.test @@ -7,6 +7,6 @@ {% block foo %}{{ block('bar') }}{% endblock %} {% block bar %}BAR_BASE{% endblock %} --DATA-- -return array() +return [] --EXPECT-- BARBAR diff --git a/test/Twig/Tests/Fixtures/functions/block_without_name.test b/test/Twig/Tests/Fixtures/functions/block_without_name.test index 665cc87e5..0affc9d04 100644 --- a/test/Twig/Tests/Fixtures/functions/block_without_name.test +++ b/test/Twig/Tests/Fixtures/functions/block_without_name.test @@ -7,6 +7,6 @@ {% block foo %}{{ block() }}{% endblock %} {% block bar %}BAR_BASE{% endblock %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: The "block" function takes one argument (the block name) in "base.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/functions/constant.test b/test/Twig/Tests/Fixtures/functions/constant.test index 63128791f..d0e73ec21 100644 --- a/test/Twig/Tests/Fixtures/functions/constant.test +++ b/test/Twig/Tests/Fixtures/functions/constant.test @@ -4,7 +4,7 @@ {{ constant('DATE_W3C') == expect ? 'true' : 'false' }} {{ constant('ARRAY_AS_PROPS', object) }} --DATA-- -return array('expect' => DATE_W3C, 'object' => new ArrayObject(array('hi'))); +return ['expect' => DATE_W3C, 'object' => new ArrayObject(array('hi'))] --EXPECT-- true 2 diff --git a/test/Twig/Tests/Fixtures/functions/cycle.test b/test/Twig/Tests/Fixtures/functions/cycle.test index 522a63b85..b2ec9c777 100644 --- a/test/Twig/Tests/Fixtures/functions/cycle.test +++ b/test/Twig/Tests/Fixtures/functions/cycle.test @@ -5,7 +5,7 @@ {{ cycle(array1, i) }}-{{ cycle(array2, i) }} {% endfor %} --DATA-- -return array('array1' => array('odd', 'even'), 'array2' => array('apple', 'orange', 'citrus')) +return ['array1' => array('odd', 'even'), 'array2' => array('apple', 'orange', 'citrus')] --EXPECT-- odd-apple even-orange diff --git a/test/Twig/Tests/Fixtures/functions/date_namedargs.test b/test/Twig/Tests/Fixtures/functions/date_namedargs.test index b9dd9e383..11f60ee8b 100644 --- a/test/Twig/Tests/Fixtures/functions/date_namedargs.test +++ b/test/Twig/Tests/Fixtures/functions/date_namedargs.test @@ -5,7 +5,7 @@ {{ date(timezone="America/New_York", date=date)|date('d/m/Y H:i:s P', false) }} --DATA-- date_default_timezone_set('UTC'); -return array('date' => mktime(13, 45, 0, 10, 4, 2010)) +return ['date' => mktime(13, 45, 0, 10, 4, 2010)] --EXPECT-- 04/10/2010 09:45:00 -04:00 04/10/2010 09:45:00 -04:00 diff --git a/test/Twig/Tests/Fixtures/functions/dump.test b/test/Twig/Tests/Fixtures/functions/dump.test index f4072375a..691a3abea 100644 --- a/test/Twig/Tests/Fixtures/functions/dump.test +++ b/test/Twig/Tests/Fixtures/functions/dump.test @@ -6,9 +6,9 @@ {{ dump('foo') }} {{ dump('foo', 'bar') }} --DATA-- -return array('foo' => 'foo', 'bar' => 'bar') +return ['foo' => 'foo', 'bar' => 'bar'] --CONFIG-- -return array('debug' => true, 'autoescape' => false); +return ['debug' => true, 'autoescape' => false] --EXPECT-- string(3) "foo" diff --git a/test/Twig/Tests/Fixtures/functions/dump_array.test b/test/Twig/Tests/Fixtures/functions/dump_array.test index 889b7a922..f33e80ffd 100644 --- a/test/Twig/Tests/Fixtures/functions/dump_array.test +++ b/test/Twig/Tests/Fixtures/functions/dump_array.test @@ -5,9 +5,9 @@ --TEMPLATE-- {{ dump() }} --DATA-- -return array('foo' => 'foo', 'bar' => 'bar') +return ['foo' => 'foo', 'bar' => 'bar'] --CONFIG-- -return array('debug' => true, 'autoescape' => false); +return ['debug' => true, 'autoescape' => false] --EXPECT-- array(3) { ["foo"]=> diff --git a/test/Twig/Tests/Fixtures/functions/dynamic_function.test b/test/Twig/Tests/Fixtures/functions/dynamic_function.test index 913fbc995..c7b3539c4 100644 --- a/test/Twig/Tests/Fixtures/functions/dynamic_function.test +++ b/test/Twig/Tests/Fixtures/functions/dynamic_function.test @@ -4,7 +4,7 @@ dynamic function {{ foo_path('bar') }} {{ a_foo_b_bar('bar') }} --DATA-- -return array() +return [] --EXPECT-- foo/bar a/b/bar diff --git a/test/Twig/Tests/Fixtures/functions/include/assignment.test b/test/Twig/Tests/Fixtures/functions/include/assignment.test index b7653b4ef..c9ce8123f 100644 --- a/test/Twig/Tests/Fixtures/functions/include/assignment.test +++ b/test/Twig/Tests/Fixtures/functions/include/assignment.test @@ -7,7 +7,7 @@ FOO{{ tmp }}BAR --TEMPLATE(foo.twig)-- FOOBAR --DATA-- -return array() +return [] --EXPECT-- FOO FOOBARBAR diff --git a/test/Twig/Tests/Fixtures/functions/include/autoescaping.test b/test/Twig/Tests/Fixtures/functions/include/autoescaping.test index 56f8f3b5a..a3666261f 100644 --- a/test/Twig/Tests/Fixtures/functions/include/autoescaping.test +++ b/test/Twig/Tests/Fixtures/functions/include/autoescaping.test @@ -5,6 +5,6 @@ --TEMPLATE(foo.twig)--

Test

--DATA-- -return array() +return [] --EXPECT--

Test

diff --git a/test/Twig/Tests/Fixtures/functions/include/basic.test b/test/Twig/Tests/Fixtures/functions/include/basic.test index a434182a2..f90983c02 100644 --- a/test/Twig/Tests/Fixtures/functions/include/basic.test +++ b/test/Twig/Tests/Fixtures/functions/include/basic.test @@ -8,7 +8,7 @@ BAR --TEMPLATE(foo.twig)-- FOOBAR --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/functions/include/expression.test b/test/Twig/Tests/Fixtures/functions/include/expression.test index aba30ce3f..c6d3d1c53 100644 --- a/test/Twig/Tests/Fixtures/functions/include/expression.test +++ b/test/Twig/Tests/Fixtures/functions/include/expression.test @@ -8,7 +8,7 @@ BAR --TEMPLATE(foo.twig)-- FOOBAR --DATA-- -return array('foo' => 'foo.twig') +return ['foo' => 'foo.twig'] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test b/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test index 43a2ccc2c..c05b43e14 100644 --- a/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test +++ b/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test @@ -6,5 +6,5 @@ {{ include("foo.twig", ignore_missing = true, variables = {}) }} {{ include("foo.twig", ignore_missing = true, variables = {}, with_context = true) }} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/functions/include/missing.test b/test/Twig/Tests/Fixtures/functions/include/missing.test index 4d2f6cf13..96445ecda 100644 --- a/test/Twig/Tests/Fixtures/functions/include/missing.test +++ b/test/Twig/Tests/Fixtures/functions/include/missing.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ include("foo.twig") }} --DATA-- -return array(); +return [] --EXCEPTION-- Twig_Error_Loader: Template "foo.twig" is not defined in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/functions/include/missing_nested.test b/test/Twig/Tests/Fixtures/functions/include/missing_nested.test index 78fddc7a6..082ef86c8 100644 --- a/test/Twig/Tests/Fixtures/functions/include/missing_nested.test +++ b/test/Twig/Tests/Fixtures/functions/include/missing_nested.test @@ -11,6 +11,6 @@ {{ include("foo.twig") }} {% endblock %} --DATA-- -return array(); +return [] --EXCEPTION-- Twig_Error_Loader: Template "foo.twig" is not defined in "base.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/functions/include/sandbox.test b/test/Twig/Tests/Fixtures/functions/include/sandbox.test index 7b9ccaca8..af5cbf1a6 100644 --- a/test/Twig/Tests/Fixtures/functions/include/sandbox.test +++ b/test/Twig/Tests/Fixtures/functions/include/sandbox.test @@ -8,6 +8,6 @@ {{ foo|e }} {{ foo|e }} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Sandbox_SecurityNotAllowedFilterError: Filter "e" is not allowed in "foo.twig" at line 4. diff --git a/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test b/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test index 8ffc49225..1206b67fe 100644 --- a/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test +++ b/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test @@ -8,7 +8,7 @@ foo --TEMPLATE(bar.twig)-- {{ foo|e }} --DATA-- -return array('foo' => 'bar
') +return ['foo' => 'bar
'] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test b/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test index 8bf6e102d..c5be0088a 100644 --- a/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test +++ b/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test @@ -6,7 +6,7 @@ --TEMPLATE(bar.twig)-- {{ foo|e }} --DATA-- -return array('foo' => 'bar
') +return ['foo' => 'bar
'] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/functions/include/template_instance.test b/test/Twig/Tests/Fixtures/functions/include/template_instance.test index 18d405a02..8ba956b89 100644 --- a/test/Twig/Tests/Fixtures/functions/include/template_instance.test +++ b/test/Twig/Tests/Fixtures/functions/include/template_instance.test @@ -5,6 +5,6 @@ --TEMPLATE(foo.twig)-- BAR --DATA-- -return array('foo' => $twig->loadTemplate('foo.twig')) +return ['foo' => $twig->loadTemplate('foo.twig')] --EXPECT-- BAR FOO diff --git a/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test b/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test index 1a8100687..21e5bb2ef 100644 --- a/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test +++ b/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test @@ -6,7 +6,7 @@ --TEMPLATE(foo.twig)-- foo --DATA-- -return array() +return [] --EXPECT-- foo foo diff --git a/test/Twig/Tests/Fixtures/functions/include/with_context.test b/test/Twig/Tests/Fixtures/functions/include/with_context.test index 35611fbb9..46ac8c79b 100644 --- a/test/Twig/Tests/Fixtures/functions/include/with_context.test +++ b/test/Twig/Tests/Fixtures/functions/include/with_context.test @@ -8,7 +8,7 @@ --TEMPLATE(foo.twig)-- {% for k, v in _context %}{{ k }},{% endfor %} --DATA-- -return array('foo' => 'bar') +return ['foo' => 'bar'] --EXPECT-- foo,global,_parent, global,_parent, diff --git a/test/Twig/Tests/Fixtures/functions/include/with_variables.test b/test/Twig/Tests/Fixtures/functions/include/with_variables.test index b2ace940e..aa331f7b8 100644 --- a/test/Twig/Tests/Fixtures/functions/include/with_variables.test +++ b/test/Twig/Tests/Fixtures/functions/include/with_variables.test @@ -6,7 +6,7 @@ --TEMPLATE(foo.twig)-- {{ foo }} --DATA-- -return array('vars' => array('foo' => 'bar')) +return ['vars' => array('foo' => 'bar')] --EXPECT-- bar bar diff --git a/test/Twig/Tests/Fixtures/functions/magic_call.test b/test/Twig/Tests/Fixtures/functions/magic_call.test index 933544312..4dd5e2704 100644 --- a/test/Twig/Tests/Fixtures/functions/magic_call.test +++ b/test/Twig/Tests/Fixtures/functions/magic_call.test @@ -3,6 +3,6 @@ __call calls --TEMPLATE-- {{ 'foo'|magic_call }} --DATA-- -return array() +return [] --EXPECT-- magic_foo diff --git a/test/Twig/Tests/Fixtures/functions/magic_call53.test b/test/Twig/Tests/Fixtures/functions/magic_call53.test index a0f55e116..a7c65bf67 100644 --- a/test/Twig/Tests/Fixtures/functions/magic_call53.test +++ b/test/Twig/Tests/Fixtures/functions/magic_call53.test @@ -6,7 +6,7 @@ version_compare(phpversion(), '5.3.0', '>=') {{ 'foo'|magic_call_string }} {{ 'foo'|magic_call_array }} --DATA-- -return array() +return [] --EXPECT-- static_magic_foo static_magic_foo diff --git a/test/Twig/Tests/Fixtures/functions/max.test b/test/Twig/Tests/Fixtures/functions/max.test index e6c94af63..6d2de000d 100644 --- a/test/Twig/Tests/Fixtures/functions/max.test +++ b/test/Twig/Tests/Fixtures/functions/max.test @@ -5,7 +5,7 @@ {{ max(2, 1, 3, 5, 4) }} {{ max({2:"two", 1:"one", 3:"three", 5:"five", 4:"for"}) }} --DATA-- -return array() +return [] --EXPECT-- 5 5 diff --git a/test/Twig/Tests/Fixtures/functions/min.test b/test/Twig/Tests/Fixtures/functions/min.test index 660471c00..1fe5446b7 100644 --- a/test/Twig/Tests/Fixtures/functions/min.test +++ b/test/Twig/Tests/Fixtures/functions/min.test @@ -5,7 +5,7 @@ {{ min([2, 1, 3, 5, 4]) }} {{ min({2:"two", 1:"one", 3:"three", 5:"five", 4:"for"}) }} --DATA-- -return array() +return [] --EXPECT-- 1 1 diff --git a/test/Twig/Tests/Fixtures/functions/range.test b/test/Twig/Tests/Fixtures/functions/range.test index e0377c8d4..2927333b9 100644 --- a/test/Twig/Tests/Fixtures/functions/range.test +++ b/test/Twig/Tests/Fixtures/functions/range.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ range(low=0+1, high=10+0, step=2)|join(',') }} --DATA-- -return array() +return [] --EXPECT-- 1,3,5,7,9 diff --git a/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test b/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test index bf0556d24..0870dfaf8 100644 --- a/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test +++ b/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test @@ -16,6 +16,6 @@ --TEMPLATE(base.twig)-- {{ block('list') }} --DATA-- -return array('item' => array('1', '2', array('3.1', array('3.2.1', '3.2.2'), '3.4'))) +return ['item' => array('1', '2', array('3.1', array('3.2.1', '3.2.2'), '3.4'))] --EXPECT--
  1. "1"
  2. "2"
    1. "3.1"
      1. "3.2.1"
      2. "3.2.2"
    3. "3.4"
diff --git a/test/Twig/Tests/Fixtures/functions/source.test b/test/Twig/Tests/Fixtures/functions/source.test index 0e094c3b2..b691ce7bc 100644 --- a/test/Twig/Tests/Fixtures/functions/source.test +++ b/test/Twig/Tests/Fixtures/functions/source.test @@ -8,7 +8,7 @@ BAR --TEMPLATE(foo.twig)-- {{ foo }}
--DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/functions/special_chars.test b/test/Twig/Tests/Fixtures/functions/special_chars.test index 30c3df516..9c9e24945 100644 --- a/test/Twig/Tests/Fixtures/functions/special_chars.test +++ b/test/Twig/Tests/Fixtures/functions/special_chars.test @@ -3,6 +3,6 @@ --TEMPLATE-- {{ §('foo') }} --DATA-- -return array() +return [] --EXPECT-- §foo§ diff --git a/test/Twig/Tests/Fixtures/functions/static_calls.test b/test/Twig/Tests/Fixtures/functions/static_calls.test index 57e5be392..dd13abb0b 100644 --- a/test/Twig/Tests/Fixtures/functions/static_calls.test +++ b/test/Twig/Tests/Fixtures/functions/static_calls.test @@ -4,7 +4,7 @@ Functions as static method calls {{ static_call_string('foo') }} {{ static_call_array('foo') }} --DATA-- -return array('foo' => 'foo') +return ['foo' => 'foo'] --EXPECT-- *foo* *foo* diff --git a/test/Twig/Tests/Fixtures/functions/template_from_string.test b/test/Twig/Tests/Fixtures/functions/template_from_string.test index 3d3b95874..33b0e40d7 100644 --- a/test/Twig/Tests/Fixtures/functions/template_from_string.test +++ b/test/Twig/Tests/Fixtures/functions/template_from_string.test @@ -8,7 +8,7 @@ --TEMPLATE(parent.twig)-- {% block content %}{% endblock %} --DATA-- -return array('name' => 'Fabien', 'template' => "Hello {{ name }}") +return ['name' => 'Fabien', 'template' => "Hello {{ name }}"] --EXPECT-- Hello Fabien Hello Fabien diff --git a/test/Twig/Tests/Fixtures/macros/default_values.test b/test/Twig/Tests/Fixtures/macros/default_values.test index 4ccff7b67..18bba524a 100644 --- a/test/Twig/Tests/Fixtures/macros/default_values.test +++ b/test/Twig/Tests/Fixtures/macros/default_values.test @@ -10,7 +10,7 @@ macro {{ test('foo') }} {{ test('bar', 'foo') }} --DATA-- -return array(); +return [] --EXPECT-- foobar barfoo diff --git a/test/Twig/Tests/Fixtures/macros/nested_calls.test b/test/Twig/Tests/Fixtures/macros/nested_calls.test index cd2542810..4577286d0 100644 --- a/test/Twig/Tests/Fixtures/macros/nested_calls.test +++ b/test/Twig/Tests/Fixtures/macros/nested_calls.test @@ -13,6 +13,6 @@ macro {{ macros.foo(macros.bar()) }} --DATA-- -return array(); +return [] --EXPECT--
diff --git a/test/Twig/Tests/Fixtures/macros/reserved_variables.test b/test/Twig/Tests/Fixtures/macros/reserved_variables.test index cbfb921b2..05dd92130 100644 --- a/test/Twig/Tests/Fixtures/macros/reserved_variables.test +++ b/test/Twig/Tests/Fixtures/macros/reserved_variables.test @@ -9,6 +9,6 @@ macro {{ test(this) }} --DATA-- -return array('this' => 'foo'); +return ['this' => 'foo'] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/macros/simple.test b/test/Twig/Tests/Fixtures/macros/simple.test index 6a366cdf1..8fc6b477f 100644 --- a/test/Twig/Tests/Fixtures/macros/simple.test +++ b/test/Twig/Tests/Fixtures/macros/simple.test @@ -14,7 +14,7 @@ macro {{ test.test(1, "c") }} {{ test(1, "c") }} --DATA-- -return array(); +return [] --EXPECT-- a
b
a
b
diff --git a/test/Twig/Tests/Fixtures/macros/varargs.test b/test/Twig/Tests/Fixtures/macros/varargs.test index 412c90fae..dd4b5c9f4 100644 --- a/test/Twig/Tests/Fixtures/macros/varargs.test +++ b/test/Twig/Tests/Fixtures/macros/varargs.test @@ -14,7 +14,7 @@ macro with arbitrary arguments {{ test1("foo", "bar", "foobar") }} {{ test2("foo", "bar", "foobar") }} --DATA-- -return array(); +return [] --EXPECT-- foo: bar, foobar diff --git a/test/Twig/Tests/Fixtures/macros/with_filters.test b/test/Twig/Tests/Fixtures/macros/with_filters.test index 685626f2a..96064ba01 100644 --- a/test/Twig/Tests/Fixtures/macros/with_filters.test +++ b/test/Twig/Tests/Fixtures/macros/with_filters.test @@ -9,6 +9,6 @@ macro with a filter {{ test.test() }} --DATA-- -return array(); +return [] --EXPECT-- foo<br /> diff --git a/test/Twig/Tests/Fixtures/regression/block_names_unicity.test b/test/Twig/Tests/Fixtures/regression/block_names_unicity.test index 40c067391..df0747072 100644 --- a/test/Twig/Tests/Fixtures/regression/block_names_unicity.test +++ b/test/Twig/Tests/Fixtures/regression/block_names_unicity.test @@ -13,7 +13,7 @@ Block names are unique per template {% endfilter %} {% block content %}{% endblock %} --DATA-- -return array(); +return [] --EXPECT-- First Second diff --git a/test/Twig/Tests/Fixtures/regression/combined_debug_info.test b/test/Twig/Tests/Fixtures/regression/combined_debug_info.test index ff977ad62..b5281dc5f 100644 --- a/test/Twig/Tests/Fixtures/regression/combined_debug_info.test +++ b/test/Twig/Tests/Fixtures/regression/combined_debug_info.test @@ -10,6 +10,6 @@ index foo {{ foo.bar }} --DATA-- -return array('foo' => 'foo'); +return ['foo' => 'foo'] --EXCEPTION-- Twig_Error_Runtime: Impossible to access an attribute ("bar") on a string variable ("foo") in "foo" at line 3. diff --git a/test/Twig/Tests/Fixtures/regression/empty_token.test b/test/Twig/Tests/Fixtures/regression/empty_token.test index 65f6cd2b8..25bdc9e40 100644 --- a/test/Twig/Tests/Fixtures/regression/empty_token.test +++ b/test/Twig/Tests/Fixtures/regression/empty_token.test @@ -3,6 +3,6 @@ Twig outputs 0 nodes correctly --TEMPLATE-- {{ foo }}0{{ foo }} --DATA-- -return array('foo' => 'foo') +return ['foo' => 'foo'] --EXPECT-- foo0foo diff --git a/test/Twig/Tests/Fixtures/regression/issue_1143.test b/test/Twig/Tests/Fixtures/regression/issue_1143.test index ff7c8bb70..261869c74 100644 --- a/test/Twig/Tests/Fixtures/regression/issue_1143.test +++ b/test/Twig/Tests/Fixtures/regression/issue_1143.test @@ -18,6 +18,6 @@ class House $object = new House(); $object->region = 1; -return array('object' => $object) +return ['object' => $object] --EXPECT-- house.region.s diff --git a/test/Twig/Tests/Fixtures/regression/multi_word_tests.test b/test/Twig/Tests/Fixtures/regression/multi_word_tests.test index 269a30571..96ca5517a 100644 --- a/test/Twig/Tests/Fixtures/regression/multi_word_tests.test +++ b/test/Twig/Tests/Fixtures/regression/multi_word_tests.test @@ -4,7 +4,7 @@ Twig allows multi-word tests without a custom node class {{ 'foo' is multi word ? 'yes' : 'no' }} {{ 'foo bar' is multi word ? 'yes' : 'no' }} --DATA-- -return array() +return [] --EXPECT-- no yes diff --git a/test/Twig/Tests/Fixtures/regression/simple_xml_element.test b/test/Twig/Tests/Fixtures/regression/simple_xml_element.test index 60c3c51d7..57603ebb9 100644 --- a/test/Twig/Tests/Fixtures/regression/simple_xml_element.test +++ b/test/Twig/Tests/Fixtures/regression/simple_xml_element.test @@ -10,7 +10,7 @@ Hello '{{ images.image.0.group }}'! - {{ image.group }} {% endfor %} --DATA-- -return array('images' => new SimpleXMLElement('foobar')) +return ['images' => new SimpleXMLElement('foobar')] --EXPECT-- Hello 'foo'! example diff --git a/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test b/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test index e18e11079..1bd261ca2 100644 --- a/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test +++ b/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test @@ -3,6 +3,6 @@ Twig does not confuse strings with integers in getAttribute() --TEMPLATE-- {{ hash['2e2'] }} --DATA-- -return array('hash' => array('2e2' => 'works')) +return ['hash' => array('2e2' => 'works')] --EXPECT-- works diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/basic.test b/test/Twig/Tests/Fixtures/tags/autoescape/basic.test index 2f6a3e1a0..5979725e3 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/basic.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/basic.test @@ -17,7 +17,7 @@ {{ var }}
{% endautoescape %} --DATA-- -return array('var' => '
') +return ['var' => '
'] --EXPECT-- <br />
<br />
diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test b/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test index 05ab83ce3..292e1b416 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test @@ -7,6 +7,6 @@ {% endblock %} {% endautoescape %} --DATA-- -return array('var' => '
') +return ['var' => '
'] --EXPECT-- <br /> diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test b/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test index 9c0972462..1724b4878 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test @@ -5,6 +5,6 @@ {{ var|escape }} {% endautoescape %} --DATA-- -return array('var' => '
') +return ['var' => '
'] --EXPECT-- <br /> diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/functions.test b/test/Twig/Tests/Fixtures/tags/autoescape/functions.test index 653c41b8e..170e7074e 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/functions.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/functions.test @@ -44,7 +44,7 @@ safe_br {% endautoescape %} --DATA-- -return array() +return [] --EXPECT-- autoescape false diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/literal.test b/test/Twig/Tests/Fixtures/tags/autoescape/literal.test index e389d4dd5..1ed2bf35a 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/literal.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/literal.test @@ -23,7 +23,7 @@ {% endautoescape %} --DATA-- -return array() +return [] --EXPECT-- 1. Simple literal diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/nested.test b/test/Twig/Tests/Fixtures/tags/autoescape/nested.test index 798e6feaf..0d88c7e3a 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/nested.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/nested.test @@ -15,7 +15,7 @@ {% endautoescape %} {{ var }} --DATA-- -return array('var' => '
') +return ['var' => '
'] --EXPECT-- <br /> <br /> diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/objects.test b/test/Twig/Tests/Fixtures/tags/autoescape/objects.test index e896aa41c..9d959b22b 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/objects.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/objects.test @@ -19,7 +19,7 @@ class UserForAutoEscapeTest return 'Fabien
'; } } -return array('user' => new UserForAutoEscapeTest()) +return ['user' => new UserForAutoEscapeTest()] --EXPECT-- Fabien<br /> fabien<br /> diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/raw.test b/test/Twig/Tests/Fixtures/tags/autoescape/raw.test index 9f1cedd3a..187327c80 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/raw.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/raw.test @@ -5,6 +5,6 @@ {{ var|raw }} {% endautoescape %} --DATA-- -return array('var' => '
') +return ['var' => '
'] --EXPECT--
diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test b/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test index c3f8eddfa..289f2b174 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test @@ -5,7 +5,7 @@ {% autoescape true html %}{{ var }}{% endautoescape %} --DATA-- -return array('var' => '
"') +return ['var' => '
"'] --EXPECT-- \u003Cbr\u0020\/\u003E\u0022 <br />" diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test b/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test index 5b69449c2..9a0137ee2 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test @@ -5,7 +5,7 @@ {% autoescape 'html' %}{{ var }}{% endautoescape %} --DATA-- -return array('var' => '
"') +return ['var' => '
"'] --EXPECT-- \u003Cbr\u0020\/\u003E\u0022 <br />" diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/type.test b/test/Twig/Tests/Fixtures/tags/autoescape/type.test index 1250f0db1..9ae8d7bf9 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/type.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/type.test @@ -39,7 +39,7 @@ escape types {% endautoescape %} --DATA-- -return array('msg' => "<>\n'\"") +return ['msg' => "<>\n'\""] --EXPECT-- 1. autoescape 'html' |escape('js') diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test b/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test index 7821a9aaf..f97105bbd 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test @@ -61,7 +61,7 @@ {% endautoescape %} --DATA-- -return array('var' => "\nTwig") +return ['var' => "\nTwig"] --EXPECT-- (escape_and_nl2br is an escaper filter) diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test b/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test index f58a1e09c..50f72d83a 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test @@ -9,7 +9,7 @@ {{ var|nl2br(sep|escape) }} {% endautoescape %} --DATA-- -return array('var' => "\nTwig", 'sep' => '
') +return ['var' => "\nTwig", 'sep' => '
'] --EXPECT-- <Fabien>
Twig diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test b/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test index 134c77ea8..c9c738055 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test @@ -31,7 +31,7 @@ {% endautoescape %} --DATA-- -return array('var' => "\nTwig") +return ['var' => "\nTwig"] --EXPECT-- (nl2br is pre_escaped for "html" and declared safe for "html") diff --git a/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test b/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test index 32d3943b5..c764d434b 100644 --- a/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test +++ b/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test @@ -23,7 +23,7 @@ {% endautoescape %} --DATA-- -return array('var' => "\nTwig") +return ['var' => "\nTwig"] --EXPECT-- (preserves_safety is preserving safety for "html") diff --git a/test/Twig/Tests/Fixtures/tags/block/basic.test b/test/Twig/Tests/Fixtures/tags/block/basic.test index 360dcf030..988b09ce8 100644 --- a/test/Twig/Tests/Fixtures/tags/block/basic.test +++ b/test/Twig/Tests/Fixtures/tags/block/basic.test @@ -6,6 +6,6 @@ --TEMPLATE(foo.twig)-- {% block content %}{% endblock %} --DATA-- -return array('foo' => 'bar') +return ['foo' => 'bar'] --EXPECT-- FOObar diff --git a/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test b/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test index bc89ec820..7dac6abbf 100644 --- a/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test +++ b/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test @@ -6,6 +6,6 @@ {% endblock %} {% endblock %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: The block 'content' has already been defined line 2 in "index.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/tags/block/special_chars.test b/test/Twig/Tests/Fixtures/tags/block/special_chars.test index be17fedf3..e8e240eb7 100644 --- a/test/Twig/Tests/Fixtures/tags/block/special_chars.test +++ b/test/Twig/Tests/Fixtures/tags/block/special_chars.test @@ -5,6 +5,6 @@ § {% endblock § %} --DATA-- -return array() +return [] --EXPECT-- § diff --git a/test/Twig/Tests/Fixtures/tags/deprecated/block.legacy.test b/test/Twig/Tests/Fixtures/tags/deprecated/block.legacy.test index 10c8f07d7..53729dd1f 100644 --- a/test/Twig/Tests/Fixtures/tags/deprecated/block.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/deprecated/block.legacy.test @@ -15,6 +15,6 @@ Deprecating a block with "deprecated" tag Hello Fabien {% endblock %} --DATA-- -return array() +return [] --EXPECT-- Hello Fabien diff --git a/test/Twig/Tests/Fixtures/tags/deprecated/macro.legacy.test b/test/Twig/Tests/Fixtures/tags/deprecated/macro.legacy.test index c7c7d4ec5..5cc48dd87 100644 --- a/test/Twig/Tests/Fixtures/tags/deprecated/macro.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/deprecated/macro.legacy.test @@ -16,6 +16,6 @@ Deprecating a macro with "deprecated" tag Hello {{ name }} {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- Hello Fabien diff --git a/test/Twig/Tests/Fixtures/tags/deprecated/template.legacy.test b/test/Twig/Tests/Fixtures/tags/deprecated/template.legacy.test index 4546d4e4d..7f786d57f 100644 --- a/test/Twig/Tests/Fixtures/tags/deprecated/template.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/deprecated/template.legacy.test @@ -7,6 +7,6 @@ Deprecating a template with "deprecated" tag --TEMPLATE(greeting.twig)-- Hello Fabien --DATA-- -return array() +return [] --EXPECT-- Hello Fabien diff --git a/test/Twig/Tests/Fixtures/tags/embed/basic.test b/test/Twig/Tests/Fixtures/tags/embed/basic.test index f44296ea0..16781e418 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/basic.test +++ b/test/Twig/Tests/Fixtures/tags/embed/basic.test @@ -21,7 +21,7 @@ B {% endblock %} C --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/embed/complex_dynamic_parent.test b/test/Twig/Tests/Fixtures/tags/embed/complex_dynamic_parent.test index de5ea7eea..b799a8c95 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/complex_dynamic_parent.test +++ b/test/Twig/Tests/Fixtures/tags/embed/complex_dynamic_parent.test @@ -21,7 +21,7 @@ B {% endblock %} C --DATA-- -return array('foo' => 'foo') +return ['foo' => 'foo'] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test b/test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test index 2a125e6b5..6f0879e28 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test +++ b/test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test @@ -21,7 +21,7 @@ B {% endblock %} C --DATA-- -return array('foo' => 'foo.twig') +return ['foo' => 'foo.twig'] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/embed/error_line.test b/test/Twig/Tests/Fixtures/tags/embed/error_line.test index 431473707..8677cc371 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/error_line.test +++ b/test/Twig/Tests/Fixtures/tags/embed/error_line.test @@ -11,6 +11,6 @@ BAR --TEMPLATE(foo.twig)-- {% block c1 %}{% endblock %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Runtime: Variable "nothing" does not exist in "index.twig" at line 5. diff --git a/test/Twig/Tests/Fixtures/tags/embed/multiple.test b/test/Twig/Tests/Fixtures/tags/embed/multiple.test index da161e6d4..9f7b52f1d 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/multiple.test +++ b/test/Twig/Tests/Fixtures/tags/embed/multiple.test @@ -28,7 +28,7 @@ B {% endblock %} C --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/embed/nested.test b/test/Twig/Tests/Fixtures/tags/embed/nested.test index 81563dcef..9f3372336 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/nested.test +++ b/test/Twig/Tests/Fixtures/tags/embed/nested.test @@ -24,7 +24,7 @@ B {% endblock %} C --DATA-- -return array() +return [] --EXPECT-- A block1 diff --git a/test/Twig/Tests/Fixtures/tags/embed/with_extends.test b/test/Twig/Tests/Fixtures/tags/embed/with_extends.test index 2c1dd584c..ce726ac00 100644 --- a/test/Twig/Tests/Fixtures/tags/embed/with_extends.test +++ b/test/Twig/Tests/Fixtures/tags/embed/with_extends.test @@ -39,7 +39,7 @@ B {% endblock %} C --DATA-- -return array() +return [] --EXPECT-- A blockc1base diff --git a/test/Twig/Tests/Fixtures/tags/filter/basic.test b/test/Twig/Tests/Fixtures/tags/filter/basic.test index 82094f2f0..866171ecc 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/basic.test +++ b/test/Twig/Tests/Fixtures/tags/filter/basic.test @@ -5,6 +5,6 @@ Some text with a {{ var }} {% endfilter %} --DATA-- -return array('var' => 'var') +return ['var' => 'var'] --EXPECT-- SOME TEXT WITH A VAR diff --git a/test/Twig/Tests/Fixtures/tags/filter/json_encode.test b/test/Twig/Tests/Fixtures/tags/filter/json_encode.test index 3e7148bf4..a2562b995 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/json_encode.test +++ b/test/Twig/Tests/Fixtures/tags/filter/json_encode.test @@ -3,6 +3,6 @@ --TEMPLATE-- {% filter json_encode|raw %}test{% endfilter %} --DATA-- -return array() +return [] --EXPECT-- "test" diff --git a/test/Twig/Tests/Fixtures/tags/filter/multiple.test b/test/Twig/Tests/Fixtures/tags/filter/multiple.test index 75512ef96..8eb3cbdd7 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/multiple.test +++ b/test/Twig/Tests/Fixtures/tags/filter/multiple.test @@ -5,6 +5,6 @@ {{ var }} {% endfilter %} --DATA-- -return array('var' => 'VAR') +return ['var' => 'VAR'] --EXPECT-- Var diff --git a/test/Twig/Tests/Fixtures/tags/filter/nested.test b/test/Twig/Tests/Fixtures/tags/filter/nested.test index 7e4e4eb33..6d18e1af0 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/nested.test +++ b/test/Twig/Tests/Fixtures/tags/filter/nested.test @@ -9,7 +9,7 @@ {{ var }} {% endfilter %} --DATA-- -return array('var' => 'var') +return ['var' => 'var'] --EXPECT-- Var Var diff --git a/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test b/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test index 22745eadf..77f4c6f2c 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test +++ b/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test @@ -7,7 +7,7 @@ {% endfor %} {% endfilter %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- A B diff --git a/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test b/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test index afd95b296..7356549a3 100644 --- a/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test +++ b/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test @@ -20,7 +20,7 @@ FOO {% endfilter %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- A, B diff --git a/test/Twig/Tests/Fixtures/tags/for/condition.test b/test/Twig/Tests/Fixtures/tags/for/condition.test index 380531f78..564a6d043 100644 --- a/test/Twig/Tests/Fixtures/tags/for/condition.test +++ b/test/Twig/Tests/Fixtures/tags/for/condition.test @@ -5,9 +5,9 @@ {{ loop.index }}.{{ i }}{{ foo.bar }} {% endfor %} --DATA-- -return array('foo' => array('bar' => 'X')) +return ['foo' => array('bar' => 'X')] --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- 1.1X 2.3X diff --git a/test/Twig/Tests/Fixtures/tags/for/context.test b/test/Twig/Tests/Fixtures/tags/for/context.test index ddc69307b..ea0d8ad03 100644 --- a/test/Twig/Tests/Fixtures/tags/for/context.test +++ b/test/Twig/Tests/Fixtures/tags/for/context.test @@ -8,7 +8,7 @@ * {{ item }} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * a * b diff --git a/test/Twig/Tests/Fixtures/tags/for/else.test b/test/Twig/Tests/Fixtures/tags/for/else.test index 20ccc880c..4dd276f33 100644 --- a/test/Twig/Tests/Fixtures/tags/for/else.test +++ b/test/Twig/Tests/Fixtures/tags/for/else.test @@ -7,17 +7,17 @@ no item {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * a * b --DATA-- -return array('items' => array()) +return ['items' => array()] --EXPECT-- no item --DATA-- -return array() +return [] --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- no item diff --git a/test/Twig/Tests/Fixtures/tags/for/inner_variables.test b/test/Twig/Tests/Fixtures/tags/for/inner_variables.test index 49fb9ca6f..e1ad3c735 100644 --- a/test/Twig/Tests/Fixtures/tags/for/inner_variables.test +++ b/test/Twig/Tests/Fixtures/tags/for/inner_variables.test @@ -7,7 +7,7 @@ {% endfor %} {% endfor %} --DATA-- -return array('k' => 0) +return ['k' => 0] --EXPECT-- 0 1 1 1 diff --git a/test/Twig/Tests/Fixtures/tags/for/keys.test b/test/Twig/Tests/Fixtures/tags/for/keys.test index 4e22cb473..dc8fd2b12 100644 --- a/test/Twig/Tests/Fixtures/tags/for/keys.test +++ b/test/Twig/Tests/Fixtures/tags/for/keys.test @@ -5,7 +5,7 @@ * {{ key }} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * 0 * 1 diff --git a/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test b/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test index 4c211689d..86c69ecba 100644 --- a/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test +++ b/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test @@ -5,7 +5,7 @@ * {{ key }}/{{ item }} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * 0/a * 1/b diff --git a/test/Twig/Tests/Fixtures/tags/for/loop_context.test b/test/Twig/Tests/Fixtures/tags/for/loop_context.test index 93bc76a1f..49190cfd3 100644 --- a/test/Twig/Tests/Fixtures/tags/for/loop_context.test +++ b/test/Twig/Tests/Fixtures/tags/for/loop_context.test @@ -8,7 +8,7 @@ {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * 1/0 * 2/1 diff --git a/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test b/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test index 58af2c326..25933b5a4 100644 --- a/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test +++ b/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test @@ -5,6 +5,6 @@ {% endfor %} {% if loop is not defined %}WORKS{% endif %} --DATA-- -return array('items' => array()) +return ['items' => array()] --EXPECT-- WORKS diff --git a/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test b/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test index 6a2af63b6..b16b28707 100644 --- a/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test +++ b/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test @@ -5,6 +5,6 @@ {{ loop.last }} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXCEPTION-- Twig_Error_Syntax: The "loop.last" variable is not defined when looping with a condition in "index.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test b/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test index 1e819ca0a..c557b1efb 100644 --- a/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test +++ b/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test @@ -4,6 +4,6 @@ {% for i, item in items if loop.last > 0 %} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXCEPTION-- Twig_Error_Syntax: The "loop" variable cannot be used in a looping condition in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/for/nested_else.test b/test/Twig/Tests/Fixtures/tags/for/nested_else.test index f8b9f6bc1..092ce3eac 100644 --- a/test/Twig/Tests/Fixtures/tags/for/nested_else.test +++ b/test/Twig/Tests/Fixtures/tags/for/nested_else.test @@ -11,7 +11,7 @@ no item1 {% endfor %} --DATA-- -return array('items' => array('a', 'b'), 'items1' => array()) +return ['items' => array('a', 'b'), 'items1' => array()] --EXPECT-- no a no b diff --git a/test/Twig/Tests/Fixtures/tags/for/objects.test b/test/Twig/Tests/Fixtures/tags/for/objects.test index 503443792..e11097a5b 100644 --- a/test/Twig/Tests/Fixtures/tags/for/objects.test +++ b/test/Twig/Tests/Fixtures/tags/for/objects.test @@ -25,7 +25,7 @@ class ItemsIterator implements Iterator public function rewind() { return reset($this->values); } public function valid() { return false !== current($this->values); } } -return array('items' => new ItemsIterator()) +return ['items' => new ItemsIterator()] --EXPECT-- * bar * 1/0 diff --git a/test/Twig/Tests/Fixtures/tags/for/objects_countable.test b/test/Twig/Tests/Fixtures/tags/for/objects_countable.test index 4a1ff6119..af978f242 100644 --- a/test/Twig/Tests/Fixtures/tags/for/objects_countable.test +++ b/test/Twig/Tests/Fixtures/tags/for/objects_countable.test @@ -27,7 +27,7 @@ class ItemsIteratorCountable implements Iterator, Countable public function valid() { return false !== current($this->values); } public function count() { return count($this->values); } } -return array('items' => new ItemsIteratorCountable()) +return ['items' => new ItemsIteratorCountable()] --EXPECT-- * bar * 1/0 diff --git a/test/Twig/Tests/Fixtures/tags/for/recursive.test b/test/Twig/Tests/Fixtures/tags/for/recursive.test index 17b2e2223..d012c54e9 100644 --- a/test/Twig/Tests/Fixtures/tags/for/recursive.test +++ b/test/Twig/Tests/Fixtures/tags/for/recursive.test @@ -8,7 +8,7 @@ {% endfor %} {% endfor %} --DATA-- -return array('items' => array('a' => array('a1', 'a2', 'a3'), 'b' => array('b1'))) +return ['items' => array('a' => array('a1', 'a2', 'a3'), 'b' => array('b1'))] --EXPECT-- * a (2): * a1 (3) diff --git a/test/Twig/Tests/Fixtures/tags/for/values.test b/test/Twig/Tests/Fixtures/tags/for/values.test index 82f2ae8a4..6880cdb53 100644 --- a/test/Twig/Tests/Fixtures/tags/for/values.test +++ b/test/Twig/Tests/Fixtures/tags/for/values.test @@ -5,7 +5,7 @@ * {{ item }} {% endfor %} --DATA-- -return array('items' => array('a', 'b')) +return ['items' => array('a', 'b')] --EXPECT-- * a * b diff --git a/test/Twig/Tests/Fixtures/tags/from.test b/test/Twig/Tests/Fixtures/tags/from.test index 5f5da0ec1..1d3c9e2b5 100644 --- a/test/Twig/Tests/Fixtures/tags/from.test +++ b/test/Twig/Tests/Fixtures/tags/from.test @@ -9,6 +9,6 @@ global variables called foobar {% endmacro %} --DATA-- -return array(); +return [] --EXPECT-- called foobar diff --git a/test/Twig/Tests/Fixtures/tags/if/basic.test b/test/Twig/Tests/Fixtures/tags/if/basic.test index c1c3d2768..a02165e53 100644 --- a/test/Twig/Tests/Fixtures/tags/if/basic.test +++ b/test/Twig/Tests/Fixtures/tags/if/basic.test @@ -9,14 +9,14 @@ NOTHING {% endif %} --DATA-- -return array('a' => 'a') +return ['a' => 'a'] --EXPECT-- a --DATA-- -return array('b' => 'b') +return ['b' => 'b'] --EXPECT-- b --DATA-- -return array() +return [] --EXPECT-- NOTHING diff --git a/test/Twig/Tests/Fixtures/tags/if/expression.test b/test/Twig/Tests/Fixtures/tags/if/expression.test index edfb73df4..eb65083c6 100644 --- a/test/Twig/Tests/Fixtures/tags/if/expression.test +++ b/test/Twig/Tests/Fixtures/tags/if/expression.test @@ -9,14 +9,14 @@ A3 {% endif %} --DATA-- -return array('a' => 1) +return ['a' => 1] --EXPECT-- A1 --DATA-- -return array('a' => 12) +return ['a' => 12] --EXPECT-- A2 --DATA-- -return array('a' => 7) +return ['a' => 7] --EXPECT-- A3 diff --git a/test/Twig/Tests/Fixtures/tags/include/basic.test b/test/Twig/Tests/Fixtures/tags/include/basic.test index 8fe1a6c13..9982b039d 100644 --- a/test/Twig/Tests/Fixtures/tags/include/basic.test +++ b/test/Twig/Tests/Fixtures/tags/include/basic.test @@ -8,7 +8,7 @@ BAR --TEMPLATE(foo.twig)-- FOOBAR --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/include/expression.test b/test/Twig/Tests/Fixtures/tags/include/expression.test index eaeeb112e..23db18123 100644 --- a/test/Twig/Tests/Fixtures/tags/include/expression.test +++ b/test/Twig/Tests/Fixtures/tags/include/expression.test @@ -8,7 +8,7 @@ BAR --TEMPLATE(foo.twig)-- FOOBAR --DATA-- -return array('foo' => 'foo.twig') +return ['foo' => 'foo.twig'] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test b/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test index 24aed06de..6c8bdb1e9 100644 --- a/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test +++ b/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test @@ -6,5 +6,5 @@ {% include "foo.twig" ignore missing with {} %} {% include "foo.twig" ignore missing with {} only %} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/include/missing.test b/test/Twig/Tests/Fixtures/tags/include/missing.test index f25e87155..5471e451e 100644 --- a/test/Twig/Tests/Fixtures/tags/include/missing.test +++ b/test/Twig/Tests/Fixtures/tags/include/missing.test @@ -3,6 +3,6 @@ --TEMPLATE-- {% include "foo.twig" %} --DATA-- -return array(); +return [] --EXCEPTION-- Twig_Error_Loader: Template "foo.twig" is not defined in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/include/missing_nested.test b/test/Twig/Tests/Fixtures/tags/include/missing_nested.test index 86c186444..f129e6569 100644 --- a/test/Twig/Tests/Fixtures/tags/include/missing_nested.test +++ b/test/Twig/Tests/Fixtures/tags/include/missing_nested.test @@ -11,6 +11,6 @@ {% include "foo.twig" %} {% endblock %} --DATA-- -return array(); +return [] --EXCEPTION-- Twig_Error_Loader: Template "foo.twig" is not defined in "base.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/tags/include/only.test b/test/Twig/Tests/Fixtures/tags/include/only.test index 77760a09e..d595f8061 100644 --- a/test/Twig/Tests/Fixtures/tags/include/only.test +++ b/test/Twig/Tests/Fixtures/tags/include/only.test @@ -8,7 +8,7 @@ --TEMPLATE(foo.twig)-- {% for k, v in _context %}{{ k }},{% endfor %} --DATA-- -return array('foo' => 'bar') +return ['foo' => 'bar'] --EXPECT-- foo,global,_parent, global,_parent, diff --git a/test/Twig/Tests/Fixtures/tags/include/template_instance.test b/test/Twig/Tests/Fixtures/tags/include/template_instance.test index 6ba064a38..4b2285e50 100644 --- a/test/Twig/Tests/Fixtures/tags/include/template_instance.test +++ b/test/Twig/Tests/Fixtures/tags/include/template_instance.test @@ -5,6 +5,6 @@ --TEMPLATE(foo.twig)-- BAR --DATA-- -return array('foo' => $twig->loadTemplate('foo.twig')) +return ['foo' => $twig->loadTemplate('foo.twig')] --EXPECT-- BAR FOO diff --git a/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test b/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test index ab670ee06..38063952d 100644 --- a/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test +++ b/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test @@ -6,7 +6,7 @@ --TEMPLATE(foo.twig)-- foo --DATA-- -return array() +return [] --EXPECT-- foo foo diff --git a/test/Twig/Tests/Fixtures/tags/include/with_variables.test b/test/Twig/Tests/Fixtures/tags/include/with_variables.test index 41384ac7c..96f57bc7e 100644 --- a/test/Twig/Tests/Fixtures/tags/include/with_variables.test +++ b/test/Twig/Tests/Fixtures/tags/include/with_variables.test @@ -6,7 +6,7 @@ --TEMPLATE(foo.twig)-- {{ foo }} --DATA-- -return array('vars' => array('foo' => 'bar')) +return ['vars' => array('foo' => 'bar')] --EXPECT-- bar bar diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/basic.test b/test/Twig/Tests/Fixtures/tags/inheritance/basic.test index 0778a4b49..703b61be1 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/basic.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/basic.test @@ -9,6 +9,6 @@ FOO --TEMPLATE(foo.twig)-- {% block content %}{% endblock %} --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test b/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test index 8576e773a..bd28248d1 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test @@ -9,6 +9,6 @@ --TEMPLATE(bar.twig)-- {% block content %}BAR{% endblock %} --DATA-- -return array('foo' => 'foo.twig', 'standalone' => true) +return ['foo' => 'foo.twig', 'standalone' => true] --EXPECT-- FOOFOO diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test b/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test index ee06ddce3..e6a0f0172 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test @@ -9,6 +9,6 @@ FOO --TEMPLATE(foo.twig)-- {% block content %}{% endblock %} --DATA-- -return array('foo' => 'foo.twig') +return ['foo' => 'foo.twig'] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/empty.test b/test/Twig/Tests/Fixtures/tags/inheritance/empty.test index 784f35718..ca11bf20d 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/empty.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/empty.test @@ -5,6 +5,6 @@ --TEMPLATE(foo.twig)-- {% block content %}FOO{% endblock %} --DATA-- -return array() +return [] --EXPECT-- FOO diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test index a1cb1ce8a..4d2cb6c65 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test @@ -7,6 +7,6 @@ foo {% endblock %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test index acc74f6a1..510865110 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test @@ -7,6 +7,6 @@ foo {% endblock %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test index cfa648d41..c5ee6f193 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test @@ -7,6 +7,6 @@ foo {% endblock %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test b/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test index dfc2b6c49..fc25badd3 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test @@ -7,6 +7,6 @@ --TEMPLATE(base.twig)-- {% block content %}base {% endblock %} --DATA-- -return array() +return [] --EXPECT-- base layout index diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test b/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test index 1d3e639ca..fa887177b 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test @@ -13,7 +13,7 @@ --TEMPLATE(2_parent.twig)-- {% block content %}2{% endblock %} --DATA-- -return array() +return [] --EXPECT-- 1 parent diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test b/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test index faca92591..abea2e9d4 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test @@ -17,6 +17,6 @@ {% endblock %} {% endblock %} --DATA-- -return array() +return [] --EXPECT-- SUBSUBCONTENT diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test b/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test index 0ad11d0c0..20b7848f8 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test @@ -10,6 +10,6 @@ {% endblock %} --TEMPLATE(foo.twig)-- --DATA-- -return array() +return [] --EXPECT-- CONTENTSUBCONTENTENDCONTENT diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test b/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test index 71e3cdfd4..0b585b480 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test @@ -11,6 +11,6 @@ --TEMPLATE(base.twig)-- {% block body '' %} --DATA-- -return array() +return [] --EXPECT-- INSIDE diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/parent.test b/test/Twig/Tests/Fixtures/tags/inheritance/parent.test index 4f975db80..73f4c0ec5 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/parent.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/parent.test @@ -7,6 +7,6 @@ --TEMPLATE(foo.twig)-- {% block content %}BAR{% endblock %} --DATA-- -return array() +return [] --EXPECT-- BARFOOBAR diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test b/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test index a8bc90cef..01bd544f8 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test @@ -7,10 +7,10 @@ FOO --TEMPLATE(bar.twig)-- BAR --DATA-- -return array('foo' => true) +return ['foo' => true] --EXPECT-- FOO --DATA-- -return array('foo' => false) +return ['foo' => false] --EXPECT-- BAR diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test b/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test index 628167135..58a37bd90 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test @@ -13,7 +13,7 @@ {% block footer %}Default Footer{% endblock %} --DATA-- -return array() +return [] --EXPECT-- Included Content Default Footer diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test b/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test index 71e7c2080..d4347bac4 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test @@ -17,7 +17,7 @@ BAR {% endblock %} --DATA-- -return array() +return [] --EXPECT-- INSIDE OVERRIDDEN diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test b/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test index 63c730550..39882b8b3 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test @@ -9,6 +9,6 @@ --TEMPLATE(foo.twig)-- {% block content %}BAR{% endblock %} --DATA-- -return array() +return [] --EXPECT-- BAR diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test b/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test index d1876a52d..9d62cdba7 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test @@ -9,6 +9,6 @@ --TEMPLATE(foo.twig)-- {% block content %}BAR{% endblock %} --DATA-- -return array('foo' => $twig->loadTemplate('foo.twig')) +return ['foo' => $twig->loadTemplate('foo.twig')] --EXPECT-- BARFOO diff --git a/test/Twig/Tests/Fixtures/tags/inheritance/use.test b/test/Twig/Tests/Fixtures/tags/inheritance/use.test index 8f9ece7ce..4df32ee9d 100644 --- a/test/Twig/Tests/Fixtures/tags/inheritance/use.test +++ b/test/Twig/Tests/Fixtures/tags/inheritance/use.test @@ -35,7 +35,7 @@ {% block content_use2 'content_use2' %} {% block content_use2_only 'content_use2_only' %} --DATA-- -return array() +return [] --EXPECT-- content_parent content_use1 diff --git a/test/Twig/Tests/Fixtures/tags/macro/basic.test b/test/Twig/Tests/Fixtures/tags/macro/basic.test index eef0c10d5..ae090f9a0 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/basic.test +++ b/test/Twig/Tests/Fixtures/tags/macro/basic.test @@ -10,7 +10,7 @@ {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test b/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test index ae6203bb6..3f3caf777 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test +++ b/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test @@ -9,7 +9,7 @@ {% macro foo() %}foo{% endmacro %} {% macro bar() %}bar{% endmacro bar %} --DATA-- -return array() +return [] --EXPECT-- foo bar diff --git a/test/Twig/Tests/Fixtures/tags/macro/external.test b/test/Twig/Tests/Fixtures/tags/macro/external.test index 5cd3dae66..b28ca19f0 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/external.test +++ b/test/Twig/Tests/Fixtures/tags/macro/external.test @@ -10,7 +10,7 @@ {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/macro/from.test b/test/Twig/Tests/Fixtures/tags/macro/from.test index 205f59182..8b9aae878 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/from.test +++ b/test/Twig/Tests/Fixtures/tags/macro/from.test @@ -11,7 +11,7 @@ {% macro foo(name) %}foo{{ name }}{% endmacro %} {% macro bar(name) %}bar{{ name }}{% endmacro %} --DATA-- -return array() +return [] --EXPECT-- foofoo foofoo diff --git a/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test b/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test index 2de9765ff..eabae94d5 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test +++ b/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test @@ -4,6 +4,6 @@ {% from 'forms.twig' import templateName %} --TEMPLATE(forms.twig)-- --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: "templateName" cannot be an imported macro as it is a reserved keyword in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/macro/global.test b/test/Twig/Tests/Fixtures/tags/macro/global.test index 6b371768e..832740eac 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/global.test +++ b/test/Twig/Tests/Fixtures/tags/macro/global.test @@ -8,7 +8,7 @@ --TEMPLATE(forms.twig)-- {% macro foo(name) %}{{ name|default('foo') }}{{ global }}{% endmacro %} --DATA-- -return array() +return [] --EXPECT-- fooglobal fooglobal diff --git a/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test b/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test index 7bd93c62d..7fe35ad2f 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test +++ b/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test @@ -6,6 +6,6 @@ {{ macros.parent() }} --TEMPLATE(forms.twig)-- --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: "parent" cannot be called as macro as it is a reserved keyword in "index.twig" at line 4. diff --git a/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test b/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test index f7c102f02..679b38f07 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test +++ b/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test @@ -5,6 +5,6 @@ parent {% endmacro %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: "parent" cannot be used as a macro name as it is a reserved keyword in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/macro/self_import.test b/test/Twig/Tests/Fixtures/tags/macro/self_import.test index 17756cb6c..ca3157dd8 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/self_import.test +++ b/test/Twig/Tests/Fixtures/tags/macro/self_import.test @@ -10,7 +10,7 @@ {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/macro/special_chars.test b/test/Twig/Tests/Fixtures/tags/macro/special_chars.test index 372177073..491e91e80 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/special_chars.test +++ b/test/Twig/Tests/Fixtures/tags/macro/special_chars.test @@ -9,6 +9,6 @@ §{{ foo }}§ {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- §foo§ diff --git a/test/Twig/Tests/Fixtures/tags/macro/super_globals.test b/test/Twig/Tests/Fixtures/tags/macro/super_globals.test index 567946281..643697ce2 100644 --- a/test/Twig/Tests/Fixtures/tags/macro/super_globals.test +++ b/test/Twig/Tests/Fixtures/tags/macro/super_globals.test @@ -9,6 +9,6 @@ Super globals as macro arguments {{ GET }} {% endmacro %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test b/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test index 0445e8530..7875b2af7 100644 --- a/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test @@ -5,6 +5,6 @@ {{ foo }} {% endraw %} --DATA-- -return array() +return [] --EXPECT-- {{ foo }} diff --git a/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test b/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test index 99deefc32..8ccabbf7b 100644 --- a/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test @@ -5,6 +5,6 @@ {{ foo }} {% endverbatim %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: Unexpected end of file: Unclosed "raw" block in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test b/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test index 352bb1876..11f42025e 100644 --- a/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test +++ b/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test @@ -37,7 +37,7 @@ 5*** --DATA-- -return array() +return [] --EXPECT-- 1*** {{ 'bla' }} diff --git a/test/Twig/Tests/Fixtures/tags/sandbox/simple.test b/test/Twig/Tests/Fixtures/tags/sandbox/simple.test index de20f3dba..4d232d8bb 100644 --- a/test/Twig/Tests/Fixtures/tags/sandbox/simple.test +++ b/test/Twig/Tests/Fixtures/tags/sandbox/simple.test @@ -14,7 +14,7 @@ sandbox tag --TEMPLATE(foo.twig)-- foo --DATA-- -return array() +return [] --EXPECT-- foo foo diff --git a/test/Twig/Tests/Fixtures/tags/set/basic.test b/test/Twig/Tests/Fixtures/tags/set/basic.test index a5a9f830e..aae1427e8 100644 --- a/test/Twig/Tests/Fixtures/tags/set/basic.test +++ b/test/Twig/Tests/Fixtures/tags/set/basic.test @@ -11,7 +11,7 @@ {{ foo }}{{ bar }} --DATA-- -return array() +return [] --EXPECT-- foo foo<br /> diff --git a/test/Twig/Tests/Fixtures/tags/set/capture-empty.test b/test/Twig/Tests/Fixtures/tags/set/capture-empty.test index ec657f005..97fc43cc2 100644 --- a/test/Twig/Tests/Fixtures/tags/set/capture-empty.test +++ b/test/Twig/Tests/Fixtures/tags/set/capture-empty.test @@ -5,5 +5,5 @@ {% if foo %}FAIL{% endif %} --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/set/capture.test b/test/Twig/Tests/Fixtures/tags/set/capture.test index f156a1a7f..c3faf2500 100644 --- a/test/Twig/Tests/Fixtures/tags/set/capture.test +++ b/test/Twig/Tests/Fixtures/tags/set/capture.test @@ -5,6 +5,6 @@ {{ foo }} --DATA-- -return array() +return [] --EXPECT-- f
o
o diff --git a/test/Twig/Tests/Fixtures/tags/set/expression.test b/test/Twig/Tests/Fixtures/tags/set/expression.test index 8ff434a01..bd472771a 100644 --- a/test/Twig/Tests/Fixtures/tags/set/expression.test +++ b/test/Twig/Tests/Fixtures/tags/set/expression.test @@ -6,7 +6,7 @@ {{ foo }} {{ bar }} --DATA-- -return array() +return [] --EXPECT-- foobar barfoo diff --git a/test/Twig/Tests/Fixtures/tags/spaceless/simple.test b/test/Twig/Tests/Fixtures/tags/spaceless/simple.test index dd06dec25..98bd27a13 100644 --- a/test/Twig/Tests/Fixtures/tags/spaceless/simple.test +++ b/test/Twig/Tests/Fixtures/tags/spaceless/simple.test @@ -7,6 +7,6 @@ {% endspaceless %} --DATA-- -return array() +return [] --EXPECT--
foo
diff --git a/test/Twig/Tests/Fixtures/tags/special_chars.test b/test/Twig/Tests/Fixtures/tags/special_chars.test index 789b4ba80..64ffd1d76 100644 --- a/test/Twig/Tests/Fixtures/tags/special_chars.test +++ b/test/Twig/Tests/Fixtures/tags/special_chars.test @@ -3,6 +3,6 @@ --TEMPLATE-- {% § %} --DATA-- -return array() +return [] --EXPECT-- § diff --git a/test/Twig/Tests/Fixtures/tags/trim_block.test b/test/Twig/Tests/Fixtures/tags/trim_block.test index 1d2273f88..f1a1310ad 100644 --- a/test/Twig/Tests/Fixtures/tags/trim_block.test +++ b/test/Twig/Tests/Fixtures/tags/trim_block.test @@ -51,7 +51,7 @@ Combined: end --DATA-- -return array('leading' => 'leading space', 'trailing' => 'trailing space', 'both' => 'both') +return ['leading' => 'leading space', 'trailing' => 'trailing space', 'both' => 'both'] --EXPECT-- 15 18 diff --git a/test/Twig/Tests/Fixtures/tags/use/aliases.test b/test/Twig/Tests/Fixtures/tags/use/aliases.test index f887006f6..b6b1d5c66 100644 --- a/test/Twig/Tests/Fixtures/tags/use/aliases.test +++ b/test/Twig/Tests/Fixtures/tags/use/aliases.test @@ -7,6 +7,6 @@ --TEMPLATE(blocks.twig)-- {% block content 'foo' %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/use/basic.test b/test/Twig/Tests/Fixtures/tags/use/basic.test index 7364d76de..be622a10e 100644 --- a/test/Twig/Tests/Fixtures/tags/use/basic.test +++ b/test/Twig/Tests/Fixtures/tags/use/basic.test @@ -7,6 +7,6 @@ --TEMPLATE(blocks.twig)-- {% block content 'foo' %} --DATA-- -return array() +return [] --EXPECT-- foo diff --git a/test/Twig/Tests/Fixtures/tags/use/deep.test b/test/Twig/Tests/Fixtures/tags/use/deep.test index b551a1e60..771ba642b 100644 --- a/test/Twig/Tests/Fixtures/tags/use/deep.test +++ b/test/Twig/Tests/Fixtures/tags/use/deep.test @@ -15,7 +15,7 @@ {% block content 'bar' %} {% block bar 'bar' %} --DATA-- -return array() +return [] --EXPECT-- foo foo diff --git a/test/Twig/Tests/Fixtures/tags/use/deep_empty.test b/test/Twig/Tests/Fixtures/tags/use/deep_empty.test index 05cca682e..f14ce83de 100644 --- a/test/Twig/Tests/Fixtures/tags/use/deep_empty.test +++ b/test/Twig/Tests/Fixtures/tags/use/deep_empty.test @@ -6,5 +6,5 @@ {% use "bar.twig" %} --TEMPLATE(bar.twig)-- --DATA-- -return array() +return [] --EXPECT-- diff --git a/test/Twig/Tests/Fixtures/tags/use/inheritance.test b/test/Twig/Tests/Fixtures/tags/use/inheritance.test index 0d0d470ee..1edeaa111 100644 --- a/test/Twig/Tests/Fixtures/tags/use/inheritance.test +++ b/test/Twig/Tests/Fixtures/tags/use/inheritance.test @@ -19,7 +19,7 @@
sub_container
{% endblock %} --DATA-- -return array() +return [] --EXPECT--
overridden sub_container
diff --git a/test/Twig/Tests/Fixtures/tags/use/inheritance2.test b/test/Twig/Tests/Fixtures/tags/use/inheritance2.test index df95599ce..accec5094 100644 --- a/test/Twig/Tests/Fixtures/tags/use/inheritance2.test +++ b/test/Twig/Tests/Fixtures/tags/use/inheritance2.test @@ -18,7 +18,7 @@
sub_container
{% endblock %} --DATA-- -return array() +return [] --EXPECT--
overridden sub_container
diff --git a/test/Twig/Tests/Fixtures/tags/use/multiple.test b/test/Twig/Tests/Fixtures/tags/use/multiple.test index 198be0c5c..85a63958d 100644 --- a/test/Twig/Tests/Fixtures/tags/use/multiple.test +++ b/test/Twig/Tests/Fixtures/tags/use/multiple.test @@ -14,7 +14,7 @@ {% block content 'bar' %} {% block bar 'bar' %} --DATA-- -return array() +return [] --EXPECT-- bar foo diff --git a/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test b/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test index 8de871a8a..413bdfa4d 100644 --- a/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test +++ b/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test @@ -15,7 +15,7 @@ {% block content 'bar' %} {% block bar 'bar' %} --DATA-- -return array() +return [] --EXPECT-- bar foo diff --git a/test/Twig/Tests/Fixtures/tags/use/parent_block.test b/test/Twig/Tests/Fixtures/tags/use/parent_block.test index 59db23d95..49328f6e8 100644 --- a/test/Twig/Tests/Fixtures/tags/use/parent_block.test +++ b/test/Twig/Tests/Fixtures/tags/use/parent_block.test @@ -17,7 +17,7 @@ Content of block {% endblock foobar %} --DATA-- -return array() +return [] --EXPECT-- Content of block Content of block (first override) diff --git a/test/Twig/Tests/Fixtures/tags/use/parent_block2.test b/test/Twig/Tests/Fixtures/tags/use/parent_block2.test index d3f302df0..274baa821 100644 --- a/test/Twig/Tests/Fixtures/tags/use/parent_block2.test +++ b/test/Twig/Tests/Fixtures/tags/use/parent_block2.test @@ -17,7 +17,7 @@ Content of block {% endblock foobar %} --DATA-- -return array() +return [] --EXPECT-- Content of block Content of block (first override) diff --git a/test/Twig/Tests/Fixtures/tags/use/parent_block3.test b/test/Twig/Tests/Fixtures/tags/use/parent_block3.test index 95b55a469..f6f221273 100644 --- a/test/Twig/Tests/Fixtures/tags/use/parent_block3.test +++ b/test/Twig/Tests/Fixtures/tags/use/parent_block3.test @@ -29,7 +29,7 @@ Content of bar {% endblock bar %} --DATA-- -return array() +return [] --EXPECT-- Content of foo Content of foo (first override) diff --git a/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test b/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test index 3fe2ad83c..fad9a2d18 100644 --- a/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test +++ b/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test @@ -17,7 +17,7 @@ --TEMPLATE(blocks.twig)-- {% block content 'BLOCK' %} --DATA-- -return array() +return [] --EXPECT-- PARENT CHILD diff --git a/test/Twig/Tests/Fixtures/tags/verbatim/basic.test b/test/Twig/Tests/Fixtures/tags/verbatim/basic.test index a95be5572..9b60abc49 100644 --- a/test/Twig/Tests/Fixtures/tags/verbatim/basic.test +++ b/test/Twig/Tests/Fixtures/tags/verbatim/basic.test @@ -5,6 +5,6 @@ {{ foo }} {% endverbatim %} --DATA-- -return array() +return [] --EXPECT-- {{ foo }} diff --git a/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test b/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test index 28626a816..aadce8dbd 100644 --- a/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test +++ b/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test @@ -5,6 +5,6 @@ {{ foo }} {% endraw %} --DATA-- -return array() +return [] --EXCEPTION-- Twig_Error_Syntax: Unexpected end of file: Unclosed "verbatim" block in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test b/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test index eb6104446..501922bdd 100644 --- a/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test +++ b/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test @@ -37,7 +37,7 @@ 5*** --DATA-- -return array() +return [] --EXPECT-- 1*** {{ 'bla' }} diff --git a/test/Twig/Tests/Fixtures/tags/with/basic.test b/test/Twig/Tests/Fixtures/tags/with/basic.test index 264ca5e7e..7c2abd0f9 100644 --- a/test/Twig/Tests/Fixtures/tags/with/basic.test +++ b/test/Twig/Tests/Fixtures/tags/with/basic.test @@ -7,7 +7,7 @@ {% endwith %} {{ foo }}{{ bar }} --DATA-- -return array('foo' => 'foo', 'bar' => 'bar') +return ['foo' => 'foo', 'bar' => 'bar'] --EXPECT-- fooBAZ foobar diff --git a/test/Twig/Tests/Fixtures/tags/with/expression.test b/test/Twig/Tests/Fixtures/tags/with/expression.test index 32ed0916c..e4433d44c 100644 --- a/test/Twig/Tests/Fixtures/tags/with/expression.test +++ b/test/Twig/Tests/Fixtures/tags/with/expression.test @@ -5,6 +5,6 @@ {{ foo }}{{ bar }} {% endwith %} --DATA-- -return array('foo' => 'baz') +return ['foo' => 'baz'] --EXPECT-- fooBAZ diff --git a/test/Twig/Tests/Fixtures/tags/with/nested.test b/test/Twig/Tests/Fixtures/tags/with/nested.test index 98e3aef43..33ca390b2 100644 --- a/test/Twig/Tests/Fixtures/tags/with/nested.test +++ b/test/Twig/Tests/Fixtures/tags/with/nested.test @@ -9,7 +9,7 @@ nested "with" tags {% endwith %} {{ foo }}{{ bar }} --DATA-- -return array() +return [] --EXPECT-- FOOBAZ foobar diff --git a/test/Twig/Tests/Fixtures/tags/with/with_no_hash.test b/test/Twig/Tests/Fixtures/tags/with/with_no_hash.test index 93689f42c..3e5395c83 100644 --- a/test/Twig/Tests/Fixtures/tags/with/with_no_hash.test +++ b/test/Twig/Tests/Fixtures/tags/with/with_no_hash.test @@ -5,6 +5,6 @@ {{ foo }}{{ bar }} {% endwith %} --DATA-- -return array('vars' => 'no-hash') +return ['vars' => 'no-hash'] --EXCEPTION-- Twig_Error_Runtime: Variables passed to the "with" tag must be a hash in "index.twig" at line 2. diff --git a/test/Twig/Tests/Fixtures/tags/with/with_only.test b/test/Twig/Tests/Fixtures/tags/with/with_only.test index 6247617e3..dba30bd5c 100644 --- a/test/Twig/Tests/Fixtures/tags/with/with_only.test +++ b/test/Twig/Tests/Fixtures/tags/with/with_only.test @@ -5,6 +5,6 @@ {{ foo }}{{ bar }}{{ baz }} {% endwith %} --DATA-- -return array('foo' => 'baz', 'baz' => 'baz') +return ['foo' => 'baz', 'baz' => 'baz'] --EXCEPTION-- Twig_Error_Runtime: Variable "baz" does not exist in "index.twig" at line 3. diff --git a/test/Twig/Tests/Fixtures/tests/constant.test b/test/Twig/Tests/Fixtures/tests/constant.test index 60218ac04..df391d9fc 100644 --- a/test/Twig/Tests/Fixtures/tests/constant.test +++ b/test/Twig/Tests/Fixtures/tests/constant.test @@ -6,7 +6,7 @@ {{ value is constant('TwigTestFoo::BAR_NAME') ? 'ok' : 'no' }} {{ 2 is constant('ARRAY_AS_PROPS', object) ? 'ok' : 'no' }} --DATA-- -return array('value' => 'bar', 'object' => new ArrayObject(array('hi'))); +return ['value' => 'bar', 'object' => new ArrayObject(array('hi'))] --EXPECT-- ok ok diff --git a/test/Twig/Tests/Fixtures/tests/defined.test b/test/Twig/Tests/Fixtures/tests/defined.test index d4e204efa..9e8850936 100644 --- a/test/Twig/Tests/Fixtures/tests/defined.test +++ b/test/Twig/Tests/Fixtures/tests/defined.test @@ -93,7 +93,7 @@ return array( 'object' => new TwigTestFoo(), ); --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- ok ok diff --git a/test/Twig/Tests/Fixtures/tests/defined_for_attribute.test b/test/Twig/Tests/Fixtures/tests/defined_for_attribute.test index 4a5b8dcdb..8385134e6 100644 --- a/test/Twig/Tests/Fixtures/tests/defined_for_attribute.test +++ b/test/Twig/Tests/Fixtures/tests/defined_for_attribute.test @@ -27,7 +27,7 @@ return array( 'undefinedVarName' => 'undefinedVar', ); --CONFIG-- -return array('strict_variables' => false) +return ['strict_variables' => false] --EXPECT-- ok ok diff --git a/test/Twig/Tests/Fixtures/tests/defined_for_blocks.test b/test/Twig/Tests/Fixtures/tests/defined_for_blocks.test index 64d7d0431..c8b90f8c9 100644 --- a/test/Twig/Tests/Fixtures/tests/defined_for_blocks.test +++ b/test/Twig/Tests/Fixtures/tests/defined_for_blocks.test @@ -26,7 +26,7 @@ --TEMPLATE(blocks)-- {% block block1 %}{%endblock %} --DATA-- -return array() +return [] --EXPECT-- ok ko diff --git a/test/Twig/Tests/Fixtures/tests/defined_for_constants.test b/test/Twig/Tests/Fixtures/tests/defined_for_constants.test index 2fa9929d3..f36489326 100644 --- a/test/Twig/Tests/Fixtures/tests/defined_for_constants.test +++ b/test/Twig/Tests/Fixtures/tests/defined_for_constants.test @@ -6,7 +6,7 @@ {{ constant('FOOBAR') is not defined ? 'ok' : 'ko' }} {{ constant('FOOBAR', object) is not defined ? 'ok' : 'ko' }} --DATA-- -return array('expect' => DATE_W3C, 'object' => new ArrayObject(array('hi'))); +return ['expect' => DATE_W3C, 'object' => new ArrayObject(array('hi'))] --EXPECT-- ok ok diff --git a/test/Twig/Tests/Fixtures/tests/dynamic_test.test b/test/Twig/Tests/Fixtures/tests/dynamic_test.test index e50d41084..41625f6af 100644 --- a/test/Twig/Tests/Fixtures/tests/dynamic_test.test +++ b/test/Twig/Tests/Fixtures/tests/dynamic_test.test @@ -6,7 +6,7 @@ dynamic test {{ 'bar' is test_foo ? '1' :'0' }} {{ 'foo' is test_bar ? '1' :'0' }} --DATA-- -return array() +return [] --EXPECT-- 1 1 diff --git a/test/Twig/Tests/Fixtures/tests/even.test b/test/Twig/Tests/Fixtures/tests/even.test index 695b4c2f8..5c73b01e9 100644 --- a/test/Twig/Tests/Fixtures/tests/even.test +++ b/test/Twig/Tests/Fixtures/tests/even.test @@ -6,7 +6,7 @@ {{ 1 is not even ? 'ok' : 'ko' }} {{ 2 is not even ? 'ko' : 'ok' }} --DATA-- -return array() +return [] --EXPECT-- ok ok diff --git a/test/Twig/Tests/Fixtures/tests/in.test b/test/Twig/Tests/Fixtures/tests/in.test index 545f51f81..bd5742a48 100644 --- a/test/Twig/Tests/Fixtures/tests/in.test +++ b/test/Twig/Tests/Fixtures/tests/in.test @@ -74,7 +74,7 @@ TRUE {{ 5.5 in '125.5' ? 'TRUE' : 'FALSE' }} {{ '5.5' in 125.5 ? 'TRUE' : 'FALSE' }} --DATA-- -return array('bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(dirname(__FILE__)), 'object' => new stdClass(), 'resource' => opendir(dirname(__FILE__))) +return ['bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(dirname(__FILE__)), 'object' => new stdClass(), 'resource' => opendir(dirname(__FILE__))] --EXPECT-- TRUE TRUE diff --git a/test/Twig/Tests/Fixtures/tests/null_coalesce.test b/test/Twig/Tests/Fixtures/tests/null_coalesce.test index 3d148c893..b462ff9f6 100644 --- a/test/Twig/Tests/Fixtures/tests/null_coalesce.test +++ b/test/Twig/Tests/Fixtures/tests/null_coalesce.test @@ -14,7 +14,7 @@ Twig supports the ?? operator {{ 1 + nope ?? nada ?? 2 }} {{ 1 + nope ?? 3 + nada ?? 2 }} --DATA-- -return array('bar' => 'OK', 'foo' => array('bar' => 'OK')) +return ['bar' => 'OK', 'foo' => array('bar' => 'OK')] --EXPECT-- OK OK diff --git a/test/Twig/Tests/Fixtures/tests/odd.test b/test/Twig/Tests/Fixtures/tests/odd.test index 1b8311e3d..ec88bb519 100644 --- a/test/Twig/Tests/Fixtures/tests/odd.test +++ b/test/Twig/Tests/Fixtures/tests/odd.test @@ -4,7 +4,7 @@ {{ 1 is odd ? 'ok' : 'ko' }} {{ 2 is odd ? 'ko' : 'ok' }} --DATA-- -return array() +return [] --EXPECT-- ok ok \ No newline at end of file diff --git a/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test b/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test index b091ad34d..d25f75e8e 100644 --- a/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test +++ b/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test @@ -9,9 +9,9 @@ --TEMPLATE(index.txt.twig)-- {{ br -}} --DATA-- -return array('br' => '
') +return ['br' => '
'] --CONFIG-- -return array('autoescape' => 'filename') +return ['autoescape' => 'filename'] --EXPECT-- <br /> <br /> diff --git a/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test b/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test index 62e24f0f4..e52c3b259 100644 --- a/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test +++ b/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test @@ -7,6 +7,6 @@ {% block foo %}Foo{% endblock %} {% block bar %}Bar{% endblock %} --DATA-- -return array() +return [] --EXPECT-- FooBarBar diff --git a/test/Twig/Tests/LegacyFixtures/test.legacy.test b/test/Twig/Tests/LegacyFixtures/test.legacy.test index d9c1d5085..4bd1f6ac0 100644 --- a/test/Twig/Tests/LegacyFixtures/test.legacy.test +++ b/test/Twig/Tests/LegacyFixtures/test.legacy.test @@ -3,6 +3,6 @@ Old test classes usage --TEMPLATE-- {{ 'foo' is multi word ? 'yes' : 'no' }} --DATA-- -return array() +return [] --EXPECT-- no