Permalink
Browse files

Update Symfony to 3.3 (based on standard edition) (#2843)

* Update Symfony to 3.3 (based on standard edition)

* Fix config

Create var folder

Update .gitignore

Fix credentials & console location

Add missing bin/ folder & fix hhvm setup
  • Loading branch information...
raziel057 authored and nbrady-techempower committed Jun 6, 2017
1 parent 5922b63 commit 055a46d37f9986b381fce82fb375a5c03ac0b386
Showing with 1,960 additions and 2,495 deletions.
  1. +0 −1 frameworks/Nim/jester/jester
  2. +5 −3 frameworks/PHP/symfony2/.gitignore
  3. +1 −1 frameworks/PHP/symfony2/LICENSE
  4. +8 −10 frameworks/PHP/symfony2/README.md
  5. +0 −2 frameworks/PHP/symfony2/app/AppCache.php
  6. +29 −14 frameworks/PHP/symfony2/app/AppKernel.php
  7. +0 −687 frameworks/PHP/symfony2/app/SymfonyRequirements.php
  8. +0 −14 frameworks/PHP/symfony2/app/autoload.php
  9. +0 −55 frameworks/PHP/symfony2/app/check.php
  10. +48 −45 frameworks/PHP/symfony2/app/config/config.yml
  11. +25 −13 frameworks/PHP/symfony2/app/config/config_dev.yml
  12. +6 −8 frameworks/PHP/symfony2/app/config/config_prod.yml
  13. +1 −1 frameworks/PHP/symfony2/app/config/config_test.yml
  14. +1 −0 frameworks/PHP/symfony2/app/config/parameters.yml
  15. +14 −0 frameworks/PHP/symfony2/app/config/parameters.yml.dist
  16. +16 −20 frameworks/PHP/symfony2/app/config/routing.yml
  17. +7 −20 frameworks/PHP/symfony2/app/config/routing_dev.yml
  18. +13 −31 frameworks/PHP/symfony2/app/config/security.yml
  19. +0 −41 frameworks/PHP/symfony2/app/phpunit.xml.dist
  20. +2 −21 frameworks/PHP/symfony2/benchmark_config.json
  21. +14 −8 frameworks/PHP/symfony2/{app → bin}/console
  22. +146 −0 frameworks/PHP/symfony2/bin/symfony_requirements
  23. +43 −23 frameworks/PHP/symfony2/composer.json
  24. +1,232 −661 frameworks/PHP/symfony2/composer.lock
  25. +3 −3 frameworks/PHP/symfony2/setup.sh
  26. +2 −2 frameworks/PHP/symfony2/setup_hhvm.sh
  27. +0 −114 frameworks/PHP/symfony2/source_code
  28. +0 −9 frameworks/PHP/symfony2/src/Acme/DemoBundle/AcmeDemoBundle.php
  29. +0 −57 frameworks/PHP/symfony2/src/Acme/DemoBundle/Controller/DemoController.php
  30. +0 −69 frameworks/PHP/symfony2/src/Acme/DemoBundle/Controller/SecuredController.php
  31. +0 −18 frameworks/PHP/symfony2/src/Acme/DemoBundle/Controller/WelcomeController.php
  32. +0 −22 frameworks/PHP/symfony2/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php
  33. +0 −25 frameworks/PHP/symfony2/src/Acme/DemoBundle/EventListener/ControllerListener.php
  34. +0 −20 frameworks/PHP/symfony2/src/Acme/DemoBundle/Form/ContactType.php
  35. +0 −18 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/config/services.xml
  36. +0 −101 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/css/demo.css
  37. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/blue-arrow.png
  38. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/field-background.gif
  39. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/logo.gif
  40. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/search.png
  41. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif
  42. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif
  43. BIN frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif
  44. +0 −15 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig
  45. +0 −9 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig
  46. +0 −14 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig
  47. +0 −11 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig
  48. +0 −9 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig
  49. +0 −6 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig
  50. +0 −35 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig
  51. +0 −83 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig
  52. +0 −37 frameworks/PHP/symfony2/src/Acme/DemoBundle/Resources/views/layout.html.twig
  53. +0 −17 frameworks/PHP/symfony2/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php
  54. +0 −81 frameworks/PHP/symfony2/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php
  55. +1 −0 frameworks/PHP/symfony2/var/.gitkeep
  56. +11 −11 frameworks/PHP/symfony2/web/app.php
  57. +10 −6 frameworks/PHP/symfony2/web/app_dev.php
  58. +322 −24 frameworks/PHP/symfony2/web/config.php
Submodule jester deleted from da9e3a
@@ -1,6 +1,7 @@
/app/cache
/app/logs
/bin
/var/cache
/var/logs
/var/sessions
!/bin
/vendors
/vendor
/build
@@ -10,3 +11,4 @@
.idea
app/bootstrap.php.cache
/deploy/php-fpm.pid
/.buildpath
@@ -1,4 +1,4 @@
Copyright (c) 2004-2013 Fabien Potencier
Copyright (c) 2004-2017 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1,18 +1,18 @@
# Symfony 2 Benchmarking Test
# Symfony Benchmarking Test
The information below contains information specific to Symfony2.
For further guidance, review the
[documentation](http://frameworkbenchmarks.readthedocs.org/en/latest/).
Also note the additional information provided in the [PHP README](../).
This is the Symfony 2 PHP portion of a [benchmarking test suite](../../) comparing a variety of web development platforms.
This is the Symfony 3 PHP portion of a [benchmarking test suite](../../) comparing a variety of web development platforms.
## Infrastructure Software Versions
The tests were run with:
* [Symfony Version 2.2.1](http://symfony.com/)
* [PHP Version 5.5.17](http://www.php.net/) with FPM and APC
* [Symfony Version 3.3.0](http://symfony.com/)
* [PHP Version 7.x](http://www.php.net/) with FPM and APC
* [nginx 1.4.0](http://nginx.org/)
* [MySQL 5.5.29](https://dev.mysql.com/)
@@ -24,20 +24,18 @@ The tests were run with:
* [Single Database Query](src/Skamander/BenchmarkBundle/Controller/BenchController.php) ([Model](src/Skamander/BenchmarkBundle/Entity/World.php))
: "/db" _Note: Uses the Symfony 2/Doctrine 2 Entity functionality._
* [Multiple Database Queries](src/Skamander/BenchmarkBundle/Controller/BenchController.php) ([Model](src/Skamander/BenchmarkBundle/Entity/World.php))
: "/db?queries=" _Note: Uses the Symfony 2/Doctrine 2 Entity functionality._
: "/db?queries=" _Note: Uses the Symfony 3/Doctrine 2 Entity functionality._
* [Fortunes Template Test](src/Skamander/BenchmarkBundle/Controller/BenchController.php)
: "/fortunes" _Note: Uses Symfony's template engine 'Twig'_
## Advice for Adding Symfony2 Tests
## Advice for Adding Symfony Tests
This implementation is the direct result of installing the
[Standard Edition of Symfony 2](https://github.com/symfony/symfony-standard) using [Composer](https://getcomposer.org/), and making
[Standard Edition of Symfony](https://github.com/symfony/symfony-standard) using [Composer](https://getcomposer.org/), and making
the minimum modifications necessary to support
running the benchmark. Specifically, unnecessary bundles
have *not* been removed from the kernel to properly
reflect "out of the box" performance. If you're interested
in tuned performance, see the symfony-stripped test, which
removes and unnecessary components.
reflect "out of the box" performance.
Note: `app/bootstrap.php.cache` is generated by Composer
when you first run `composer.phar install`
@@ -1,7 +1,5 @@
<?php
require_once __DIR__.'/AppKernel.php';
use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
class AppCache extends HttpCache
@@ -7,33 +7,48 @@ class AppKernel extends Kernel
{
public function registerBundles()
{
$bundles = array(
$bundles = [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
//new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new JMS\AopBundle\JMSAopBundle(),
new JMS\DiExtraBundle\JMSDiExtraBundle($this),
new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
new Skamander\BenchmarkBundle\SkamanderBenchmarkBundle(),
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
];
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
if ('dev' === $this->getEnvironment()) {
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
}
}
return $bundles;
}
public function getRootDir()
{
return __DIR__;
}
public function getCacheDir()
{
return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
}
public function getLogDir()
{
return dirname(__DIR__).'/var/logs';
}
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
$loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
}
}
Oops, something went wrong.

0 comments on commit 055a46d

Please sign in to comment.