diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.6' into 2.7 

* 2.6:
  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
This commit is contained in:
Nicolas Grekas 2015-05-13 13:34:46 +02:00
parent 2815ae8f93 70e6a145c8
commit b47b51187e
15 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -2,10 +2,6 @@ language: php
sudo: false
cache:
directories:
- $HOME/.composer/cache
addons:
apt_packages:
- parallel

8
CONTRIBUTING.md
View File

@ -27,7 +27,7 @@ If you'd like to contribute, please read the following documents:
* [Backwards Compatibility][4]: Backward compatibility rules.
[1]: http://symfony.com/doc/current/contributing/code/index.html
[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
[1]: https://symfony.com/doc/current/contributing/code/index.html
[2]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
[3]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
[4]: https://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code

2
CONTRIBUTORS.md
View File

@ -2,7 +2,7 @@ CONTRIBUTORS
============
Symfony is the result of the work of many people who made the code better
(see http://symfony.com/contributors for more information):
(see https://symfony.com/contributors for more information):
- Fabien Potencier (fabpot)
- Bernhard Schussek (bschussek)

4
composer.json
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "The Symfony PHP framework",
"keywords": ["framework"],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {

2
src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
View File

@ -117,7 +117,7 @@ abstract class KernelTestCase extends \PHPUnit_Framework_TestCase
$finder->name('*Kernel.php')->depth(0)->in($dir);
$results = iterator_to_array($finder);
if (!count($results)) {
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.');
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.');
}
$file = current($results);

6
src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
View File

@ -135,13 +135,13 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
public function collect(Request $request, Response $response, \Exception $exception = null)
{
if ($this->requestStack && $this->requestStack->getMasterRequest() !== $request) {
// Sub-requests and programmatic calls stay in the collected profile.
if (($this->requestStack && $this->requestStack->getMasterRequest() !== $request) || $request->isXmlHttpRequest() || $request->headers->has('Origin')) {
return;
}
// In all conditions that remove the web debug toolbar, dumps are written on the output.
// In all other conditions that remove the web debug toolbar, dumps are written on the output.
if (!$this->requestStack
|| $request->isXmlHttpRequest()
|| !$response->headers->has('X-Debug-Token')
|| $response->isRedirection()
|| ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))

2
src/Symfony/Component/OptionsResolver/README.md
View File

@ -17,4 +17,4 @@ You can run the unit tests with the following command:
$ composer install
$ phpunit
[1]: http://symfony.com/doc/current/components/options_resolver.html
[1]: https://symfony.com/doc/current/components/options_resolver.html

2
src/Symfony/Component/Security/Acl/README.md
View File

@ -11,7 +11,7 @@ Resources
Documentation:
http://symfony.com/doc/2.7/book/security.html
https://symfony.com/doc/2.7/book/security.html
Tests
-----

4
src/Symfony/Component/Security/Acl/composer.json
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - ACL (Access Control List)",
"keywords": [],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {

2
src/Symfony/Component/Security/Core/README.md
View File

@ -11,7 +11,7 @@ Resources
Documentation:
http://symfony.com/doc/2.7/book/security.html
https://symfony.com/doc/2.7/book/security.html
Tests
-----

4
src/Symfony/Component/Security/Core/composer.json
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - Core Library",
"keywords": [],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {

2
src/Symfony/Component/Security/Csrf/README.md
View File

@ -9,7 +9,7 @@ Resources
Documentation:
http://symfony.com/doc/2.7/book/security.html
https://symfony.com/doc/2.7/book/security.html
Tests
-----

4
src/Symfony/Component/Security/Csrf/composer.json
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - CSRF Library",
"keywords": [],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {

2
src/Symfony/Component/Security/Http/README.md
View File

@ -11,7 +11,7 @@ Resources
Documentation:
http://symfony.com/doc/2.7/book/security.html
https://symfony.com/doc/2.7/book/security.html
Tests
-----

4
src/Symfony/Component/Security/Http/composer.json
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Security Component - HTTP Integration",
"keywords": [],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {