8000 Merge branch '2.3' into 2.6 · symfony/symfony@115fc32 · GitHub
[go: up one dir, main page]
Skip to content

Commit 115fc32

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.3' into 2.6
* 2.3: [Debug 2.3] Fix test for PHP7 Run tests on hhvm instead of hhvm-nightly Use HTTPS in README and some other fixes add more entropy to generated classnames Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
2 parents 09cb24b + 6e314dc commit 115fc32

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

‎.travis.yml

Lines changed: 7 additions & 7 deletions
19
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ matrix:
1212
- php: 5.6
1313
env: deps=high
1414
- php: nightly
15-
- php: hhvm-nightly
15+
- php: hhvm
1616
allow_failures:
1717
- php: nightly
18-
- php: hhvm-nightly
18+
- php: hhvm
19
fast_finish: true
2020

2121
services: mongodb
@@ -28,11 +28,11 @@ env:
2828
before_install:
2929
- travis_retry sudo apt-get install parallel
3030
- composer self-update
31-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then phpenv config-rm xdebug.ini; fi;
32-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
33-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
34-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then (pecl install -f memcached-2.1.0 && echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) || echo "Let's continue without memcache extension"; fi;
35-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then php -i; fi;
31+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
32+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
33+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
34+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then (pecl install -f memcached-2.1.0 && echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) || echo "Let's continue without memcache extension"; fi;
35+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
3636
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
3737
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
3838
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;

‎README.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,33 @@ Installation
3434
------------
3535

3636
The best way to install Symfony is to download the Symfony Standard Edition
37-
available at [http://symfony.com/download][1].
37+
available at <https://symfony.com/download>.
3838

3939
Documentation
4040
-------------
4141

42-
The "[Quick Tour][2]" tutorial gives you a first feeling of the framework. If,
42+
The "[Quick Tour][1]" tutorial gives you a first feeling of the framework. If,
4343
like us, you think that Symfony can help speed up your development and take
4444
the quality of your work to the next level, read the official
45-
[Symfony documentation][3].
45+
[Symfony documentation][2].
4646

4747
Contributing
4848
------------
10000 4949

5050
Symfony is an open source, community-driven project. If you'd like to contribute,
51-
please read the [Contributing Code][4] part of the documentation. If you're submitting
52-
a pull request, please follow the guidelines in the [Submitting a Patch][5] section
53-
and use [Pull Request Template][6].
51+
please read the [Contributing Code][3] part of the documentation. If you're submitting
52+
a pull request, please follow the guidelines in the [Submitting a Patch][4] section
53+
and use [Pull Request Template][5].
5454

5555
Running Symfony Tests
5656
----------------------
5757

5858
Information on how to run the Symfony test suite can be found in the
59-
[Running Symfony Tests][7] section.
60-
61-
[1]: http://symfony.com/download
62-
[2]: http://symfony.com/get_started
63-
[3]: http://symfony.com/doc/current/
64-
[4]: http://symfony.com/doc/current/contributing/code/index.html
65-
[5]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
66-
[6]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
67-
[7]: http://symfony.com/doc/master/contributing/code/tests.html
59+
[Running Symfony Tests][6] section.
60+
61+
[1]: https://symfony.com/get_started
62+
[2]: https://symfony.com/doc/current/
63+
[3]: https://symfony.com/doc/current/contributing/code/index.html
64+
[4]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
65+
[5]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
66+
[6]: https://symfony.com/doc/master/contributing/code/tests.html

‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
*/
2727
class ProxyDumper implements DumperInterface
2828
{
29+
/**
30+
* @var string
31+
*/
32+
private $salt;
33+
2934
/**
3035
* @var LazyLoadingValueHolderGenerator
3136
*/
@@ -38,9 +43,12 @@ class ProxyDumper implements DumperInterface
3843

3944
/**
4045
* Constructor.
46+
*
47+
* @param string $salt
4148
*/
42-
public function __construct()
49+
public function __construct($salt = '')
4350
{
51+
$this->salt = $salt;
4452
$this->proxyGenerator = new LazyLoadingValueHolderGenerator();
4553
$this->classGenerator = new BaseGeneratorStrategy();
4654
}
@@ -109,6 +117,6 @@ public function getProxyCode(Definition $definition)
109117
*/
110118
private function getProxyClassName(Definition $definition)
111119
{
112-
return str_replace('\\', '', $definition->getClass()).'_'.spl_object_hash($definition);
120+
return str_replace('\\', '', $definition->getClass()).'_'.spl_object_hash($definition).$this->salt;
113121
}
114122
}

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public function getBundle($name, $first = true)
243243
}
244244

245245
/**
246-
* {@inheritDoc}
246+
* {@inheritdoc}
247247
*
248248
* @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
249249
*/
@@ -683,7 +683,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
683683
$dumper = new PhpDumper($container);
684684

685685
if (class_exists('ProxyManager\Configuration')) {
686-
$dumper->setProxyDumper(new ProxyDumper());
686+
$dumper->setProxyDumper(new ProxyDumper(md5((string) $cache)));
687687
}
688688

689689
$content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache));

0 commit comments

Comments
 (0)
0