8000 Merge branch '4.4' into 5.1 · symfony/symfony@1a0ea4d · GitHub
[go: up one dir, main page]
Skip to content

Commit 1a0ea4d

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.1
* 4.4: Fix branch-version
2 parents 59db413 + 58f803f commit 1a0ea4d

File tree

85 files changed

+85
-85
lines changed
  • Cache
  • Config
  • Console
  • CssSelector
  • DependencyInjection
  • DomCrawler
  • Dotenv
  • ErrorHandler
  • EventDispatcher
  • ExpressionLanguage
  • Filesystem
  • Finder
  • Form
  • HttpClient
  • HttpFoundation
  • HttpKernel
  • Inflector
  • Intl
  • Ldap
  • Lock
  • Mailer
  • Messenger
  • Mime
  • Notifier
  • OptionsResolver
  • Process
  • PropertyAccess
  • PropertyInfo
  • Routing
  • Security
  • Serializer
  • Stopwatch
  • String
  • Templating
  • Translation
  • Uid
  • Validator
  • VarDumper
  • VarExporter
  • Workflow
  • Yaml
  • Contracts

    • Some content is hidden

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

    85 files changed

    +85
    -85
    lines changed

    ‎composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -171,6 +171,6 @@
    171171
    ],
    172172
    "minimum-stability": "dev",
    173173
    "extra": {
    174-
    "branch-version": "5.1-dev"
    174+
    "branch-version": "5.1"
    175175
    }
    176176
    }

    ‎src/Symfony/Bridge/Doctrine/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -77,6 +77,6 @@
    7777
    },
    7878
    "minimum-stability": "dev",
    7979
    "extra": {
    80-
    "branch-version": "5.1-dev"
    80+
    "branch-version": "5.1"
    8181
    }
    8282
    }

    ‎src/Symfony/Bridge/Monolog/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -46,6 +46,6 @@
    4646
    },
    4747
    "minimum-stability": "dev",
    4848
    "extra": {
    49-
    "branch-version": "5.1-dev"
    49+
    "branch-version": "5.1"
    5050
    }
    5151
    }

    ‎src/Symfony/Bridge/PhpUnit/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -41,7 +41,7 @@
    4141
    ],
    4242
    "minimum-stability": "dev",
    4343
    "extra": {
    44-
    "branch-version": "5.1-dev",
    44+
    "branch-version": "5.1",
    4545
    "thanks": {
    4646
    "name": "phpunit/phpunit",
    4747
    "url": "https://github.com/sebastianbergmann/phpunit"

    ‎src/Symfony/Bridge/ProxyManager/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -34,6 +34,6 @@
    3434
    },
    3535
    "minimum-stability": "dev",
    3636
    "extra": {
    37-
    "branch-version": "5.1-dev"
    37+
    "branch-version": "5.1"
    3838
    }
    3939
    }

    ‎src/Symfony/Bridge/Twig/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -79,6 +79,6 @@
    7979
    },
    8080
    "minimum-stability": "dev",
    8181
    "extra": {
    82-
    "branch-version": "5.1-dev"
    82+
    "branch-version": "5.1"
    8383
    }
    8484
    }

    ‎src/Symfony/Bundle/DebugBundle/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -43,6 +43,6 @@
    4343
    },
    4444
    "minimum-stability": "dev",
    4545
    "extra": {
    46-
    "branch-version": "5.1-dev"
    46+
    "branch-version": "5.1"
    4747
    }
    4848
    }

    ‎src/Symfony/Bundle/FrameworkBundle/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -110,6 +110,6 @@
    110110
    },
    111111
    "minimum-stability": "dev",
    112112
    "extra": {
    113-
    "branch-version": "5.1-dev"
    113+
    "branch-version": "5.1"
    114114
    }
    115115
    }

    ‎src/Symfony/Bundle/SecurityBundle/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -62,6 +62,6 @@
    6262
    },
    6363
    "minimum-stability": "dev",
    6464
    "extra": {
    65-
    "branch-version": "5.1-dev"
    65+
    "branch-version": "5.1"
    6666
    }
    6767
    }

    ‎src/Symfony/Bundle/TwigBundle/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -52,6 +52,6 @@
    5252
    },
    5353
    "minimum-stability": "dev",
    5454
    "extra": {
    55-
    "branch-version": "5.1-dev"
    55+
    "branch-version": "5.1"
    5656
    }
    5757
    }

    ‎src/Symfony/Bundle/WebProfilerBundle/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -42,6 +42,6 @@
    4242
    },
    4343
    "minimum-stability": "dev",
    4444
    "extra": {
    45-
    "branch-version": "5.1-dev"
    45+
    "branch-version": "5.1"
    4646
    }
    4747
    }

    ‎src/Symfony/Component/Asset/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -34,6 +34,6 @@
    3434
    },
    3535
    "minimum-stability": "dev",
    3636
    "extra": {
    37-
    "branch-version": "5.1-dev"
    37+
    "branch-version": "5.1"
    3838
    }
    3939
    }

    ‎src/Symfony/Component/BrowserKit/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,6 @@
    3636
    },
    3737
    "minimum-stability": "dev",
    3838
    "extra": {
    39-
    "branch-version": "5.1-dev"
    39+
    "branch-version": "5.1"
    4040
    }
    4141
    }

    ‎src/Symfony/Component/Cache/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -53,6 +53,6 @@
    5353
    },
    5454
    "minimum-stability": "dev",
    5555
    "extra": {
    56-
    "branch-version": "5.1-dev"
    56+
    "branch-version": "5.1"
    5757
    }
    5858
    }

    ‎src/Symfony/Component/Config/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -43,6 +43,6 @@
    4343
    },
    4444
    "minimum-stability": "dev",
    4545
    "extra": {
    46-
    "branch-version": "5.1-dev"
    46+
    "branch-version": "5.1"
    4747
    }
    4848
    }

    ‎src/Symfony/Component/Console/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -56,6 +56,6 @@
    5656
    },
    5757
    "minimum-stability": "dev",
    5858
    "extra": {
    59-
    "branch-version": "5.1-dev"
    59+
    "branch-version": "5.1"
    6060
    }
    6161
    }

    ‎src/Symfony/Component/CssSelector/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/DependencyInjection/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -52,6 +52,6 @@
    5252
    },
    5353
    "minimum-stability": "dev",
    5454
    "extra": {
    55-
    "branch-version": "5.1-dev"
    55+
    "branch-version": "5.1"
    5656
    }
    5757
    }

    ‎src/Symfony/Component/DomCrawler/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -39,6 +39,6 @@
    3939
    },
    4040
    "minimum-stability": "dev",
    4141
    "extra": {
    42-
    "branch-version": "5.1-dev"
    42+
    "branch-version": "5.1"
    4343
    }
    4444
    }

    ‎src/Symfony/Component/Dotenv/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/ErrorHandler/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -34,6 +34,6 @@
    3434
    },
    3535
    "minimum-stability": "dev",
    3636
    "extra": {
    37-
    "branch-version": "5.1-dev"
    37+
    "branch-version": "5.1"
    3838
    }
    3939
    }

    ‎src/Symfony/Component/EventDispatcher/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -50,6 +50,6 @@
    5050
    },
    5151
    "minimum-stability": "dev",
    5252
    "extra": {
    53-
    "branch-version": "5.1-dev"
    53+
    "branch-version": "5.1"
    5454
    }
    5555
    }

    ‎src/Symfony/Component/ExpressionLanguage/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -29,6 +29,6 @@
    2929
    },
    3030
    "minimum-stability": "dev",
    3131
    "extra": {
    32-
    "branch-version": "5.1-dev"
    32+
    "branch-version": "5.1"
    3333
    }
    3434
    }

    ‎src/Symfony/Component/Filesystem/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -27,6 +27,6 @@
    2727
    },
    2828
    "minimum-stability": "dev",
    2929
    "extra": {
    30-
    "branch-version": "5.1-dev"
    30+
    "branch-version": "5.1"
    3131
    }
    3232
    }

    ‎src/Symfony/Component/Finder/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -26,6 +26,6 @@
    2626
    },
    2727
    "minimum-stability": "dev",
    2828
    "extra": {
    29-
    "branch-version": "5.1-dev"
    29+
    "branch-version": "5.1"
    3030
    }
    3131
    }

    ‎src/Symfony/Component/Form/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -66,6 +66,6 @@
    6666
    },
    6767
    "minimum-stability": "dev",
    6868
    "extra": {
    69-
    "branch-version": "5.1-dev"
    69+
    "branch-version": "5.1"
    7070
    }
    7171
    }

    ‎src/Symfony/Component/HttpClient/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -48,6 +48,6 @@
    4848
    },
    4949
    "minimum-stability": "dev",
    5050
    "extra": {
    51-
    "branch-version": "5.1-dev"
    51+
    "branch-version": "5.1"
    5252
    }
    5353
    }

    ‎src/Symfony/Component/HttpFoundation/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -38,6 +38,6 @@
    3838
    },
    3939
    "minimum-stability": "dev",
    4040
    "extra": {
    41-
    "branch-version": "5.1-dev"
    41+
    "branch-version": "5.1"
    4242
    }
    4343
    }

    ‎src/Symfony/Component/HttpKernel/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -77,6 +77,6 @@
    7777
    },
    7878
    "minimum-stability": "dev",
    7979
    "extra": {
    80-
    "branch-version": "5.1-dev"
    80+
    "branch-version": "5.1"
    8181
    }
    8282
    }

    ‎src/Symfony/Component/Inflector/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -35,6 +35,6 @@
    3535
    },
    3636
    "minimum-stability": "dev",
    3737
    "extra": {
    38-
    "branch-version": "5.1-dev"
    38+
    "branch-version": "5.1"
    3939
    }
    4040
    }

    ‎src/Symfony/Component/Intl/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -43,6 +43,6 @@
    4343
    },
    4444
    "minimum-stability": "dev",
    4545
    "extra": {
    46-
    "branch-version": "5.1-dev"
    46+
    "branch-version": "5.1"
    4747
    }
    4848
    }

    ‎src/Symfony/Component/Ldap/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,6 @@
    3636
    },
    3737
    "minimum-stability": "dev",
    3838
    "extra": {
    39-
    "branch-version": "5.1-dev"
    39+
    "branch-version": "5.1"
    4040
    }
    4141
    }

    ‎src/Symfony/Component/Lock/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,6 @@
    3636
    },
    3737
    "minimum-stability": "dev",
    3838
    "extra": {
    39-
    "branch-version": "5.1-dev"
    39+
    "branch-version": "5.1"
    4040
    }
    4141
    }

    ‎src/Symfony/Component/Mailer/Bridge/Amazon/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -32,6 +32,6 @@
    3232
    },
    3333
    "minimum-stability": "dev",
    3434
    "extra": {
    35-
    "branch-version": "5.1-dev"
    35+
    "branch-version": "5.1"
    3636
    }
    3737
    }

    ‎src/Symfony/Component/Mailer/Bridge/Google/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/Mailer/Bridge/Postmark/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -30,6 +30,6 @@
    3030
    },
    3131
    "minimum-stability": "dev",
    3232
    "extra": {
    33-
    "branch-version": "5.1-dev"
    33+
    "branch-version": "5.1"
    3434
    }
    3535
    }

    ‎src/Symfony/Component/Mailer/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -45,6 +45,6 @@
    4545
    },
    4646
    "minimum-stability": "dev",
    4747
    "extra": {
    48-
    "branch-version": "5.1-dev"
    48+
    "branch-version": "5.1"
    4949
    }
    5050
    }

    ‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -34,6 +34,6 @@
    3434
    },
    3535
    "minimum-stability": "dev",
    3636
    "extra": {
    37-
    "branch-version": "5.1-dev"
    37+
    "branch-version": "5.1"
    3838
    }
    3939
    }

    ‎src/Symfony/Component/Messenger/Bridge/Amqp/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -33,6 +33,6 @@
    3333
    },
    3434
    "minimum-stability": "dev",
    3535
    "extra": {
    36-
    "branch-version": "5.1-dev"
    36+
    "branch-version": "5.1"
    3737
    }
    3838
    }

    ‎src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -37,6 +37,6 @@
    3737
    },
    3838
    "minimum-stability": "dev",
    3939
    "extra": {
    40-
    "branch-version": "5.1-dev"
    40+
    "branch-version": "5.1"
    4141
    }
    4242
    }

    ‎src/Symfony/Component/Messenger/Bridge/Redis/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -31,6 +31,6 @@
    3131
    },
    3232
    "minimum-stability": "dev",
    3333
    "extra": {
    34-
    "branch-version": "5.1-dev"
    34+
    "branch-version": "5.1"
    3535
    }
    3636
    }

    ‎src/Symfony/Component/Messenger/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line number 10000 Diff line numberDiff line change
    @@ -53,6 +53,6 @@
    5353
    },
    5454
    "minimum-stability": "dev",
    5555
    "extra": {
    56-
    "branch-version": "5.1-dev"
    56+
    "branch-version": "5.1"
    5757
    }
    5858
    }

    ‎src/Symfony/Component/Mime/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,6 @@
    3636
    },
    3737
    "minimum-stability": "dev",
    3838
    "extra": {
    39-
    "branch-version": "5.1-dev"
    39+
    "branch-version": "5.1"
    4040
    }
    4141
    }

    ‎src/Symfony/Component/Notifier/Bridge/Firebase/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -28,6 +28,6 @@
    2828
    },
    2929
    "minimum-stability": "dev",
    3030
    "extra": {
    31-
    "branch-version": "5.1-dev"
    31+
    "branch-version": "5.1"
    3232
    }
    3333
    }

    ‎src/Symfony/Component/Notifier/Bridge/FreeMobile/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -29,6 +29,6 @@
    2929
    },
    3030
    "minimum-stability": "dev",
    3131
    "extra": {
    32-
    "branch-version": "5.1-dev"
    32+
    "branch-version": "5.1"
    3333
    }
    3434
    }

    ‎src/Symfony/Component/Notifier/Bridge/Mattermost/composer.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -28,6 +28,6 @@
    2828
    },
    2929
    "minimum-stability": "dev",
    3030
    "extra": {
    31-
    "branch-version": "5.1-dev"
    31+
    "branch-version": "5.1"
    3232
    }
    3333
    }

    0 commit comments

    Comments
     (0)
    0