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

Commit a2a4967

Browse files
TobionTobion
committed
Merge branch '2.7' into 2.8
Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Formatter/OutputFormatter.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/Console/Input/Input.php src/Symfony/Component/Console/Input/InputArgument.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Console/Input/InputOption.php src/Symfony/Component/Console/Output/OutputInterface.php src/Symfony/Component/Console/Output/StreamOutput.php src/Symfony/Component/CssSelector/CssSelector.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/ContainerInterface.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Scope.php src/Symfony/Component/DependencyInjection/ScopeInterface.php src/Symfony/Component/Validator/Constraints/Currency.php src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
2 parents a76eae8 + 3146062 commit a2a4967

File tree

241 files changed

+132
-2245
lines changed

Some content is hidden

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

241 files changed

+132
-2245
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@
170170
{% set label = name|humanize %}
171171
{% endif %}
172172
<label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
173-
{{- widget|raw -}}
174-
{{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}}
173+
{{- widget|raw }} {{ label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}}
175174
</label>
176175
{% endif %}
177176
{% endblock checkbox_radio_label %}

‎src/Symfony/Component/BrowserKit/Client.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
* you need to also implement the getScript() method.
2626
*
2727
* @author Fabien Potencier <fabien@symfony.com>
28-
*
29-
* @api
3028
*/
3129
abstract class Client
3230
{
@@ -52,8 +50,6 @@ abstract class Client
5250
* @param array $server The server parameters (equivalent of $_SERVER)
5351
* @param History $history A History instance to store the browser history
5452
* @param CookieJar $cookieJar A CookieJar instance to store the cookies
55-
*
56-
* @api
5753
*/
5854
public function __construct(array $server = array(), History $history = null, CookieJar $cookieJar = null)
5955
{
@@ -66,8 +62,6 @@ public function __construct(array $server = array(), History $history = null, Co
6662
* Sets whether to automatically follow redirects or not.
6763
*
6864
* @param bool $followRedirect Whether to follow redirects
69-
*
70-
* @api
7165
*/
7266
public function followRedirects($followRedirect = true)
7367
{
@@ -111,8 +105,6 @@ public function getMaxRedirects()
111105
* @param bool $insulated Whether to insulate the requests or not
112106
*
113107
* @throws \RuntimeException When Symfony Process Component is not installed
114-
*
115-
* @api
116108
*/
117109
public function insulate($insulated = true)
118110
{
@@ -127,8 +119,6 @@ public function insulate($insulated = true)
127119
* Sets server parameters.
128120
*
129121
* @param array $server An array of server parameters
130-
*
131-
* @api
132122
*/
133123
public function setServerParameters(array $server)
134124
{
@@ -166,8 +156,6 @@ public function getServerParameter($key, $default = '')
166156
* Returns the History instance.
167157
*
168158
* @return History A History instance
169-
*
170-
* @api
171159
*/
172160
public function getHistory()
173161
{
@@ -178,8 +166,6 @@ public function getHistory()
178166
* Returns the CookieJar instance.
179167
*
180168
* @return CookieJar A CookieJar instance
181-
*
182-
* @api
183169
*/
184170
public function getCookieJar()
185171
{
@@ -190,8 +176,6 @@ public function getCookieJar()
190176
* Returns the current Crawler instance.
191177
*
192178
* @return Crawler|null A Crawler instance
193-
*
194-
* @api
195179
*/
196180
public function getCrawler()
197181
{
@@ -202,8 +186,6 @@ public function getCrawler()
202186
* Returns the current BrowserKit Response instance.
203187
*
204188
* @return Response|null A BrowserKit Response instance
205-
*
206-
* @api
207189
*/
208190
public function getInternalResponse()
209191
{
@@ -219,8 +201,6 @@ public function getInternalResponse()
219201
* @return object|null A response instance
220202
*
221203
* @see doRequest()
222-
*
223-
* @api
224204
*/
225205
public function getResponse()
226206
{
@@ -231,8 +211,6 @@ public function getResponse()
231211
* Returns the current BrowserKit Request instance.
232212
*
233213
* @return Request|null A BrowserKit Request instance
234-
*
235-
* @api
236214
*/
237215
public function getInternalRequest()
238216
{
@@ -248,8 +226,6 @@ public function getInternalRequest()
248226
* @return object|null A Request instance
249227
*
250228
* @see doRequest()
251-
*
252-
* @api
253229
*/
254230
public function getRequest()
255231
{
@@ -262,8 +238,6 @@ public function getRequest()
262238
* @param Link $link A Link instance
263239
*
264240
* @return Crawler
265-
*
266-
* @api
267241
*/
268242
public function click(Link $link)
269243
{
@@ -281,8 +255,6 @@ public function click(Link $link)
281255
* @param array $values An array of form field values
282256
*
283257
* @return Crawler
284-
*
285-
* @api
286258
*/
287259
public function submit(Form $form, array $values = array())
288260
{
@@ -303,8 +275,6 @@ public function submit(Form $form, array $values = array())
303275
* @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
304276
*
305277
* @return Crawler
306-
*
307-
* @api
308278
*/
309279
public function request($method, $uri, array $parameters = array(), array $files = array(), array $server = array(), $content = null, $changeHistory = true)
310280
{
@@ -460,8 +430,6 @@ protected function createCrawlerFromContent($uri, $content, $type)
460430
* Goes back in the browser history.
461431
*
462432
* @return Crawler
463-
*
464-
* @api
465433
*/
466434
public function back()
467435
{
@@ -472,8 +440,6 @@ public function back()
472440
* Goes forward in the browser history.
473441
*
474442
* @return Crawler
475-
*
476-
* @api
477443
*/
478444
public function forward()
479445
{
@@ -484,8 +450,6 @@ public function forward()
484450
* Reloads the current browser.
485451
*
486452
* @return Crawler
487-
*
488-
* @api
489453
*/
490454
public function reload()
491455
{
@@ -498,8 +462,6 @@ public function reload()
498462
* @return Crawler
499463
*
500464
* @throws \LogicException If request was not a redirect
501-
*
502-
* @api
503465
*/
504466
public function followRedirect()
505467
{
@@ -548,8 +510,6 @@ public function followRedirect()
548510
* Restarts the client.
549511
*
550512
* It flushes history and all cookies.
551-
*
552-
* @api
553513
*/
554514
public function restart()
555515
{

‎src/Symfony/Component/BrowserKit/Cookie.php

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* Cookie represents an HTTP cookie.
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
18-
*
19-
* @api
2018
*/
2119
class Cookie
2220
{
@@ -56,8 +54,6 @@ class Cookie
5654
* @param bool $secure Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client
5755
* @param bool $httponly The cookie httponly flag
5856
* @param bool $encodedValue Whether the value is encoded or not
59-
*
60-
* @api
6157
*/
6258
public function __construct($name, $value, $expires = null, $path = null, $domain = '', $secure = false, $httponly = true, $encodedValue = false)
6359
{
@@ -90,8 +86,6 @@ public function __construct($name, $value, $expires = null, $path = null, $domai
9086
* @return string The HTTP representation of the Cookie
9187
*
9288
* @throws \UnexpectedValueException
93-
*
94-
* @api
9589
*/
9690
public function __toString()
9791
{
@@ -130,8 +124,6 @@ public function __toString()
130124
* @return Cookie A Cookie instance
131125
*
132126
* @throws \InvalidArgumentException
133-
*
134-
* @api
135127
*/
136128
public static function fromString($cookie, $url = null)
137129
{
@@ -229,8 +221,6 @@ private static function parseDate($dateValue)
229221
* Gets the name of the cookie.
230222
*
231223
* @return string The cookie name
232-
*
233-
* @api
234224
*/
235225
public function getName()
236226
{
@@ -241,8 +231,6 @@ public function getName()
241231
* Gets the value of the cookie.
242232
*
243233
* @return string The cookie value
244-
*
245-
* @api
246234
*/
247235
public function getValue()
248236
{
@@ -253,8 +241,6 @@ public function getValue()
253241
* Gets the raw value of the cookie.
254242
*
255243
* @return string The cookie value
256-
*
257-
* @api
258244
*/
259245
public function getRawValue()
260246
{
@@ -265,8 +251,6 @@ public function getRawValue()
265251
* Gets the expires time of the cookie.
266252
*
267253
* @return string The cookie expires time
268-
*
269-
* @api
270254
*/
271255
public function getExpiresTime()
272256
{
@@ -277,8 +261,6 @@ public function getExpiresTime()
277261
* Gets the path of the cookie.
278262
*
279263
* @return string The cookie path
280-
*
281-
* @api
282264
*/
283265
public function getPath()
284266
{
@@ -289,8 +271,6 @@ public function getPath()
289271
* Gets the domain of the cookie.
290272
*
291273
* @return string The cookie domain
292-
*
293-
* @api
294274
*/
295275
public function getDomain()
296276
{
@@ -301,8 +281,6 @@ public function getDomain()
301281
* Returns the secure flag of the cookie.
302282
*
303283
* @return bool The cookie secure flag
304-
*
305-
* @api
306284
*/
307285
public function isSecure()
308286
{
@@ -313,8 +291,6 @@ public function isSecure()
313291
* Returns the httponly flag of the cookie.
314292
*
315293
* @return bool The cookie httponly flag
316-
*
317-
* @api
318294
*/
319295
public function isHttpOnly()
320296
{
@@ -325,8 +301,6 @@ public function isHttpOnly()
325301
* Returns true if the cookie has expired.
326302
*
327303
* @return bool true if the cookie has expired, false otherwise
328-
*
329-
* @api
330304
*/
331305
public function isExpired()
332306
{

‎src/Symfony/Component/BrowserKit/CookieJar.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* CookieJar.
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
18-
*
19-
* @api
2018
*/
2119
class CookieJar
2220
{
@@ -26,8 +24,6 @@ class CookieJar
2624
* Sets a cookie.
2725
*
2826
* @param Cookie $cookie A Cookie instance
29-
*
30-
* @api
3127
*/
3228
public function set(Cookie $cookie)
3329
{
@@ -47,8 +43,6 @@ public function set(Cookie $cookie)
4743
* @param string $domain The cookie domain
4844
*
4945
* @return Cookie|null A Cookie instance or null if the cookie does not exist
50-
*
51-
* @api
5246
*/
5347
public function get($name, $path = '/', $domain = null)
5448
{
@@ -94,8 +88,6 @@ public function get($name, $path = '/', $domain = null)
9488
* @param string $name The cookie name
9589
* @param string $path The cookie path
9690
* @param string $domain The cookie domain
97-
*
98-
* @api
9991
*/
10092
public function expire($name, $path = '/', $domain = null)
10193
{
@@ -126,8 +118,6 @@ public function expire($name, $path = '/', $domain = null)
126118

127119
/**
128120
* Removes all the cookies from the jar.
129-
*
130-
* @api
131121
*/
132122
public function clear()
133123
{

‎src/Symfony/Component/BrowserKit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BrowserKit Component
33

44
BrowserKit simulates the behavior of a web browser.
55

6-
The component only provide an abstract client and does not provide any
6+
The component only provides an abstract client and does not provide any
77
"default" backend for the HTTP layer.
88

99
Resources

0 commit comments

Comments
 (0)
0