Merge pull request #13 from joanhey/public-dir

myaaghubi · web-flow · commit 5450155f948a · 2023-07-23T14:14:29.000+03:30
Add public dir to microframeworks
diff --git a/benchmark.config b/benchmark.config
@@ -22,7 +22,7 @@ fastroute-1.3
 fatfree-3.8.1
 frameworkx-dev
 fuelphp-1.9
-kumbiaphp-1.1
+kumbia-1.1
 laminas-2.0
 laravel-10.0
 leaf-3.3
diff --git a/fastroute-1.3/_benchmark/hello_world.sh b/fastroute-1.3/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/fastroute-1.3/public/index.php b/fastroute-1.3/public/index.php
@@ -3,7 +3,7 @@
 // https://github.com/nikic/FastRoute#usage
 // Here's a basic usage example:
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 
 $dispatcher = FastRoute\simpleDispatcher(function(FastRoute\RouteCollector $r) {
@@ -22,7 +22,7 @@
 
 // https://github.com/nikic/FastRoute/issues/110#issuecomment-273760186
 // Strip prefix
-$prefix = '/PHP-Frameworks-Bench/fastroute-1.3';
+$prefix = '/PHP-Frameworks-Bench/fastroute-1.3/public';
 if ($prefix !== '' && strpos($uri, $prefix) === 0) {
     $uri = substr($uri, strlen($prefix));
 }
diff --git a/fatfree-3.8.1/_benchmark/hello_world.sh b/fatfree-3.8.1/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/fatfree-3.8.1/public/index.php b/fatfree-3.8.1/public/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'vendor/autoload.php';
+require '../vendor/autoload.php';
 
 $f3 = \Base::instance();
 
diff --git a/kumbia-1.1/_benchmark/clean.sh b/kumbia-1.1/_benchmark/clean.sh
diff --git a/kumbia-1.1/_benchmark/clear-cache.sh b/kumbia-1.1/_benchmark/clear-cache.sh
diff --git a/kumbia-1.1/_benchmark/hello_world.sh b/kumbia-1.1/_benchmark/hello_world.sh
diff --git a/kumbia-1.1/_benchmark/kumbia/default/app/controllers/helloworld_controller.php b/kumbia-1.1/_benchmark/kumbia/default/app/controllers/helloworld_controller.php
diff --git a/kumbia-1.1/_benchmark/kumbia/default/public/index.php b/kumbia-1.1/_benchmark/kumbia/default/public/index.php
diff --git a/kumbia-1.1/_benchmark/setup.sh b/kumbia-1.1/_benchmark/setup.sh
diff --git a/kumbia-1.1/_benchmark/update.sh b/kumbia-1.1/_benchmark/update.sh
diff --git a/leaf-3.3/_benchmark/hello_world.sh b/leaf-3.3/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/leaf-3.3/public/index.php b/leaf-3.3/public/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'vendor/autoload.php';
+require '../vendor/autoload.php';
 
 app()->get("/index.php/hello/index", 'Controllers\HelloWorldController@index');
 
diff --git a/phroute-2.2/_benchmark/hello_world.sh b/phroute-2.2/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/phroute-2.2/public/index.php b/phroute-2.2/public/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 use Phroute\Phroute\RouteCollector;
 
@@ -14,7 +14,7 @@
 // just same as fastroute:
 // https://github.com/nikic/FastRoute/issues/110#issuecomment-273760186
 // Strip prefix
-$prefix = '/PHP-Frameworks-Bench/phroute-2.2';
+$prefix = '/PHP-Frameworks-Bench/phroute-2.2/public';
 if ($prefix !== '' && strpos($uri, $prefix) === 0) {
     $uri = substr($uri, strlen($prefix));
 }
diff --git a/pure-php/_benchmark/hello_world.sh b/pure-php/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/pure-php/public/index.php b/pure-php/public/index.php
@@ -6,9 +6,9 @@
 
 $uri = $_SERVER['REQUEST_URI'];
 
-$prefix = '/PHP-Frameworks-Bench/pure-php';
+$prefix = '/PHP-Frameworks-Bench/pure-php/public';
 
-require_once ('Controllers/HelloWorldController.php');
+require_once ('../Controllers/HelloWorldController.php');
 
 // Strip query string (?foo=bar) and decode URI
 if (false !== $pos = strpos($uri, '?')) {
diff --git a/siler-1.7.9/_benchmark/hello_world.sh b/siler-1.7.9/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/siler-1.7.9/public/index.php b/siler-1.7.9/public/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 
 /* *** PHP-Frameworks-Bench *** */
diff --git a/slim-3.12/_benchmark/hello_world.sh b/slim-3.12/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/slim-3.12/public/index.php b/slim-3.12/public/index.php
@@ -1,5 +1,5 @@
 <?php
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 
 $app = new \Slim\App();
diff --git a/slim-4.11/_benchmark/hello_world.sh b/slim-4.11/_benchmark/hello_world.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-url="$base/$fw/index.php/hello/index"
+url="$base/$fw/public/index.php/hello/index"
diff --git a/slim-4.11/public/index.php b/slim-4.11/public/index.php
@@ -1,13 +1,13 @@
 <?php
 use Slim\Factory\AppFactory;
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 // Instantiate App
 $app = AppFactory::create();
 
 // xampp
-$app->setBasePath("/PHP-Frameworks-Bench/slim-4.11/index.php");
+$app->setBasePath("/PHP-Frameworks-Bench/slim-4.11/public/index.php");
 
 // Add error middleware
 $app->addErrorMiddleware(false, true, true);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-url="$base/$fw/index.php/hello/index"`
	`2`	`+url="$base/$fw/public/index.php/hello/index"`