8000 Merge branch '2.8' into 3.1 · symfony/symfony@0416b8a · GitHub
[go: up one dir, main page]
Skip to content

Commit 0416b8a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.1
* 2.8: [travis] fix after box updates Console: Fix indentation of Help: section of txt usage help [Intl] Update ICU data to 57.1 [Config] Improved test Added class existence check if is_subclass_of() fails in compiler passes
2 parents d13c424 + b974c20 commit 0416b8a

File tree

878 files changed

+15080
-8461
lines changed
  • command_2.txt
  • command_astext.txt
  • Intl

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    878 files changed

    +15080
    -8461
    lines changed

    ‎.travis.yml

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -62,8 +62,7 @@ before_install:
    6262
    - if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = ldap.so >> $INI_FILE; fi
    6363
    - if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = redis.so >> $INI_FILE; fi;
    6464
    - if [[ ! $skip && ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
    65-
    - if [[ ! $skip ]]; then composer self-update --stable; fi
    66-
    - if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi
    65+
    - if [[ ! $skip ]]; then [ -d ~/.composer ] || mkdir ~/.composer; cp .composer/* ~/.composer/; fi
    6766
    - if [[ ! $skip ]]; then ./phpunit install; fi
    6867
    - if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi
    6968
    - if [[ ! $skip ]]; then ldapadd -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/base.ldif; fi

    ‎src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php

    Lines changed: 37 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -173,4 +173,41 @@ public function getPreNormalizedNormalizedOrderedData()
    173173
    ),
    174174
    );
    175175
    }
    176+
    177+
    /**
    178+
    * @expectedException \InvalidArgumentException
    179+
    * @expectedExceptionMessage Child nodes must be named.
    180+
    */
    181+
    public function testAddChildEmptyName()
    182+
    {
    183+
    $node = new ArrayNode('root');
    184+
    185+
    $childNode = new ArrayNode('');
    186+
    $node->addChild($childNode);
    187+
    }
    188+
    189+
    /**
    190+
    * @expectedException \InvalidArgumentException
    191+
    * @expectedExceptionMessage A child node named "foo" already exists.
    192+
    */
    193+
    public function testAddChildNameAlreadyExists()
    194+
    {
    195+
    $node = new ArrayNode('root');
    196+
    197+
    $childNode = new ArrayNode('foo');
    198+
    $node->addChild($childNode);
    199+
    200+
    $childNodeWithSameName = new ArrayNode('foo');
    201+
    $node->addChild($childNodeWithSameName);
    202+
    }
    203+
    204+
    /**
    205+
    * @expectedException \RuntimeException
    206+
    * @expectedExceptionMessage The node at path "foo" has no default value.
    207+
    */
    208+
    public function testGetDefaultValueWithoutDefaultValue()
    209+
    {
    210+
    $node = new ArrayNode('foo');
    211+
    $node->getDefaultValue();
    212+
    }
    176213
    }

    ‎src/Symfony/Component/Console/Descriptor/TextDescriptor.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -156,7 +156,7 @@ protected function describeCommand(Command $command, array $options = array())
    156156
    $this->writeText("\n");
    157157
    $this->writeText('<comment>Help:</comment>', $options);
    158158
    $this->writeText("\n");
    159-
    $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
    159+
    $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
    160160
    $this->writeText("\n");
    161161
    }
    162162
    }

    ‎src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt

    Lines changed: 9 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,12 +17,12 @@ Options:
    1717
    -v|vv|vvv, --verbose Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
    1818

    1919
    Help:
    20-
    The help command displays help for a given command:
    21-
    22-
    php app/console help list
    23-
    24-
    You can also output the help in other formats by using the --format option:
    25-
    26-
    php app/console help --format=xml list
    27-
    28-
    To display the list of available commands, please use the list command.
    20+
    The help command displays help for a given command:
    21+
    22+
    php app/console help list
    23+
    24+
    You can also output the help in other formats by using the --format option:
    25+
    26+
    php app/console help --format=xml list
    27+
    28+
    To display the list of available commands, please use the list command.

    ‎src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt

    Lines changed: 15 additions & 15 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,18 +9,18 @@ Options:
    99
    --format=FORMAT The output format (txt, xml, json, or md) [default: "txt"]
    1010

    1111
    Help:
    12-
    The list command lists all commands:
    13-
    14-
    php app/console list
    15-
    16-
    You can also display the commands for a specific namespace:
    17-
    18-
    php app/console list test
    19-
    20-
    You can also output the information in other formats by using the --format option:
    21-
    22-
    php app/console list --format=xml
    23-
    24-
    It's also possible to get raw list of commands (useful for embedding command runner):
    25-
    26-
    php app/console list --raw
    12+
    The list command lists all commands:
    13+
    14+
    php app/console list
    15+
    16+
    You can also display the commands for a specific namespace:
    17+
    18+
    php app/console list test
    19+
    20+
    You can also output the information in other formats by using the --format option:
    21+
    22+
    php app/console list --format=xml
    23+
    24+
    It's also possible to get raw list of commands (useful for embedding command runner):
    25+
    26+
    php app/console list --raw

    ‎src/Symfony/Component/Console/Tests/Fixtures/command_1.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,4 +4,4 @@
    44
    alias2
    55

    66
    <comment>Help:</comment>
    7-
    command 1 help
    7+
    command 1 help

    ‎src/Symfony/Component/Console/Tests/Fixtures/command_2.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -10,4 +10,4 @@
    1010
    <info>-o, --option_name</info>
    1111

    1212
    <comment>Help:</comment>
    13-
    command 2 help
    13+
    command 2 help

    ‎src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,4 +15,4 @@
    1515
    <info>-v|vv|vvv, --verbose</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
    1616

    1717
    <comment>Help:</comment>
    18-
    help
    18+
    help

    ‎src/Symfony/Component/Intl/Intl.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -234,7 +234,7 @@ public static function getIcuDataVersion()
    234234
    */
    235235
    public static function getIcuStubVersion()
    236236
    {
    237-
    return '55.1';
    237+
    return '57.1';
    238238
    }
    239239

    240240
    /**

    ‎src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -252,8 +252,8 @@ class NumberFormatter
    252252
    );
    253253

    254254
    private static $enTextAttributes = array(
    255-
    self::DECIMAL => array('', '', '-', '', '*', '', ''),
    256-
    self::CURRENCY => array('¤', '', '-¤', '', '*', ''),
    255+
    self::DECIMAL => array('', '', '-', '', ' ', '', ''),
    256+
    self::CURRENCY => array('¤', '', '-¤', '', ' ', ''),
    257257
    );
    258258

    259259
    /**

    ‎src/Symfony/Component/Intl/Resources/bin/icu.ini

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,3 +12,4 @@
    1212
    53 = http://source.icu-project.org/repos/icu/icu/tags/release-53-1/source
    1313
    54 = http://source.icu-project.org/repos/icu/icu/tags/release-54-1/source
    1414
    55 = http://source.icu-project.org/repos/icu/icu/tags/release-55-1/source
    15+
    57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source

    ‎src/Symfony/Component/Intl/Resources/data/currencies/af.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.12.94",
    2+
    "Version": "2.1.22.93",
    33
    "Names": {
    44
    "AED": [
    55
    "AED",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.11.68",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "NAD": [
    55
    "$",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ak.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.7.39",
    2+
    "Version": "2.1.23.7",
    33
    "Names": {
    44
    "AED": [
    55
    "AED",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/am.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.12.94",
    2+
    "Version": "2.1.22.93",
    33
    "Names": {
    44
    "AED": [
    55
    "AED",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar.json

    Lines changed: 9 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.12.94",
    2+
    "Version": "2.1.22.93",
    33
    "Names": {
    44
    "ADP": [
    55
    "ADP",
    @@ -27,7 +27,7 @@
    2727
    ],
    2828
    "ANG": [
    2929
    "ANG",
    30-
    "غيلدر هولندي أنتيلي"
    30+
    "غيلدر أنتيلي هولندي"
    3131
    ],
    3232
    "AOA": [
    3333
    "AOA",
    @@ -198,7 +198,7 @@
    198198
    "بيزو شيلي"
    199199
    ],
    200200
    "CNY": [
    201-
    "ي.ص",
    201+
    "CN¥",
    202202
    "يوان صيني"
    203203
    ],
    204204
    "COP": [
    @@ -359,7 +359,7 @@
    359359
    ],
    360360
    "HKD": [
    361361
    "HK$",
    362-
    "دولار هونج كونج"
    362+
    "دولار هونغ كونغ"
    363363
    ],
    364364
    "HNL": [
    365365
    "HNL",
    @@ -398,7 +398,7 @@
    398398
    "شيكل إسرائيلي جديد"
    399399
    ],
    400400
    "INR": [
    401-
    "ر.ه.‏",
    401+
    "₹",
    402402
    "روبيه هندي"
    403403
    ],
    404404
    "IQD": [
    @@ -471,7 +471,7 @@
    471471
    ],
    472472
    "LBP": [
    473473
    "ل.ل.‏",
    474-
    "جنية لبناني"
    474+
    "جنيه لبناني"
    475475
    ],
    476476
    "LKR": [
    477477
    "LKR",
    @@ -811,7 +811,7 @@
    811811
    ],
    812812
    "TND": [
    813813
    "د.ت.‏",
    814-
    "دينارتونسي"
    814+
    "دينار تونسي"
    815815
    ],
    816816
    "TOP": [
    817817
    "TOP",
    @@ -899,7 +899,7 @@
    899899
    ],
    900900
    "XAF": [
    901901
    "FCFA",
    902-
    "فرنك أفريقي"
    902+
    "فرنك وسط أفريقي"
    903903
    ],
    904904
    "XCD": [
    905905
    "EC$",
    @@ -919,7 +919,7 @@
    919919
    ],
    920920
    "XOF": [
    921921
    "CFA",
    922-
    "فرنك سي إف إيه غرب إفريقيا"
    922+
    "فرنك غرب أفريقي"
    923923
    ],
    924924
    "XPF": [
    925925
    "CFPF",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.6.69",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "DJF": [
    55
    "Fdj",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.6.69",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "ERN": [
    55
    "Nfk",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.12.18",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "SDG": [
    55
    "SDG",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.6.69",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "SOS": [
    55
    "S",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.6.69",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "GBP": [
    55
    "GB£",

    ‎src/Symfony/Component/Intl/Resources/data/currencies/az.json

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    {
    2-
    "Version": "2.1.12.94",
    2+
    "Version": "2.1.23.7",
    33
    "Names": {
    44
    "ADP": [
    55
    "ADP",
    @@ -78,7 +78,7 @@
    7878
    "Azərbaycan Manatı (1993–2006)"
    7979
    ],
    8080
    "AZN": [
    81-
    "AZN",
    81+
    "₼",
    8282
    "Azərbaycan Manatı"
    8383
    ],
    8484
    "BAD": [

    ‎src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,8 +1,8 @@
    11
    {
    2-
    "Version": "2.1.10.34",
    2+
    "Version": "2.1.19.14",
    33
    "Names": {
    44
    "AZN": [
    5-
    "ман.",
    5+
    "₼",
    66
    "AZN"
    77
    ]
    88
    }

    0 commit comments

    Comments
     (0)
    0