Requiring libs/output_data based on env var

motin · motin · commit 51c2493b0b45 · 2015-12-10T11:29:02.000+02:00
diff --git a/README.md b/README.md
@@ -147,6 +147,7 @@ If you want to see current configuration, run `sudo sysctl -a`.
 ~~~
 <VirtualHost *:80>
   DocumentRoot /home/vagrant/public
+  SetEnv php_framework_benchmark_path /home/vagrant/public/php-framework-benchmark
 </VirtualHost>
 ~~~
 
diff --git a/aura-2.0/web/index.php b/aura-2.0/web/index.php
@@ -16,4 +16,4 @@
 );
 $kernel();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/bear-0.10/bootstrap/contexts/prod.php b/bear-0.10/bootstrap/contexts/prod.php
@@ -65,7 +65,7 @@
 //
 OK: {
     $app->response->setResource($app->page)->render()->send();
-    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+    require getenv('php_framework_benchmark_path').'/libs/output_data.php';
     exit(0);
 }
 
diff --git a/bear-1.0/bootstrap/bootstrap.php b/bear-1.0/bootstrap/bootstrap.php
@@ -31,7 +31,7 @@
 
     // representation transfer
     $page()->transfer($app->responder, $_SERVER);
-    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+    require getenv('php_framework_benchmark_path').'/libs/output_data.php';
     exit(0);
 } catch (\Exception $e) {
     $app->error->handle($e, $request)->transfer();
diff --git a/cake-3.0/webroot/index.php b/cake-3.0/webroot/index.php
@@ -36,4 +36,4 @@
     new Response()
 );
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/cake-3.1/webroot/index.php b/cake-3.1/webroot/index.php
@@ -36,4 +36,4 @@
     new Response()
 );
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/ci-3.0/index.php b/ci-3.0/index.php
@@ -291,4 +291,4 @@
  */
 require_once BASEPATH.'core/CodeIgniter.php';
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/cygnite-1.3/index.php b/cygnite-1.3/index.php
@@ -59,4 +59,4 @@
 */
 require_once CF_BOOTSTRAP.DS.'start'.EXT;
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -20,6 +20,7 @@ php_5_6_4:
     - "9000"
   environment:
     stack: 'docker_nginx_php_5_6_4'
+    php_framework_benchmark_path: /public
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm.sh"
 
@@ -33,6 +34,7 @@ hhvm_3_10_1:
     - "9000"
   environment:
     stack: 'docker_nginx_hhvm_3_10_1'
+    php_framework_benchmark_path: /public
   working_dir: '/repo'
   command: "/stack/php/run-hhvm.sh"
 
@@ -46,6 +48,7 @@ php_7_0_0:
     - "9000"
   environment:
     stack: 'docker_nginx_php_7_0_0'
+    php_framework_benchmark_path: /public
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm-7.sh"
 
diff --git a/fatfree-3.5/index.php b/fatfree-3.5/index.php
@@ -9,4 +9,4 @@
 
 $f3->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/fuel-1.8-dev/public/index.php b/fuel-1.8-dev/public/index.php
@@ -101,4 +101,4 @@ class_alias('Fuel\\Core\\Autoloader', 'Autoloader');
 
 $response->send(true);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/fuel-2.0-dev/public/index.php b/fuel-2.0-dev/public/index.php
@@ -159,4 +159,4 @@
 	echo $response;
 }
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/ice-1.0/public/index.php b/ice-1.0/public/index.php
@@ -13,4 +13,4 @@
     echo $e->getMessage();
 }
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/laravel-4.2/public/index.php b/laravel-4.2/public/index.php
@@ -48,4 +48,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/laravel-5.0/public/index.php b/laravel-5.0/public/index.php
@@ -56,4 +56,4 @@
 
 $kernel->terminate($request, $response);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/laravel-5.1/public/index.php b/laravel-5.1/public/index.php
@@ -57,4 +57,4 @@
 
 $kernel->terminate($request, $response);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/lumen-5.0/public/index.php b/lumen-5.0/public/index.php
@@ -27,4 +27,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/lumen-5.1/public/index.php b/lumen-5.1/public/index.php
@@ -27,4 +27,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/no-framework/index.php b/no-framework/index.php
@@ -2,4 +2,4 @@
 
 echo 'Hello World!';
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/nofuss-1.2/html/index.php b/nofuss-1.2/html/index.php
@@ -37,6 +37,6 @@
 $bootstrap->go();
 
 // The if statement is needed for setup.sh
-if ($_SERVER['DOCUMENT_ROOT'] !== '') {
-    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+if (getenv('php_framework_benchmark_path') !== '') {
+    require getenv('php_framework_benchmark_path').'/libs/output_data.php';
 }
diff --git a/output/docker_nginx_php_5_6_4/results.hello_world.log b/output/docker_nginx_php_5_6_4/results.hello_world.log
@@ -1,22 +1,2 @@
-no-framework: 1606.08:   234608: 0.000233: 1
-phalcon-2.0: 835.00:   283120: 0.002651: 5
-ice-1.0: 749.81:   275680: 0.001453: 4
-tipsy-0.10: 988.07:   336808: 0.000606: 18
-fatfree-3.5: 520.58:   444136: 0.002025: 9
-slim-2.6: 795.92:   499872: 0.000879: 24
-ci-3.0: 101.58:   451376: 0.037094: 26
-nofuss-1.2: 344.94:   619640: 0.002954: 6
-slim-3.0: 498.56:   648136: 0.002141: 56
-bear-1.0: 215.44:   791688: 0.410931: 98
-lumen-5.1: 318.22:   750968: 0.006660: 32
-ze-1.0: 241.72:   823056: 0.009136: 64
-radar-1.0-dev: 259.75:   738792: 0.006119: 73
-yii-2.0: 313.75:  1399576: 0.006194: 49
-silex-1.3: 357.62:   734208: 0.001185: 58
-cygnite-1.3: 121.78:   779944: 0.018045: 70
-fuel-1.8-dev: 56.56:   730200: 0.065322: 55
-phpixie-3.2: 83.94:  1329712: 0.011355: 164
-aura-2.0: 127.48:   933160: 0.030256: 68
-cake-3.1: 152.83:  1383960: 0.010397: 84
-symfony-2.7: 70.54:  2735504: 0.017342: 103
-zf-2.5: 43.50:  3070136: 0.029376: 209
+no-framework: 1857.66: <b>Fatal error</b>:   require():  Failed opening required '/libs/output_data.php' (include_path='.
+phalcon-2.0: 804.48: <b>Fatal error</b>:   require():  Failed opening required '/libs/output_data.php' (include_path='.
diff --git a/phalcon-1.3/public/index.php b/phalcon-1.3/public/index.php
@@ -30,4 +30,4 @@
     echo $e->getMessage();
 }
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/phalcon-2.0/public/index.php b/phalcon-2.0/public/index.php
@@ -30,4 +30,4 @@
     echo $e->getMessage();
 }
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/phpixie-3.2/web/index.php b/phpixie-3.2/web/index.php
@@ -6,4 +6,4 @@
 $framework->registerDebugHandlers();
 $framework->processHttpSapiRequest();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/radar-1.0-dev/web/index.php b/radar-1.0-dev/web/index.php
@@ -46,4 +46,4 @@
  */
 $adr->run(ServerRequestFactory::fromGlobals(), new Response());
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/silex-1.2/web/index.php b/silex-1.2/web/index.php
@@ -8,4 +8,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/silex-1.3/web/index.php b/silex-1.3/web/index.php
@@ -8,4 +8,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/slim-2.6/index.php b/slim-2.6/index.php
@@ -10,4 +10,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/slim-3.0/index.php b/slim-3.0/index.php
@@ -10,4 +10,4 @@
 
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/symfony-2.5/web/app.php b/symfony-2.5/web/app.php
@@ -28,4 +28,4 @@
 $response->send();
 $kernel->terminate($request, $response);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/symfony-2.6/web/app.php b/symfony-2.6/web/app.php
@@ -29,4 +29,4 @@
 $response->send();
 $kernel->terminate($request, $response);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/symfony-2.7/web/app.php b/symfony-2.7/web/app.php
@@ -29,4 +29,4 @@
 $response->send();
 $kernel->terminate($request, $response);
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/tipsy-0.10/web/index.php b/tipsy-0.10/web/index.php
@@ -15,4 +15,4 @@
 
 $t->start();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/yii-2.0/web/index.php b/yii-2.0/web/index.php
@@ -11,4 +11,4 @@
 
 (new yii\web\Application($config))->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/ze-1.0/public/index.php b/ze-1.0/public/index.php
@@ -17,4 +17,4 @@
 $app = $container->get('Zend\Expressive\Application');
 $app->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/zf-2.4/public/index.php b/zf-2.4/public/index.php
@@ -16,4 +16,4 @@
 // Run the application!
 Zend\Mvc\Application::init(require 'config/application.config.php')->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';
diff --git a/zf-2.5/public/index.php b/zf-2.5/public/index.php
@@ -24,4 +24,4 @@
 // Run the application!
 Zend\Mvc\Application::init(require 'config/application.config.php')->run();
 
-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
+require getenv('php_framework_benchmark_path').'/libs/output_data.php';

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`//`
`66`	`66`	`OK: {`
`67`	`67`	`$app->response->setResource($app->page)->render()->send();`
`68`		`- require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';`
	`68`	`+ require getenv('php_framework_benchmark_path').'/libs/output_data.php';`
`69`	`69`	`exit(0);`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@`
`9`	`9`
`10`	`10`	`$f3->run();`
`11`	`11`
`12`		`-require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';`
	`12`	`+require getenv('php_framework_benchmark_path').'/libs/output_data.php';`