Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2b257d7

Browse filesBrowse files
fabpotfabpot
committed
feature #22758 Remove HHVM support (fabpot)
This PR was squashed before being merged into the 4.0-dev branch (closes #22758). Discussion ---------- Remove HHVM support | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes-ish (for HHVM users) | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 2125437 [WebServerBundle] removed obsolete ServerCommand abstract class ad1f35f removed HHVM support
2 parents ab49685 + 2125437 commit 2b257d7
Copy full SHA for 2b257d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

43 files changed

+69
-350
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+4-13Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,20 @@ before_install:
6262
export -f tfold
6363
6464
# php.ini configuration
65-
if [[ $PHP = hhvm* ]]; then
66-
INI=/etc/hhvm/php.ini
67-
else
68-
INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
69-
phpenv config-rm xdebug.ini || echo "xdebug not available"
70-
fi
65+
INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
66+
phpenv config-rm xdebug.ini || echo "xdebug not available"
7167
echo date.timezone = Europe/Paris >> $INI
7268
echo memory_limit = -1 >> $INI
7369
echo session.gc_probability = 0 >> $INI
7470
echo opcache.enable_cli = 1 >> $INI
75-
echo hhvm.jit = 0 >> $INI
7671
echo apc.enable_cli = 1 >> $INI
7772
echo extension = ldap.so >> $INI
7873
echo extension = redis.so >> $INI
7974
echo extension = memcached.so >> $INI
8075
echo extension = mongodb.so >> $INI
8176
8277
# Matrix lines for intermediate PHP versions are skipped for pull requests
83-
if [[ ! $deps && ! $PHP = $MIN_PHP && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
78+
if [[ ! $deps && ! $PHP = $MIN_PHP && $TRAVIS_PULL_REQUEST != false ]]; then
8479
deps=skip
8580
skip=1
8681
else
@@ -145,9 +140,7 @@ install:
145140
146141
- if [[ ! $skip ]]; then $COMPOSER_UP; fi
147142
- if [[ ! $skip ]]; then ./phpunit install; fi
148-
- |
149-
# phpinfo
150-
if [[ ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
143+
- php -i
151144

152145
- |
153146
run_tests () {
@@ -161,8 +154,6 @@ install:
161154
# Test the PhpUnit bridge on PHP 5.3, using the original phpunit script
162155
tfold src/Symfony/Bridge/PhpUnit \
163156
"cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar && phpenv global 5.3 && composer update --no-progress --ansi && php phpunit-4.8.phar"
164-
elif [[ $PHP = hhvm* ]]; then
165-
$PHPUNIT --exclude-group benchmark,intl-data
166157
else
167158
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
168159
tfold tty-group $PHPUNIT --group tty

‎src/Symfony/Bundle/WebServerBundle/Command/ServerCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerCommand.php
-32Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
1515
use Symfony\Bundle\WebServerBundle\WebServerConfig;
16+
use Symfony\Component\Console\Command\Command;
1617
use Symfony\Component\Console\Input\InputArgument;
1718
use Symfony\Component\Console\Input\InputOption;
1819
use Symfony\Component\Console\Input\InputInterface;
@@ -26,7 +27,7 @@
2627
*
2728
* @author Michał Pipa <michal.pipa.xsolve@gmail.com>
2829
*/
29-
class ServerRunCommand extends ServerCommand
30+
class ServerRunCommand extends Command
3031
{
3132
private $documentRoot;
3233
private $environment;

‎src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
1515
use Symfony\Bundle\WebServerBundle\WebServerConfig;
16+
use Symfony\Component\Console\Command\Command;
1617
use Symfony\Component\Console\Input\InputArgument;
1718
use Symfony\Component\Console\Input\InputInterface;
1819
use Symfony\Component\Console\Input\InputOption;
@@ -25,7 +26,7 @@
2526
*
2627
* @author Christian Flothmann <christian.flothmann@xabbuh.de>
2728
*/
28-
class ServerStartCommand extends ServerCommand
29+
class ServerStartCommand extends Command
2930
{
3031
private $documentRoot;
3132
private $environment;

‎src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\WebServerBundle\Command;
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
15+
use Symfony\Component\Console\Command\Command;
1516
use Symfony\Component\Console\Input\InputInterface;
1617
use Symfony\Component\Console\Input\InputOption;
1718
use Symfony\Component\Console\Output\OutputInterface;
@@ -24,7 +25,7 @@
2425
*
2526
* @author Christian Flothmann <christian.flothmann@xabbuh.de>
2627
*/
27-
class ServerStatusCommand extends ServerCommand
28+
class ServerStatusCommand extends Command
2829
{
2930
/**
3031
* {@inheritdoc}

‎src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\WebServerBundle\Command;
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
15+
use Symfony\Component\Console\Command\Command;
1516
use Symfony\Component\Console\Input\InputInterface;
1617
use Symfony\Component\Console\Output\OutputInterface;
1718
use Symfony\Component\Console\Output\ConsoleOutputInterface;
@@ -23,7 +24,7 @@
2324
*
2425
* @author Christian Flothmann <christian.flothmann@xabbuh.de>
2526
*/
26-
class ServerStopCommand extends ServerCommand
27+
class ServerStopCommand extends Command
2728
{
2829
/**
2930
* {@inheritdoc}

‎src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function ($key, $value, $isHit) {
6363
public static function create($file, CacheItemPoolInterface $fallbackPool)
6464
{
6565
// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
66-
if (ini_get('opcache.enable') || defined('HHVM_VERSION')) {
66+
if (ini_get('opcache.enable')) {
6767
if (!$fallbackPool instanceof AdapterInterface) {
6868
$fallbackPool = new ProxyAdapter($fallbackPool);
6969
}

‎src/Symfony/Component/Cache/Simple/PhpArrayCache.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Simple/PhpArrayCache.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct($file, CacheInterface $fallbackPool)
4646
public static function create($file, CacheInterface $fallbackPool)
4747
{
4848
// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
49-
if (ini_get('opcache.enable') || defined('HHVM_VERSION')) {
49+
if (ini_get('opcache.enable')) {
5050
return new static($file, $fallbackPool);
5151
}
5252

‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
-9Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@
1515

1616
abstract class AdapterTestCase extends CachePoolTest
1717
{
18-
protected function setUp()
19-
{
20-
parent::setUp();
21-
22-
if (!array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && defined('HHVM_VERSION')) {
23-
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
24-
}
25-
}
26-
2718
public function testDefaultLifeTime()
2819
{
2920
if (isset($this->skippedTests[__FUNCTION__])) {

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/composer.json
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
"conflict": {
3535
"symfony/var-dumper": "<3.4"
3636
},
37-
"suggest": {
38-
"symfony/polyfill-apcu": "For using ApcuAdapter on HHVM"
39-
},
4037
"autoload": {
4138
"psr-4": { "Symfony\\Component\\Cache\\": "" },
4239
"exclude-from-classmap": [

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.