Browse Source

Sf3 improvments (#3000)

* 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

* Code cleanup & small improvements

* Code cleanup & small improvements

* CS Fix

* CS Fix

* Revert changes for HHVM support

* Code cleanup & small improvements

* CS Fix

* Revert changes for HHVM support

* rename symfony2 to symfony

* Change path symfony2 to symfony

* Remove fortune-raw tests (not usefull as twig is already compiled to php)

* Rename symfony2 to symfony

* Remove spaceless tag in base template

* Upgrade to Symfony 3.4.0

* Revert configuration

* Few more fixes

* Remove HHVM
Thomas Lallement 7 years ago
parent
commit
9737ad812a
75 changed files with 326 additions and 1128 deletions
  1. 1 1
      .travis.yml
  2. 0 0
      frameworks/PHP/symfony/.gitignore
  3. 0 0
      frameworks/PHP/symfony/.hhvm.bbhc
  4. 0 0
      frameworks/PHP/symfony/LICENSE
  5. 4 4
      frameworks/PHP/symfony/README.md
  6. 0 0
      frameworks/PHP/symfony/app/.htaccess
  7. 0 0
      frameworks/PHP/symfony/app/AppCache.php
  8. 0 4
      frameworks/PHP/symfony/app/AppKernel.php
  9. 7 0
      frameworks/PHP/symfony/app/Resources/views/base.html.twig
  10. 2 8
      frameworks/PHP/symfony/app/config/config.yml
  11. 12 0
      frameworks/PHP/symfony/app/config/config_dev.yml
  12. 0 17
      frameworks/PHP/symfony/app/config/config_prod.yml
  13. 0 0
      frameworks/PHP/symfony/app/config/parameters.yml
  14. 0 0
      frameworks/PHP/symfony/app/config/parameters.yml.dist
  15. 0 4
      frameworks/PHP/symfony/app/config/routing.yml
  16. 0 0
      frameworks/PHP/symfony/app/config/routing_dev.yml
  17. 5 29
      frameworks/PHP/symfony/benchmark_config.json
  18. 0 0
      frameworks/PHP/symfony/bin/console
  19. 0 0
      frameworks/PHP/symfony/bin/symfony_requirements
  20. 72 0
      frameworks/PHP/symfony/composer.json
  21. 197 185
      frameworks/PHP/symfony/composer.lock
  22. 4 4
      frameworks/PHP/symfony/deploy/config.hdf
  23. 1 1
      frameworks/PHP/symfony/deploy/nginx.conf
  24. 2 2
      frameworks/PHP/symfony/deploy/php-symfony
  25. 0 0
      frameworks/PHP/symfony/hhvm.pid
  26. 1 1
      frameworks/PHP/symfony/setup.sh
  27. 2 2
      frameworks/PHP/symfony/setup_hhvm.sh
  28. 0 0
      frameworks/PHP/symfony/src/.htaccess
  29. 5 57
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Controller/BenchController.php
  30. 0 0
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Entity/Fortune.php
  31. 0 0
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Entity/World.php
  32. 10 0
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.twig
  33. 0 0
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Resources/views/layout.html.twig
  34. 0 0
      frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/SkamanderBenchmarkBundle.php
  35. 0 0
      frameworks/PHP/symfony/var/.gitkeep
  36. 0 0
      frameworks/PHP/symfony/web/.htaccess
  37. 0 1
      frameworks/PHP/symfony/web/app.php
  38. 1 0
      frameworks/PHP/symfony/web/app_dev.php
  39. 0 0
      frameworks/PHP/symfony/web/apple-touch-icon.png
  40. 0 0
      frameworks/PHP/symfony/web/config.php
  41. 0 0
      frameworks/PHP/symfony/web/favicon.ico
  42. 0 0
      frameworks/PHP/symfony/web/robots.txt
  43. 0 11
      frameworks/PHP/symfony2/app/Resources/views/base.html.php
  44. 0 11
      frameworks/PHP/symfony2/app/Resources/views/base.html.twig
  45. 0 29
      frameworks/PHP/symfony2/app/config/config_dev.yml
  46. 0 16
      frameworks/PHP/symfony2/app/config/config_test.yml
  47. 0 24
      frameworks/PHP/symfony2/app/config/security.yml
  48. 0 67
      frameworks/PHP/symfony2/composer.json
  49. 0 18
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.php
  50. 0 20
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.twig
  51. 0 5
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/content.php
  52. 0 14
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/fortunes.php
  53. 0 2
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/template_footer.php
  54. 0 6
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/template_header.php
  55. 0 7
      frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/layout.html.php
  56. 0 101
      frameworks/PHP/symfony2/web/bundles/acmedemo/css/demo.css
  57. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/blue-arrow.png
  58. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/field-background.gif
  59. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/logo.gif
  60. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/search.png
  61. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-configure.gif
  62. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-demo.gif
  63. BIN
      frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-quick-tour.gif
  64. 0 150
      frameworks/PHP/symfony2/web/bundles/framework/css/body.css
  65. 0 108
      frameworks/PHP/symfony2/web/bundles/framework/css/exception.css
  66. 0 72
      frameworks/PHP/symfony2/web/bundles/framework/css/structure.css
  67. BIN
      frameworks/PHP/symfony2/web/bundles/framework/images/blue_picto_less.gif
  68. BIN
      frameworks/PHP/symfony2/web/bundles/framework/images/blue_picto_more.gif
  69. BIN
      frameworks/PHP/symfony2/web/bundles/framework/images/grey_magnifier.png
  70. BIN
      frameworks/PHP/symfony2/web/bundles/framework/images/logo_symfony.png
  71. 0 73
      frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/css/configurator.css
  72. 0 74
      frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/css/install.css
  73. BIN
      frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/images/blue-arrow.png
  74. BIN
      frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/images/notification.gif
  75. BIN
      frameworks/PHP/symfony2/web/favicon.ico

+ 1 - 1
.travis.yml

@@ -152,7 +152,7 @@ env:
     - "TESTDIR=PHP/silex"
     - "TESTDIR=PHP/silex-orm"
     - "TESTDIR=PHP/slim"
-    - "TESTDIR=PHP/symfony2"
+    - "TESTDIR=PHP/symfony"
     - "TESTDIR=PHP/workerman"
     - "TESTDIR=PHP/yaf"
     - "TESTDIR=PHP/yii2"

+ 0 - 0
frameworks/PHP/symfony2/.gitignore → frameworks/PHP/symfony/.gitignore


+ 0 - 0
frameworks/PHP/symfony2/.hhvm.bbhc → frameworks/PHP/symfony/.hhvm.bbhc


+ 0 - 0
frameworks/PHP/symfony2/LICENSE → frameworks/PHP/symfony/LICENSE


+ 4 - 4
frameworks/PHP/symfony2/README.md → frameworks/PHP/symfony/README.md

@@ -1,11 +1,11 @@
 # Symfony Benchmarking Test
 
-The information below contains information specific to Symfony2. 
+The information below contains information specific to Symfony. 
 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 3 PHP portion of a [benchmarking test suite](../../) comparing a variety of web development platforms.
+This is the Symfony PHP portion of a [benchmarking test suite](../../) comparing a variety of web development platforms.
 
 ## Infrastructure Software Versions
 
@@ -22,9 +22,9 @@ The tests were run with:
 : "/json" _Note: Uses the PHP standard 
 [JSON encoder](http://www.php.net/manual/en/function.json-encode.php)._
 * [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._
+: "/db" _Note: Uses the Symfony /Doctrine Entity functionality._
 * [Multiple Database Queries](src/Skamander/BenchmarkBundle/Controller/BenchController.php) ([Model](src/Skamander/BenchmarkBundle/Entity/World.php))
-: "/db?queries=" _Note: Uses the Symfony 3/Doctrine 2 Entity functionality._
+: "/db?queries=" _Note: Uses the Symfony /Doctrine Entity functionality._
 * [Fortunes Template Test](src/Skamander/BenchmarkBundle/Controller/BenchController.php)
 : "/fortunes" _Note: Uses Symfony's template engine 'Twig'_
 

+ 0 - 0
frameworks/PHP/symfony2/app/.htaccess → frameworks/PHP/symfony/app/.htaccess


+ 0 - 0
frameworks/PHP/symfony2/app/AppCache.php → frameworks/PHP/symfony/app/AppCache.php


+ 0 - 4
frameworks/PHP/symfony2/app/AppKernel.php → frameworks/PHP/symfony/app/AppKernel.php

@@ -9,12 +9,8 @@ class AppKernel extends Kernel
     {
         $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 Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Skamander\BenchmarkBundle\SkamanderBenchmarkBundle(),
         ];
         

+ 7 - 0
frameworks/PHP/symfony/app/Resources/views/base.html.twig

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>{% block title %}Welcome!{% endblock %}</title>
+</head>
+<body>{% block body %}{% endblock %}</body>
+</html>

+ 2 - 8
frameworks/PHP/symfony2/app/config/config.yml → frameworks/PHP/symfony/app/config/config.yml

@@ -1,11 +1,12 @@
 imports:
     - { resource: parameters.yml }
-    - { resource: security.yml }
+    #- { resource: security.yml }
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: en
+    container.dumper.inline_class_loader: true
 
 framework:
     #esi: ~
@@ -59,10 +60,3 @@ doctrine:
         #naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true
 
-# Swiftmailer Configuration
-#swiftmailer:
-#    transport: '%mailer_transport%'
-#    host: '%mailer_host%'
-#    username: '%mailer_user%'
-#    password: '%mailer_password%'
-#    spool: { type: memory }

+ 12 - 0
frameworks/PHP/symfony/app/config/config_dev.yml

@@ -0,0 +1,12 @@
+imports:
+    - { resource: config.yml }
+
+framework:
+    router:
+        resource: '%kernel.project_dir%/app/config/routing_dev.yml'
+        strict_requirements: true
+    profiler: { only_exceptions: false }
+
+web_profiler:
+    toolbar: true
+    intercept_redirects: false

+ 0 - 17
frameworks/PHP/symfony2/app/config/config_prod.yml → frameworks/PHP/symfony/app/config/config_prod.yml

@@ -8,20 +8,3 @@ imports:
 framework:
     router:
         strict_requirements: null
-
-#doctrine:
-#    orm:
-#        metadata_cache_driver: apc
-#        result_cache_driver: apc
-#        query_cache_driver: apc
-
-monolog:
-    handlers:
-        main:
-            type:         fingers_crossed
-            action_level: error
-            handler:      nested
-        nested:
-            type:  stream
-            path:  '%kernel.logs_dir%/%kernel.environment%.log'
-            level: debug

+ 0 - 0
frameworks/PHP/symfony2/app/config/parameters.yml → frameworks/PHP/symfony/app/config/parameters.yml


+ 0 - 0
frameworks/PHP/symfony2/app/config/parameters.yml.dist → frameworks/PHP/symfony/app/config/parameters.yml.dist


+ 0 - 4
frameworks/PHP/symfony2/app/config/routing.yml → frameworks/PHP/symfony/app/config/routing.yml

@@ -25,7 +25,3 @@ _updateRaw:
 _fortunes:
     path:  /fortunes
     defaults: { _controller: "SkamanderBenchmarkBundle:Bench:fortunes" }
-
-_fortunesRaw:
-    path:  /fortunes-raw
-    defaults: { _controller: "SkamanderBenchmarkBundle:Bench:fortunesRaw" }

+ 0 - 0
frameworks/PHP/symfony2/app/config/routing_dev.yml → frameworks/PHP/symfony/app/config/routing_dev.yml


+ 5 - 29
frameworks/PHP/symfony2/benchmark_config.json → frameworks/PHP/symfony/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "symfony2",
+  "framework": "symfony",
   "tests": [{
     "default": {
       "setup_file": "setup",
@@ -13,7 +13,7 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "symfony2",
+      "framework": "symfony",
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
@@ -21,7 +21,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "symfony2",
+      "display_name": "symfony",
       "notes": "",
       "versus": "php-php5"
     },
@@ -30,12 +30,11 @@
       "db_url": "/db-raw",
       "update_url": "/update-raw?queries=",
       "query_url": "/db-raw?queries=",
-      "fortune_url": "/fortunes-raw",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "symfony2",
+      "framework": "symfony",
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
@@ -43,32 +42,9 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "symfony2",
+      "display_name": "symfony",
       "notes": "",
       "versus": "php-php5"
-    },
-    "hhvm": {
-      "setup_file": "setup_hhvm",
-      "plaintext_url": "/plaintext",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/db?queries=",
-      "fortune_url": "/fortunes",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "symfony2",
-      "language": "PHP",
-      "flavor": "HHVM",
-      "orm": "Full",
-      "platform": "None",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "symfony2-hhvm",
-      "notes": "",
-      "versus": "php5"
     }
   }]
 }

+ 0 - 0
frameworks/PHP/symfony2/bin/console → frameworks/PHP/symfony/bin/console


+ 0 - 0
frameworks/PHP/symfony2/bin/symfony_requirements → frameworks/PHP/symfony/bin/symfony_requirements


+ 72 - 0
frameworks/PHP/symfony/composer.json

@@ -0,0 +1,72 @@
+{
+	"name" : "symfony/framework-standard-edition",
+	"license" : "MIT",
+	"type" : "project",
+	"description" : "The \"Symfony Standard Edition\" distribution",
+	"autoload" : {
+		"psr-4" : {
+			"" : "src/"
+		},
+		"classmap" : [
+			"app/AppKernel.php",
+			"app/AppCache.php"
+		]
+	},
+	"autoload-dev" : {
+		"psr-4" : {
+			"Tests\\" : "tests/"
+		},
+		"files" : [
+			"vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
+		]
+	},
+	"require" : {
+		"php" : ">=5.5.9",
+		"doctrine/doctrine-bundle" : "^1.6",
+		"doctrine/orm" : "^2.5",
+		"incenteev/composer-parameter-handler" : "^2.0",
+		"sensio/distribution-bundle" : "^5.0.19",
+		"sensio/framework-extra-bundle" : "^3.0.2",
+		"symfony/monolog-bundle" : "^3.1.0",
+		"symfony/polyfill-apcu" : "^1.0",
+		"symfony/swiftmailer-bundle" : "^2.3.10",
+		"symfony/symfony" : "^3.3",
+		"twig/twig" : "^1.0||^2.0"
+	},
+	"require-dev" : {
+		"sensio/generator-bundle" : "^3.0",
+		"symfony/phpunit-bridge" : "^3.0"
+	},
+	"scripts" : {
+		"symfony-scripts" : [
+			"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+			"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+			"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+			"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+			"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+			"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+		],
+		"post-install-cmd" : "@symfony-scripts",
+		"post-update-cmd" : "@symfony-scripts"
+	},
+	"config" : {
+		"platform" : {
+			"php" : "5.5.9"
+		},
+		"sort-packages" : true
+	},
+	"extra" : {
+		"symfony-app-dir" : "app",
+		"symfony-bin-dir" : "bin",
+		"symfony-var-dir" : "var",
+		"symfony-web-dir" : "web",
+		"symfony-tests-dir" : "tests",
+		"symfony-assets-install" : "relative",
+		"incenteev-parameters" : {
+			"file" : "app/config/parameters.yml"
+		},
+		"branch-alias" : {
+			"dev-master" : "3.3-dev"
+		}
+	}
+}

File diff suppressed because it is too large
+ 197 - 185
frameworks/PHP/symfony/composer.lock


+ 4 - 4
frameworks/PHP/symfony2/deploy/config.hdf → frameworks/PHP/symfony/deploy/config.hdf

@@ -1,13 +1,13 @@
 # main configuration file
 
 # Application PID File
-PidFile = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony2/hhvm.pid
+PidFile = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony/hhvm.pid
 
 # Server settings
 Server {
   Port = 9001
   Type = fastcgi
-  SourceRoot = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony2
+  SourceRoot = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony
   DefaultDocument = index.php
   GzipCompressionLevel = 0
   EnableKeepAlive = true
@@ -18,7 +18,7 @@ Log {
   UseLogFile = false
   UseSyslog = false
   Level = Error
-  #File = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony2/error.log
+  #File = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony/error.log
 }
 
 # Enable jit for production mode
@@ -30,7 +30,7 @@ Eval {
 # Repo file
 Repo {
   Central {
-    Path = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony2/.hhvm.bbhc
+    Path = /home/vagrant/FrameworkBenchmarks/frameworks/PHP/symfony/.hhvm.bbhc
   }
 }
 

+ 1 - 1
frameworks/PHP/symfony2/deploy/nginx.conf → frameworks/PHP/symfony/deploy/nginx.conf

@@ -65,7 +65,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/tfb/FrameworkBenchmarks/php-symfony2/web/;
+        root /home/tfb/FrameworkBenchmarks/php-symfony/web/;
         index  app.php;
 
         location / {

+ 2 - 2
frameworks/PHP/symfony2/deploy/php-symfony2 → frameworks/PHP/symfony/deploy/php-symfony

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /php-symfony2/ "/home/ubuntu/FrameworkBenchmarks/php-symfony2/web/"
-  <Directory /home/ubuntu/FrameworkBenchmarks/php-symfony2/web/>
+  Alias /php-symfony/ "/home/ubuntu/FrameworkBenchmarks/php-symfony/web/"
+  <Directory /home/ubuntu/FrameworkBenchmarks/php-symfony/web/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

+ 0 - 0
frameworks/PHP/symfony2/hhvm.pid → frameworks/PHP/symfony/hhvm.pid


+ 1 - 1
frameworks/PHP/symfony2/setup.sh → frameworks/PHP/symfony/setup.sh

@@ -3,7 +3,7 @@
 fw_depends mysql php7 nginx composer
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
-sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|root .*/FrameworkBenchmarks/php-symfony| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 php bin/console cache:clear --env=prod --no-debug --no-warmup

+ 2 - 2
frameworks/PHP/symfony2/setup_hhvm.sh → frameworks/PHP/symfony/setup_hhvm.sh

@@ -3,11 +3,11 @@
 fw_depends mysql php5 nginx composer hhvm
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
-sed -i 's|SourceRoot = .*/FrameworkBenchmarks/symfony2|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
+sed -i 's|SourceRoot = .*/FrameworkBenchmarks/symfony|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
 sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf
 sed -i 's|PidFile = .*/hhvm.pid|PidFile = '"${TROOT}"'/hhvm.pid|g' deploy/config.hdf
 sed -i 's|File = .*/error.log|File = '"${TROOT}"'/error.log|g' deploy/config.hdf
-sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|root .*/FrameworkBenchmarks/php-symfony| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 php bin/console cache:clear --env=prod --no-debug --no-warmup

+ 0 - 0
frameworks/PHP/symfony2/src/.htaccess → frameworks/PHP/symfony/src/.htaccess


+ 5 - 57
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Controller/BenchController.php → frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Controller/BenchController.php

@@ -24,7 +24,7 @@ class BenchController extends Controller
     public function dbAction(Request $request)
     {
         $queries = $request->query->getInt('queries', 1);
-        $queries = is_numeric($queries) ? min(max($queries, 1), 500) : 1;
+        $queries = min(max($queries, 1), 500);
 
         // possibility for enhancement is the use of SplFixedArray -> http://php.net/manual/de/class.splfixedarray.php
         $worlds = array();
@@ -45,7 +45,7 @@ class BenchController extends Controller
     public function dbRawAction(Request $request)
     {
         $queries = $request->query->getInt('queries', 1);
-        $queries = is_numeric($queries) ? min(max($queries, 1), 500) : 1;
+        $queries = min(max($queries, 1), 500);
 
         // possibility for enhancement is the use of SplFixedArray -> http://php.net/manual/de/class.splfixedarray.php
         $worlds = array();
@@ -55,7 +55,7 @@ class BenchController extends Controller
             $worlds[] =  $conn->fetchAssoc('SELECT * FROM World WHERE id = ?', array(mt_rand(1, 10000)));
         }
 
-        if ($queries == 1) {
+        if ($queries == 1 && !$request->query->has('queries')) {
             $worlds = $worlds[0];
         }
 
@@ -76,8 +76,7 @@ class BenchController extends Controller
         $world = $repo->find(mt_rand(1, 10000));
         $random_number = mt_rand(1, 10000);
         $world->setRandomNumber($random_number);
-        $em->persist($world);
-        $worlds[] =  $world;
+        $worlds[] = $world;
       }
 
       $em->flush();
@@ -96,7 +95,7 @@ class BenchController extends Controller
           $id = mt_rand(1, 10000);
           $random_number = mt_rand(1, 10000);
           $conn->executeUpdate('UPDATE World SET randomNumber=? WHERE id=?', array($random_number, $id));
-          $worlds[] =  array('id' => $id, 'randomNumber' => $random_number);
+          $worlds[] = array('id' => $id, 'randomNumber' => $random_number);
       }
 
       return new JsonResponse($worlds);
@@ -122,55 +121,4 @@ class BenchController extends Controller
             'fortunes' => $fortunes
         ]);
     }
-
-    public function fortunesPhpAction()
-    {
-        $repo = $this->getDoctrine()
-            ->getRepository('SkamanderBenchmarkBundle:Fortune');
-        $fortunes = $repo->findAll();
-
-        $runtimeFortune = new Fortune();
-        $runtimeFortune->setId(0)
-            ->setMessage('Additional fortune added at request time.');
-
-        $fortunes[] = $runtimeFortune;
-
-        usort($fortunes, function($left, $right) {
-            return strcmp($left->message, $right->message);
-        });
-
-        return $this->render("SkamanderBenchmarkBundle:Bench:fortunes.html.php", [
-            'fortunes' => $fortunes
-        ]);
-    }
-
-    public function fortunesRawAction()
-    {
-        $repo = $this->getDoctrine()
-            ->getRepository('SkamanderBenchmarkBundle:Fortune');
-        $fortunes = $repo->findAll();
-
-        $runtimeFortune = new Fortune();
-        $runtimeFortune->setId(0)
-            ->setMessage('Additional fortune added at request time.');
-
-        $fortunes[] = $runtimeFortune;
-
-        usort($fortunes, function($left, $right) {
-            return strcmp($left->message, $right->message);
-        });
-
-        // This is not the symfony way to work with templates! It's implemented to show users
-        // who don't want to use template engines (like twig), or template sugar (like the slots etc.
-        // from symfony 2), because in their opinion already built-in php constructs like foreach +
-        // if else + include etc. are enough, that the performance impact should be neglectable, and
-        // that the advantages outweigh the disadvantages (performance).
-        $title = 'Fortunes';
-
-        ob_start();
-        include __DIR__ . '/../Resources/views/Bench/raw/content.php';
-        $response = ob_get_clean();
-
-        return new Response($response);
-    }
 }

+ 0 - 0
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Entity/Fortune.php → frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Entity/Fortune.php


+ 0 - 0
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Entity/World.php → frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Entity/World.php


+ 10 - 0
frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.twig

@@ -0,0 +1,10 @@
+{% extends "SkamanderBenchmarkBundle::layout.html.twig" %}
+
+{% block title "Fortunes" %}
+
+{% block content %}
+<table>
+<tr><th>id</th><th>message</th></tr>
+{% for fortune in fortunes %}<tr><td>{{ fortune.id }}</td><td>{{ fortune.message }}</td></tr>{% endfor %}
+</table>
+{% endblock %}

+ 0 - 0
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/layout.html.twig → frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/Resources/views/layout.html.twig


+ 0 - 0
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/SkamanderBenchmarkBundle.php → frameworks/PHP/symfony/src/Skamander/BenchmarkBundle/SkamanderBenchmarkBundle.php


+ 0 - 0
frameworks/PHP/symfony2/var/.gitkeep → frameworks/PHP/symfony/var/.gitkeep


+ 0 - 0
frameworks/PHP/symfony2/web/.htaccess → frameworks/PHP/symfony/web/.htaccess


+ 0 - 1
frameworks/PHP/symfony2/web/app.php → frameworks/PHP/symfony/web/app.php

@@ -12,7 +12,6 @@ $kernel = new AppKernel('prod', false);
 if (PHP_VERSION_ID < 70000) {
     $kernel->loadClassCache();
 }
-//$kernel = new AppCache($kernel);
 
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 //Request::enableHttpMethodParameterOverride();

+ 1 - 0
frameworks/PHP/symfony2/web/app_dev.php → frameworks/PHP/symfony/web/app_dev.php

@@ -26,6 +26,7 @@ $kernel = new AppKernel('dev', true);
 if (PHP_VERSION_ID < 70000) {
     $kernel->loadClassCache();
 }
+
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();

+ 0 - 0
frameworks/PHP/symfony2/web/apple-touch-icon.png → frameworks/PHP/symfony/web/apple-touch-icon.png


+ 0 - 0
frameworks/PHP/symfony2/web/config.php → frameworks/PHP/symfony/web/config.php


+ 0 - 0
frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/images/favicon.ico → frameworks/PHP/symfony/web/favicon.ico


+ 0 - 0
frameworks/PHP/symfony2/web/robots.txt → frameworks/PHP/symfony/web/robots.txt


+ 0 - 11
frameworks/PHP/symfony2/app/Resources/views/base.html.php

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title><?php $view['slots']->output('title') ?></title>
-        <?php $view['slots']->output('stylesheets') ?>
-    </head>
-    <body>
-        <?php $view['slots']->output('body') ?>
-        <?php $view['slots']->output('javascripts') ?>
-    </body>
-</html>

+ 0 - 11
frameworks/PHP/symfony2/app/Resources/views/base.html.twig

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>{% block title %}Welcome!{% endblock %}</title>
-        {% block stylesheets %}{% endblock %}
-    </head>
-    <body>
-        {% block body %}{% endblock %}
-        {% block javascripts %}{% endblock %}
-    </body>
-</html>

+ 0 - 29
frameworks/PHP/symfony2/app/config/config_dev.yml

@@ -10,32 +10,3 @@ framework:
 web_profiler:
     toolbar: true
     intercept_redirects: false
-
-monolog:
-    handlers:
-        main:
-            type: stream
-            path: '%kernel.logs_dir%/%kernel.environment%.log'
-            level: debug
-            channels: ['!event']
-        console:
-            type: console
-            process_psr_3_messages: false
-            channels: ['!event', '!doctrine', '!console']
-        # To follow logs in real time, execute the following command:
-        # `bin/console server:log -vv`
-        #server_log:
-        #    type: server_log
-        #    process_psr_3_messages: false
-        #    host: 127.0.0.1:9911
-        # uncomment to get logging in your browser
-        # you may have to allow bigger header sizes in your Web server configuration
-        #firephp:
-        #    type: firephp
-        #    level: info
-        #chromephp:
-        #    type: chromephp
-        #    level: info
-
-#swiftmailer:
-#    delivery_addresses: ['[email protected]']

+ 0 - 16
frameworks/PHP/symfony2/app/config/config_test.yml

@@ -1,16 +0,0 @@
-imports:
-    - { resource: config_dev.yml }
-
-framework:
-    test: ~
-    session:
-        storage_id: session.storage.mock_file
-    profiler:
-        collect: false
-
-web_profiler:
-    toolbar: false
-    intercept_redirects: false
-
-swiftmailer:
-    disable_delivery: true

+ 0 - 24
frameworks/PHP/symfony2/app/config/security.yml

@@ -1,24 +0,0 @@
-# To get started with security, check out the documentation:
-# https://symfony.com/doc/current/security.html
-security:
-
-    # https://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded
-    providers:
-        in_memory:
-            memory: ~
-
-    firewalls:
-        # disables authentication for assets and the profiler, adapt it according to your needs
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-
-        main:
-            anonymous: ~
-            # activate different ways to authenticate
-
-            # https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
-            #http_basic: ~
-
-            # https://symfony.com/doc/current/security/form_login_setup.html
-            #form_login: ~

+ 0 - 67
frameworks/PHP/symfony2/composer.json

@@ -1,67 +0,0 @@
-{
-    "name": "symfony/framework-standard-edition",
-    "license": "MIT",
-    "type": "project",
-    "description": "The \"Symfony Standard Edition\" distribution",
-    "autoload": {
-        "psr-4": { "": "src/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
-    },
-    "autoload-dev": {
-        "psr-4": { "Tests\\": "tests/" },
-        "files": [ "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
-    },
-    "require": {
-        "php": ">=5.5.9",
-        "doctrine/doctrine-bundle": "^1.6",
-        "doctrine/orm": "^2.5",
-        "incenteev/composer-parameter-handler": "^2.0",
-        "sensio/distribution-bundle": "^5.0.19",
-        "sensio/framework-extra-bundle": "^3.0.2",
-        "symfony/monolog-bundle": "^3.1.0",
-        "symfony/polyfill-apcu": "^1.0",
-        "symfony/swiftmailer-bundle": "^2.3.10",
-        "symfony/symfony": "3.3.*",
-        "twig/twig": "^1.0||^2.0"
-    },
-    "require-dev": {
-        "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.0"
-    },
-    "scripts": {
-        "symfony-scripts": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
-        ],
-        "post-install-cmd": [
-            "@symfony-scripts"
-        ],
-        "post-update-cmd": [
-            "@symfony-scripts"
-        ]
-    },
-    "config": {
-        "platform": {
-            "php": "5.5.9"
-        },
-        "sort-packages": true
-    },
-    "extra": {
-        "symfony-app-dir": "app",
-        "symfony-bin-dir": "bin",
-        "symfony-var-dir": "var",
-        "symfony-web-dir": "web",
-        "symfony-tests-dir": "tests",
-        "symfony-assets-install": "relative",
-        "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
-        },
-        "branch-alias": {
-            "dev-master": "3.3-dev"
-        }
-    }
-}

+ 0 - 18
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.php

@@ -1,18 +0,0 @@
-<?php $view->extend('SkamanderBenchmarkBundle::layout.html.php') ?>
-
-<?php $view['slots']->set('title', 'Fortunes') ?>
-
-<?php $view['slots']->start('content') ?>
-<table>
-    <tr>
-        <th>id</th>
-        <th>message</th>
-    </tr>
-    <?php foreach($fortunes as $fortune): ?>
-        <tr>
-            <td><?php echo $view->escape($fortune->id); ?></td>
-            <td><?php echo $view->escape($fortune->message); ?></td>
-        </tr>
-    <?php endforeach; ?>
-</table>
-<?php $view['slots']->stop() ?>

+ 0 - 20
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/fortunes.html.twig

@@ -1,20 +0,0 @@
-{% extends "SkamanderBenchmarkBundle::layout.html.twig" %}
-
-{% block title "Fortunes" %}
-
-{% block content %}
-    <table>
-        <tr>
-            <th>id</th>
-            <th>message</th>
-        </tr>
-
-        {% for fortune in fortunes %}
-            <tr>
-                <td>{{ fortune.id }}</td>
-                <td>{{ fortune.message }}</td>
-            </tr>
-        {% endfor %}
-
-    </table>
-{% endblock %}

+ 0 - 5
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/content.php

@@ -1,5 +0,0 @@
-<?php include 'template_header.php'; ?>
-
-    <?php include 'fortunes.php'; ?>
-
-<?php include 'template_footer.php'; ?>

+ 0 - 14
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/fortunes.php

@@ -1,14 +0,0 @@
-<table>
-    <tr>
-        <th>id</th>
-        <th>message</th>
-    </tr>
-
-    <?php foreach($fortunes as $fortune): ?>
-        <tr>
-            <td><?php echo $fortune->id; ?></td>
-            <td><?php echo htmlspecialchars($fortune->message, ENT_QUOTES, "UTF-8", false); ?></td>
-        </tr>
-    <?php endforeach; ?>
-
-</table>

+ 0 - 2
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/template_footer.php

@@ -1,2 +0,0 @@
-</body>
-</html>

+ 0 - 6
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/Bench/raw/template_header.php

@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title><?php echo $title ?></title>
-</head>
-<body>

+ 0 - 7
frameworks/PHP/symfony2/src/Skamander/BenchmarkBundle/Resources/views/layout.html.php

@@ -1,7 +0,0 @@
-<?php $view->extend('::base.html.php') ?>
-
-<?php $view['slots']->set('title', 'Fortunes') ?>
-
-<?php $view['slots']->start('body') ?>
-        <?php $view['slots']->output('content') ?>
-<?php $view['slots']->stop() ?>

+ 0 - 101
frameworks/PHP/symfony2/web/bundles/acmedemo/css/demo.css

@@ -1,101 +0,0 @@
-body {
-    font-size: 14px;
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-h1.title {
-    font-size: 45px;
-    padding-bottom: 30px;
-}
-.sf-reset h2 {
-    font-weight:   bold;
-    color:         #FFFFFF;
-    /* Font is duplicated of body (sans-serif) */
-    font-family:      "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-
-    margin-bottom:    10px;
-    background-color: #aacd4e;
-    padding:          2px 4px;
-    display:          inline-block;
-    text-transform:   uppercase;
-
-}
-p {
-    line-height:    20px;
-    padding-bottom: 20px;
-}
-ul#demo-list a {
-    background: url(../images/blue-arrow.png) no-repeat right 6px;
-    padding-right: 10px;
-    margin-right:  30px;
-}
-#symfony-header {
-    position: relative;
-    padding: 30px 30px 20px 30px;
-}
-.sf-reset .symfony-blocks-welcome {
-    overflow: hidden;
-}
-.sf-reset .symfony-blocks-welcome > div {
-    background-color: whitesmoke;
-    float:            left;
-    width:            240px;
-    margin-right:     14px;
-    text-align:       center;
-    padding:          26px 20px;
-}
-.sf-reset .symfony-blocks-welcome > div.block-demo {
-    margin-right: 0;
-}
-.sf-reset .symfony-blocks-welcome .illustration {
-    padding-bottom: 20px;
-}
-.sf-reset .symfony-blocks-help {
-    overflow: hidden;
-}
-.sf-reset .symfony-blocks-help {
-    margin-top: 30px;
-    padding:    18px;
-    border:     1px solid #E6E6E6;
-}
-.sf-reset .symfony-blocks-help > div {
-    width:        254px;
-    float:        left;
-}
-.flash-message {
-    padding: 10px;
-    margin: 5px;
-    margin-top: 15px;
-    background-color: #ffe;
-}
-.sf-reset .error {
-    color: red;
-}
-#login label, #contact_form label {
-    display: block;
-    float: left;
-    width: 90px;
-}
-.sf-reset ul#menu {
-    float: right;
-    margin-bottom: 20px;
-    padding-left: 0;
-}
-.sf-reset #menu li {
-    padding-left: 0;
-    margin-right: 10px;
-    display: inline;
-}
-.sf-reset a,
-.sf-reset li a {
-    color: #08C;
-    text-decoration: none;
-}
-.sf-reset a:hover,
-.sf-reset li a:hover {
-    color: #08C;
-    text-decoration: underline;
-}
-.sf-reset .symfony-content pre {
-    white-space: pre;
-    font-family: monospace;
-}

BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/blue-arrow.png


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/field-background.gif


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/logo.gif


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/search.png


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-configure.gif


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-demo.gif


BIN
frameworks/PHP/symfony2/web/bundles/acmedemo/images/welcome-quick-tour.gif


+ 0 - 150
frameworks/PHP/symfony2/web/bundles/framework/css/body.css

@@ -1,150 +0,0 @@
-/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 3.1.2
-build: 56
-*/
-.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;}
-.sf-reset html,
-.sf-reset body {
-    width: 100%;
-    min-height: 100%;
-    _height: 100%;
-    margin: 0;
-    padding: 0;
-}
-.sf-reset body {
-    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    text-align: left;
-    background-color: #efefef;
-}
-.sf-reset abbr {
-    border-bottom: 1px dotted #000;
-    cursor: help;
-}
-.sf-reset p {
-    font-size: 14px;
-    line-height: 20px;
-    padding-bottom: 20px;
-}
-.sf-reset strong {
-    color: #313131;
-    font-weight: bold;
-}
-.sf-reset a {
-    color: #6c6159;
-}
-.sf-reset a img {
-    border: none;
-}
-.sf-reset a:hover {
-    text-decoration: underline;
-}
-.sf-reset em {
-    font-style: italic;
-}
-.sf-reset h2,
-.sf-reset h3 {
-    font-weight: bold;
-}
-.sf-reset h1 {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: 20px;
-    color: #313131;
-    word-break: break-all;
-}
-.sf-reset li {
-    padding-bottom: 10px;
-}
-.sf-reset .block {
-    -moz-border-radius: 16px;
-    -webkit-border-radius: 16px;
-    border-radius: 16px;
-    margin-bottom: 20px;
-    background-color: #FFFFFF;
-    border: 1px solid #dfdfdf;
-    padding: 40px 50px;
-}
-.sf-reset h2 {
-    font-size: 16px;
-    font-family: Arial, Helvetica, sans-serif;
-}
-.sf-reset li a {
-    background: none;
-    color: #868686;
-    text-decoration: none;
-}
-.sf-reset li a:hover {
-    background: none;
-    color: #313131;
-    text-decoration: underline;
-}
-.sf-reset ol {
-    padding: 10px 0;
-}
-.sf-reset ol li {
-    list-style: decimal;
-    margin-left: 20px;
-    padding: 2px;
-    padding-bottom: 20px;
-}
-.sf-reset ol ol li {
-    list-style-position: inside;
-    margin-left: 0;
-    white-space: nowrap;
-    font-size: 12px;
-    padding-bottom: 0;
-}
-.sf-reset li .selected {
-    background-color: #ffd;
-}
-.sf-button {
-    display: -moz-inline-box;
-    display: inline-block;
-    text-align: center;
-    vertical-align: middle;
-    border: 0;
-    background: transparent none;
-    text-transform: uppercase;
-    cursor: pointer;
-    font: bold 11px Arial, Helvetica, sans-serif;
-}
-.sf-button span {
-    text-decoration: none;
-    display: block;
-    height: 28px;
-    float: left;
-}
-.sf-button .border-l {
-    text-decoration: none;
-    display: block;
-    height: 28px;
-    float: left;
-    padding: 0 0 0 7px;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQtJREFUeNpiPHnyJAMakARiByDWYEGT8ADiYGVlZStubm5xlv///4MEQYoKZGRkQkRERLRYWVl5wYJQyXBZWdkwCQkJUxAHKgaWlAHSLqKiosb//v1DsYMFKGCvoqJiDmQzwXTAJYECulxcXNLoumCSoszMzDzoumDGghQwYZUECWIzkrAkSIIGOmlkLI10AiX//P379x8jIyMTNmPf/v79+ysLCwsvuiQoNi5//fr1Kch4dAyS3P/gwYMTQBP+wxwHw0xA4gkQ73v9+vUZdJ2w1Lf82bNn4iCHCQoKasHsZw4ODgbRIL8c+/Lly5M3b978Y2dn5wC6npkFLXnsAOKLjx49AmUHLYAAAwBoQubG016R5wAAAABJRU5ErkJggg==) no-repeat top left;
-}
-.sf-button .border-r {
-    padding: 0 7px 0 0;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
-}
-.sf-button .btn-bg {
-    padding: 0px 14px;
-    color: #636363;
-    line-height: 28px;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;
-}
-.sf-button:hover .border-l,
-.sf-button-selected .border-l {
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR9JREFUeNpi/P//PwMyOHfunDqQSgNiexZkibNnzxYBqZa3HOs5v7PcYQBLnjlzhg1IbfzIdsTjA/t+ht9Mr8GKwZL//v3r+sB+0OMN+zqIEf8gFMvJkyd1gXTOa9YNDP//otrPAtSV/Jp9HfPff78Z0AEL0LUeXxivMfxD0wXTqfjj/2ugkf+wSrL9/YtpJEyS4S8WI5Ek/+GR/POPFjr//cenE6/kP9q4Fo/kr39/mdj+M/zFkGQCSj5i+ccPjLJ/GBgkuYOHQR1sNDpmAkb2LBmWwL///zKCIxwZM0VHR18G6p4uxeLLAA4tJMwEshiou1iMxXaHLGswA+t/YbhORuQUv2DBAnCifvxzI+enP3dQJUFg/vz5sOzgBBBgAPxX9j0YnH4JAAAAAElFTkSuQmCC) no-repeat top left;
-}
-.sf-button:hover .border-r,
-.sf-button-selected .border-r {
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAT5JREFUeNpiPHv27BkGBoaDQDzLyMjoJgMSYHrM3WX8hn1d0f///88DFRYhSzIuv2X5H8Rg/SfKIPDTkYH/l80OINffxMTkF9O/f/8ZQPgnwyuGl+wrGd6x7vf49+9fO9jYf3+Bkkj4NesmBqAV+SdPntQC6vzHgIz//gOawbqOGchOxtAJwp8Zr4F0e7D8/fuPAR38/P8eZIo0yz8skv8YvoIk+YE6/zNgAyD7sRqLkPzzjxY6/+HS+R+fTkZ8djLh08lCUCcuSWawJGbwMTGwg7zyBatX2Bj5QZKPsBrLzaICktzN8g/NWEYGZgYZjoC/wMiei5FMpFh8QPSU6Ojoy3Cd7EwiDBJsDgxiLNY7gLrKQGIsHAxSDHxAO2TZ/b8D+TVxcXF9MCtYtLiKLgDpfUDVsxITE1GyA0CAAQA2E/N8VuHyAAAAAABJRU5ErkJggg==) right top no-repeat;
-}
-.sf-button:hover .btn-bg,
-.sf-button-selected .btn-bg {
-    color: #FFFFFF;
-    text-shadow:0 1px 1px #6b9311;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAIAAAAvP0KbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEFJREFUeNpiPnv2LNMdvlymf///M/37B8R/QfQ/MP33L4j+B6Qh7L9//sHpf2h8MA1V+w/KRjYLaDaLCU8vQIABAFO3TxZriO4yAAAAAElFTkSuQmCC) repeat-x top left;
-}

+ 0 - 108
frameworks/PHP/symfony2/web/bundles/framework/css/exception.css

@@ -1,108 +0,0 @@
-.sf-reset .traces {
-    padding-bottom: 14px;
-}
-.sf-reset .traces li {
-    font-size: 12px;
-    color: #868686;
-    padding: 5px 4px;
-    list-style-type: decimal;
-    margin-left: 20px;
-    white-space: break-word;
-}
-.sf-reset #logs .traces li.error {
-    font-style: normal;
-    color: #AA3333;
-    background: #f9ecec;
-}
-.sf-reset #logs .traces li.warning {
-    font-style: normal;
-    background: #ffcc00;
-}
-/* fix for Opera not liking empty <li> */
-.sf-reset .traces li:after {
-    content: "\00A0";
-}
-.sf-reset .trace {
-    border: 1px solid #D3D3D3;
-    padding: 10px;
-    overflow: auto;
-    margin: 10px 0 20px;
-}
-.sf-reset .block-exception {
-    -moz-border-radius: 16px;
-    -webkit-border-radius: 16px;
-    border-radius: 16px;
-    margin-bottom: 20px;
-    background-color: #f6f6f6;
-    border: 1px solid #dfdfdf;
-    padding: 30px 28px;
-    word-wrap: break-word;
-    overflow: hidden;
-}
-.sf-reset .block-exception div {
-    color: #313131;
-    font-size: 10px;
-}
-.sf-reset .block-exception-detected .illustration-exception,
-.sf-reset .block-exception-detected .text-exception {
-    float: left;
-}
-.sf-reset .block-exception-detected .illustration-exception {
-    width: 152px;
-}
-.sf-reset .block-exception-detected .text-exception {
-    width: 670px;
-    padding: 30px 44px 24px 46px;
-    position: relative;
-}
-.sf-reset .text-exception .open-quote,
-.sf-reset .text-exception .close-quote {
-    position: absolute;
-}
-.sf-reset .open-quote {
-    top: 0;
-    left: 0;
-}
-.sf-reset .close-quote {
-    bottom: 0;
-    right: 50px;
-}
-.sf-reset .block-exception p {
-    font-family: Arial, Helvetica, sans-serif;
-}
-.sf-reset .block-exception p a,
-.sf-reset .block-exception p a:hover {
-    color: #565656;
-}
-.sf-reset .logs h2 {
-    float: left;
-    width: 654px;
-}
-.sf-reset .error-count {
-    float: right;
-    width: 170px;
-    text-align: right;
-}
-.sf-reset .error-count span {
-    display: inline-block;
-    background-color: #aacd4e;
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    border-radius: 6px;
-    padding: 4px;
-    color: white;
-    margin-right: 2px;
-    font-size: 11px;
-    font-weight: bold;
-}
-.sf-reset .toggle {
-    vertical-align: middle;
-}
-.sf-reset .linked ul,
-.sf-reset .linked li {
-    display: inline;
-}
-.sf-reset #output-content {
-    color: #000;
-    font-size: 12px;
-}

+ 0 - 72
frameworks/PHP/symfony2/web/bundles/framework/css/structure.css

@@ -1,72 +0,0 @@
-html {
-    background: #eee;
-}
-body {
-    font: 11px Verdana, Arial, sans-serif;
-    color: #333;
-}
-.sf-reset, .sf-reset .block, .sf-reset #message {
-    margin: auto;
-}
-img {
-    border: 0;
-}
-.clear {
-    clear: both;
-    height: 0;
-    font-size: 0;
-    line-height: 0;
-}
-.clear-fix:after {
-    content: "\0020";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clear-fix {
-    display: inline-block;
-}
-* html .clear-fix {
-    height: 1%;
-}
-.clear-fix {
-    display: block;
-}
-.header {
-    padding: 30px 30px 20px 30px;
-}
-.header-logo {
-    float: left;
-}
-.search {
-    float: right;
-    padding-top: 20px;
-}
-.search label {
-    line-height: 28px;
-    vertical-align: middle;
-}
-.search input {
-    width: 195px;
-    font-size: 12px;
-    border: 1px solid #dadada;
-    background: #fff url(data:image/gif;base64,R0lGODlhAQAFAKIAAPX19e/v7/39/fr6+urq6gAAAAAAAAAAACH5BAAAAAAALAAAAAABAAUAAAMESAEjCQA7) repeat-x left top;
-    padding: 5px 6px;
-    color: #565656;
-}
-.search input[type="search"] {
-    -webkit-appearance: textfield;
-}
-#content {
-    width: 970px;
-    margin: 0 auto;
-}
-pre {
-    white-space: normal;
-    font-family: Arial, Helvetica, sans-serif;
-}
-pre.xdebug-var-dump{
-    white-space: pre;
-    font-family: monospace;
-}

BIN
frameworks/PHP/symfony2/web/bundles/framework/images/blue_picto_less.gif


BIN
frameworks/PHP/symfony2/web/bundles/framework/images/blue_picto_more.gif


BIN
frameworks/PHP/symfony2/web/bundles/framework/images/grey_magnifier.png


BIN
frameworks/PHP/symfony2/web/bundles/framework/images/logo_symfony.png


+ 0 - 73
frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/css/configurator.css

@@ -1,73 +0,0 @@
-@import url("install.css");
-
-.step h1 {
-    margin-top: 10px;
-    margin-bottom: 30px;
-    font-size: 26px;
-}
-.step p {
-    line-height: 20px;
-    padding-bottom: 20px;
-}
-.step .symfony-block-steps span {
-    display: inline-block;
-    padding: 2px 3px;
-    font-size: 11px;
-    line-height: 15px;
-    color: #868686;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-.step .symfony-block-steps span.selected {
-    background-color: #aacd4e;
-    color: #FFFFFF;
-}
-.step .symfony-form-row {
-    padding-bottom: 40px;
-}
-.step .symfony-form-column {
-    width: 430px;
-    float: left;
-}
-.step .symfony-form-footer {
-    padding-top: 20px;
-    clear: both;
-}
-.step .symfony-form-field {
-    height: 20px;
-}
-.step .symfony-form-row label {
-    display: block;
-    padding-bottom: 8px;
-}
-.step .symfony-form-field input[type=text],
-.step .symfony-form-field input[type=password],
-.step .symfony-form-field textarea,
-.step .symfony-form-field select {
-    font-size: 13px;
-    color: #565656;
-    width: 200px;
-}
-.step .symfony-form-field input[type=text],
-.step .symfony-form-field input[type=password],
-.step .symfony-form-field textarea {
-    border: 1px solid #dadada;
-    background: #FFFFFF url(../../../framework/images/input_bg.gif) repeat-x left top;
-    width: 194px;
-    padding: 5px 6px;
-}
-.step .symfony-form-errors ul {
-    padding: 0;
-}
-.step .symfony-form-errors li {
-    background: url(../images/notification.gif) no-repeat left 6px;
-    font-size: 11px;
-    line-height: 16px;
-    color: #759e1a;
-    padding: 10px 25px;
-}
-.step .symfony-configuration {
-    margin: 10px 0;
-    width: 100%;
-    height: 240px;
-}

+ 0 - 74
frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/css/install.css

@@ -1,74 +0,0 @@
-body {
-    font-size: 14px;
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-.sf-reset h1.title {
-    font-size: 45px;
-    padding-bottom: 30px;
-}
-.sf-reset h2 {
-    font-weight: bold;
-    color: #FFFFFF;
-    /* Font is reset to sans-serif (like body) */
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    margin-bottom: 10px;
-    background-color: #aacd4e;
-    padding: 2px 4px;
-    display: inline-block;
-    text-transform: uppercase;
-}
-.sf-reset ul a,
-.sf-reset ul a:hover {
-    background: url(../images/blue-arrow.png) no-repeat right 6px;
-    padding-right: 10px;
-}
-.sf-reset ul, ol {
-    padding-left: 20px;
-}
-.sf-reset li {
-    padding-bottom: 18px;
-}
-.sf-reset ol li {
-    list-style-type: decimal;
-}
-.sf-reset ul li {
-    list-style-type: none;
-}
-.sf-reset .symfony-blocks-install {
-    overflow: hidden;
-}
-.sf-reset .symfony-install-continue {
-    font-size: 0.95em;
-    padding-left: 0;
-}
-.sf-reset .symfony-install-continue li {
-    padding-bottom: 10px;
-}
-.sf-reset .ok {
-    color: #fff;
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    background-color: #6d6;
-    padding: 10px;
-    margin-bottom: 20px;
-}
-.sf-reset .ko {
-    background-color: #d66;
-}
-.version {
-    text-align: right;
-    font-size: 10px;
-    margin-right: 20px;
-}
-.sf-reset a,
-.sf-reset li a {
-    color: #08C;
-    text-decoration: none;
-}
-.sf-reset a:hover,
-.sf-reset li a:hover {
-    color: #08C;
-    text-decoration: underline;
-}
-.sf-reset textarea {
-    padding: 7px;
-}

BIN
frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/images/blue-arrow.png


BIN
frameworks/PHP/symfony2/web/bundles/sensiodistribution/webconfigurator/images/notification.gif


BIN
frameworks/PHP/symfony2/web/favicon.ico


Some files were not shown because too many files changed in this diff