Reversed output_data require-refactoring

motin · motin · commit 8316f277f002 · 2015-12-10T10:28:23.000+02:00
diff --git a/aura-2.0/web/index.php b/aura-2.0/web/index.php
@@ -16,4 +16,4 @@
 );
 $kernel();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
-    echo require dirname(__FILE__).'/../../libs/output_data.php';
+    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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);
-    echo require dirname(__FILE__).'/../../libs/output_data.php';
+    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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()
 );
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/cake-3.1/src/Controller/HelloController.php b/cake-3.1/src/Controller/HelloController.php
@@ -8,7 +8,7 @@ class HelloController extends AppController
 
     public function index()
     {
-        $this->response->body('Hello World!' . require dirname(__FILE__).'/../../../libs/output_data.php');
+        $this->response->body('Hello World!');
         return $this->response;
     }
 }
diff --git a/cake-3.1/webroot/index.php b/cake-3.1/webroot/index.php
@@ -35,3 +35,5 @@
     Request::createFromGlobals(),
     new Response()
 );
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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';
 
-echo require dirname(__FILE__).'/../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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;
 
-echo require dirname(__FILE__).'/../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/fatfree-3.5/index.php b/fatfree-3.5/index.php
@@ -9,4 +9,4 @@
 
 $f3->run();
 
-echo require dirname(__FILE__).'/../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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);
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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;
 }
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 }
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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);
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/laravel-5.1/app/Http/Controllers/HelloController.php b/laravel-5.1/app/Http/Controllers/HelloController.php
@@ -6,6 +6,6 @@ class HelloController extends Controller
 {
     public function index()
     {
-        return 'Hello World!' . require dirname(__FILE__).'/../../../../libs/output_data.php';
+        return 'Hello World!';
     }
 }
diff --git a/laravel-5.1/public/index.php b/laravel-5.1/public/index.php
@@ -56,3 +56,5 @@
 $response->send();
 
 $kernel->terminate($request, $response);
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/lumen-5.1/app/Http/Controllers/HelloController.php b/lumen-5.1/app/Http/Controllers/HelloController.php
@@ -6,6 +6,6 @@ class HelloController extends Controller
 {
     public function index()
     {
-        return 'Hello World!' . require dirname(__FILE__).'/../../../../libs/output_data.php';
+        return 'Hello World!';
     }
 }
diff --git a/lumen-5.1/public/index.php b/lumen-5.1/public/index.php
@@ -26,3 +26,5 @@
 */
 
 $app->run();
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/no-framework/index.php b/no-framework/index.php
@@ -2,4 +2,4 @@
 
 echo 'Hello World!';
 
-echo require dirname(__FILE__).'/../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/nofuss-1.2/html/index.php b/nofuss-1.2/html/index.php
@@ -38,5 +38,5 @@
 
 // The if statement is needed for setup.sh
 if ($_SERVER['DOCUMENT_ROOT'] !== '') {
-    echo require dirname(__FILE__).'/../../libs/output_data.php';
+    require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
 }
diff --git a/phalcon-1.3/public/index.php b/phalcon-1.3/public/index.php
@@ -30,4 +30,4 @@
     echo $e->getMessage();
 }
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 }
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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());
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/silex-1.3/src/App/Controller/Hello.php b/silex-1.3/src/App/Controller/Hello.php
@@ -6,6 +6,6 @@ class Hello
 {
     public function index()
     {
-        return 'Hello World!' . require dirname(__FILE__).'/../../../../libs/output_data.php';
+        return 'Hello World!';
     }
 }
diff --git a/silex-1.3/web/index.php b/silex-1.3/web/index.php
@@ -7,3 +7,5 @@
 $app->get('/hello/index', 'App\\Controller\\Hello::index');
 
 $app->run();
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/slim-2.6/index.php b/slim-2.6/index.php
@@ -10,4 +10,4 @@
 
 $app->run();
 
-echo require dirname(__FILE__).'/../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/slim-3.0/index.php b/slim-3.0/index.php
@@ -5,10 +5,9 @@
 $app = new \Slim\App();
 
 $app->get('/hello/index', function ($request, $response, $args) {
-    $response = $response->write('Hello World! sdfsdf');
-    $output_data = require dirname(__FILE__).'/../libs/output_data.php';
-    $response .= $response->write($output_data);
-    return $response;
+    return $response->write('Hello World!');
 });
 
 $app->run();
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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);
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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);
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/symfony-2.7/src/AppBundle/Controller/HelloController.php b/symfony-2.7/src/AppBundle/Controller/HelloController.php
@@ -13,6 +13,6 @@ class HelloController extends Controller
      */
     public function indexAction()
     {
-        return new Response('Hello World!' . require dirname(__FILE__).'/../../../../libs/output_data.php');
+        return new Response('Hello World!');
     }
 }
diff --git a/symfony-2.7/web/app.php b/symfony-2.7/web/app.php
@@ -28,3 +28,5 @@
 $response = $kernel->handle($request);
 $response->send();
 $kernel->terminate($request, $response);
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/typo3f-3.0/Packages/Application/My.Hello/Classes/My/Hello/Controller/StandardController.php b/typo3f-3.0/Packages/Application/My.Hello/Classes/My/Hello/Controller/StandardController.php
@@ -12,6 +12,6 @@ class StandardController extends ActionController
 {
 	public function indexAction()
 	{
-		return 'Hello World!' . "\n" . require BENCHMARK_ROOT_PATH . '/libs/output_data.php';
+		return 'Hello World!';
 	}
 }
diff --git a/typo3f-3.0/Web/index.php b/typo3f-3.0/Web/index.php
@@ -24,8 +24,6 @@
 
 require($rootPath . 'Packages/Framework/TYPO3.Flow/Classes/TYPO3/Flow/Core/Bootstrap.php');
 
-define('BENCHMARK_ROOT_PATH', dirname($rootPath) . '/../..');
 $context = \TYPO3\Flow\Core\Bootstrap::getEnvironmentConfigurationSetting('FLOW_CONTEXT') ?: 'Development';
 $bootstrap = new \TYPO3\Flow\Core\Bootstrap($context);
-
 $bootstrap->run();
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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/ze-1.0/public/index.php b/ze-1.0/public/index.php
@@ -16,3 +16,5 @@
 /** @var \Zend\Expressive\Application $app */
 $app = $container->get('Zend\Expressive\Application');
 $app->run();
+
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';
diff --git a/ze-1.0/src/Action/HelloAction.php b/ze-1.0/src/Action/HelloAction.php
@@ -12,7 +12,7 @@ public function __invoke(
         ResponseInterface $response,
         callable $next)
     {
-        $response->getBody()->write('Hello World!' . require dirname(__FILE__).'/../../../libs/output_data.php');
+        $response->getBody()->write('Hello World!');
         return $response->withHeader('Content-Type', 'text/html');
     }
 }
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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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();
 
-echo require dirname(__FILE__).'/../../libs/output_data.php';
+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/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`		`- echo require dirname(__FILE__).'/../../libs/output_data.php';`
	`68`	`+ require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';`
`69`	`69`	`exit(0);`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class HelloController extends AppController`
`8`	`8`
`9`	`9`	`public function index()`
`10`	`10`	`{`
`11`		`- $this->response->body('Hello World!' . require dirname(__FILE__).'/../../../libs/output_data.php');`
	`11`	`+ $this->response->body('Hello World!');`
`12`	`12`	`return $this->response;`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@`
`9`	`9`
`10`	`10`	`$f3->run();`
`11`	`11`
`12`		`-echo require dirname(__FILE__).'/../libs/output_data.php';`
	`12`	`+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';`
Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,4 @@ class_alias('Fuel\\Core\\Autoloader', 'Autoloader');`
`101`	`101`
`102`	`102`	`$response->send(true);`
`103`	`103`
`104`		`-echo require dirname(__FILE__).'/../../libs/output_data.php';`
	`104`	`+require $_SERVER['DOCUMENT_ROOT'].'/php-framework-benchmark/libs/output_data.php';`