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

Commit aef24cb

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: fix missing links to https://symfony.com fix missing links to https://symfony.com [travis] Don't use the cache [DebugBundle] Remove inlined dumps on XHR Conflicts: src/Symfony/Component/Security/Acl/README.md src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md
2 parents 5133bf2 + b47b511 commit aef24cb

File tree

15 files changed

+24
-28
lines changed

15 files changed

+24
-28
lines changed

‎.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ language: php
22

33
sudo: false
44

5-
cache:
6-
directories:
7-
- $HOME/.composer/cache
8-
95
addons:
106
apt_packages:
117
- parallel

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If you'd like to contribute, please read the following documents:
2727

2828
* [Backwards Compatibility][4]: Backward compatibility rules.
2929

30-
[1]: http://symfony.com/doc/current/contributing/code/index.html
31-
[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
32-
[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
33-
[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
30+
[1]: https://symfony.com/doc/current/contributing/code/index.html
31+
[2]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
32+
[3]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
33+
[4]: https://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code

‎CONTRIBUTORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CONTRIBUTORS
22
============
33

44
Symfony is the result of the work of many people who made the code better
5-
(see http://symfony.com/contributors for more information):
5+
(see https://symfony.com/contributors for more information):
66

77
- Fabien Potencier (fabpot)
88
- Bernhard Schussek (bschussek)

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "The Symfony PHP framework",
55
"keywords": ["framework"],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

‎src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected static function getKernelClass()
117117
$finder->name('*Kernel.php')->depth(0)->in($dir);
118118
$results = iterator_to_array($finder);
119119
if (!count($results)) {
120-
throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
120+
throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to https://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
121121
}
122122

123123
$file = current($results);

‎src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ public function dump(Data $data)
135135

136136
public function collect(Request $request, Response $response, \Exception $exception = null)
137137
{
138-
if ($this->requestStack && $this->requestStack->getMasterRequest() !== $request) {
138+
// Sub-requests and programmatic calls stay in the collected profile.
139+
if (($this->requestStack && $this->requestStack->getMasterRequest() !== $request) || $request->isXmlHttpRequest() || $request->headers->has('Origin')) {
139140
return;
140141
}
141142

142-
// In all conditions that remove the web debug toolbar, dumps are written on the output.
143+
// In all other conditions that remove the web debug toolbar, dumps are written on the output.
143144
if (!$this->requestStack
144-
|| $request->isXmlHttpRequest()
145145
|| !$response->headers->has('X-Debug-Token')
146146
|| $response->isRedirection()
147147
|| ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ You can run the unit tests with the following command:
1717
$ composer install
1818
$ phpunit
1919

20-
[1]: http://symfony.com/doc/current/components/options_resolver.html
20+
[1]: https://symfony.com/doc/current/components/options_resolver.html

‎src/Symfony/Component/Security/Acl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Resources
1111

1212
Documentation:
1313

14-
http://symfony.com/doc/2.8/book/security.html
14+
https://symfony.com/doc/2.8/book/security.html
1515

1616
Tests
1717
-----

‎src/Symfony/Component/Security/Acl/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "Symfony Security Component - ACL (Access Control List)",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

‎src/Symfony/Component/Security/Core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Resources
1111

1212
Documentation:
1313

14-
http://symfony.com/doc/2.8/book/security.html
14+
https://symfony.com/doc/2.8/book/security.html
1515

1616
Tests
1717
-----

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "Symfony Security Component - Core Library",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

‎src/Symfony/Component/Security/Csrf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Resources
99

1010
Documentation:
1111

12-
http://symfony.com/doc/2.8/book/security.html
12+
https://symfony.com/doc/2.8/book/security.html
1313

1414
Tests
1515
-----

‎src/Symfony/Component/Security/Csrf/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "Symfony Security Component - CSRF Library",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

‎src/Symfony/Component/Security/Http/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Resources
1111

1212
Documentation:
1313

14-
http://symfony.com/doc/2.8/book/security.html
14+
https://symfony.com/doc/2.8/book/security.html
1515

1616
Tests
1717
-----

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "library",
44
"description": "Symfony Security Component - HTTP Integration",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

0 commit comments

Comments
 (0)
0