Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #744 from TerrySwift/master

Remove unnecessary codes
Mike Smith 11 years ago
parent
06b478d994 be61d871da
commit
ee1efdc4c3
9 changed files with 8 additions and 381 deletions
Unified View Show Diff Stats
  1. 0 25
      php-yaf/app/Bootstrap.php
  2. 0 1
      php-yaf/app/conf/application.ini
  3. 1 4
      php-yaf/app/modules/Bench/controllers/Raw.php
  4. 3 1
      php-yaf/app/modules/Bench/views/raw/fortunes.phtml
  5. 0 0
      php-yaf/app/views/index/index.phtml
  6. 0 1
      php-yaf/app/views/layouts/fortunes.phtml
  7. 0 344
      php-yaf/library/eYaf/Layout.php
  8. 2 2
      php-yaf/public/index.php
  9. 2 3
      php-yaf/source_code

+ 0 - 25
php-yaf/app/Bootstrap.php
View File 

@@ -1,25 +0,0 @@
 
-<?php
 
-
 
-use Yaf\Application;
 
-use Yaf\Bootstrap_Abstract as AbstractBootstrap;
 
-use Yaf\Dispatcher;
 
-use eYaf\Layout;
 
-
 
-class Bootstrap extends AbstractBootstrap
 
-{
 
-    /**
 
-     * @var Yaf\Config_Abstract
 
-     */
 
-    private $config = null;
 
-
 
-    public function _initConfig ()
 
-    {
 
-        $this->config = Application::app()->getConfig();
 
-    }
 
-
 
-    public function _initLayout (Dispatcher $dispatcher)
 
-    {
 
-        $dispatcher->setView(new Layout($this->config->get('application.layout.directory')));
 
-    }
 
-
 
-}

+ 0 - 1
php-yaf/app/conf/application.ini
View File 

@@ -4,7 +4,6 @@ application.modules = "Index,Bench"
 
 application.library = APP_PATH "/library"
 
 application.library = APP_PATH "/library"
 
 application.library.directory = APP_PATH "/library"
 
 application.library.directory = APP_PATH "/library"
 
 application.view.ext = phtml
 
 application.view.ext = phtml
 
-application.layout.directory = APP_PATH  "/app/views/layouts"
 
 
 
 db.connections.default.dsn  = "mysql:host=localhost;port=3306;dbname=hello_world;charset=utf8"
 
 db.connections.default.dsn  = "mysql:host=localhost;port=3306;dbname=hello_world;charset=utf8"
 
 db.connections.default.user = benchmarkdbuser
 
 db.connections.default.user = benchmarkdbuser

+ 1 - 4
php-yaf/app/modules/Bench/controllers/Raw.php
View File 

@@ -46,9 +46,6 @@ class RawController extends AbstractController
 
     public function fortunesAction ()
 
     public function fortunesAction ()
 
     {
 
     {
 
         $view = $this->getView();
 
         $view = $this->getView();
 
-        /* @var $view eYaf\Layout */
 
-
 
-        $view->setLayout('fortunes');
 
 
 
         $dbh = DatabaseManager::getInstance()->getConnection();
 
         $dbh = DatabaseManager::getInstance()->getConnection();
 
 
 
@@ -63,4 +60,4 @@ class RawController extends AbstractController
 
         header('Content-Type: text/html; charset=utf-8');
 
         header('Content-Type: text/html; charset=utf-8');
 
     }
 
     }
 
 
 
-}
 
+}

+ 3 - 1
php-yaf/app/modules/Bench/views/raw/fortunes.phtml
View File 

@@ -1,3 +1,4 @@
 
+<!DOCTYPE html><html><head><title>Fortunes</title></head><body>
 
 <table>
 
 <table>
 
   <tr>
 
   <tr>
 
     <th>id</th>
 
     <th>id</th>
 
@@ -9,4 +10,5 @@
 
       <td><?php echo htmlspecialchars($fortune, ENT_QUOTES, 'UTF-8'); ?></td>
 
       <td><?php echo htmlspecialchars($fortune, ENT_QUOTES, 'UTF-8'); ?></td>
 
     </tr>
 
     </tr>
 
   <?php } ?>
 
   <?php } ?>
 
-</table>
 
+</table>
 
+</body></html>

+ 0 - 0
php-yaf/app/views/index/index.phtml
View File


+ 0 - 1
php-yaf/app/views/layouts/fortunes.phtml
View File 

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

+ 0 - 344
php-yaf/library/eYaf/Layout.php
View File 

@@ -1,344 +0,0 @@
 
-<?php
 
-
 
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
-
 
-namespace eYaf;
 
-
 
-
 
-/**
 
- * Layout class used for render layouts and views.
 
- *
 
- * Layout class allows to use of a base layout skeleton and render views inside
 
- * this layout template.
 
- * The concept is to not render and display the view template directly but storing it
 
- * in {@link $content} property. Then will render the skeleton layout and
 
- * pass the {@link $content} property to it.
 
- * <code>
 
- *  application/views/layouts/front.phtml
 
- *
 
- *  <html>
 
- *      <head>
 
- *          <title><?php echo $title ?></title>
 
- *      </head>
 
- *      <body>
 
- *          <?= $_content_ // This is where your view from each action
 
- *          will be displayed ?>
 
- *      </body>
 
- *  </html>
 
- * </code>
 
- *
 
- * If no layout is defined then returns the renderd action view template.
 
- *
 
- * Also allows to set variable to views and access them from the base
 
- * skeleton layout. In above layout $title variable is set to title tag.
 
- * Then in a view template we can set the value for $title variable.
 
- * <code>
 
- *  application/views/index/index.phtml
 
- *
 
- *  <?php $this->title = "Index Action" ?>
 
- *  <h1>Index Action</h1>
 
- * </code>
 
- *
 
- * @author Andreas Kollaros <[email protected]>
 
- *
 
- */
 
-class Layout implements \Yaf\View_Interface
 
-{
 
-
 
-    /**
 
-     * The template engine to render views and layout templates.
 
-     *
 
-     * Default engine is Yaf\View\Simple
 
-     *
 
-     * @var Yaf\View\Simple
 
-     */
 
-    public $engine;
 
-
 
-    /**
 
-     * Options to be passed to template engine.
 
-     *
 
-     * @var array
 
-     */
 
-    protected $options=array();
 
-
 
-    /**
 
-     *
 
-     */
 
-    protected $layout_path;
 
-
 
-    /**
 
-     * The name of layout file without extension.
 
-     *
 
-     * @var string
 
-     */
 
-    protected $layout = 'layout';
 
-
 
-    /**
 
-     * Handles the rendered action view data.
 
-     *
 
-     * @var string
 
-     */
 
-    protected $content;
 
-
 
-    /**
 
-     * Array with assigned template variables.
 
-     *
 
-     * @var array
 
-     */
 
-    protected $tpl_vars = array();
 
-
 
-    /**
 
-     * Template directory.
 
-     *
 
-     * @var string
 
-     */
 
-    protected $tpl_dir;
 
-
 
-    /**
 
-     * Constructor
 
-     *
 
-     * @param array $options key/value pair of options to be assigned to
 
-     *                       template engine.
 
-     *
 
-     * @return void
 
-     */
 
-    public function __construct($path, $options=array())
 
-    {
 
-        $this->layout_path = $path;
 
-        $this->options = $options;
 
-
 
-
 
-    }
 
-
 
-    /**
 
-     * Return the instance of a template engine.
 
-     *
 
-     * @return Yaf\View\Simple
 
-     */
 
-    protected function engine()
 
-    {
 
-        $this->engine =  $this->engine ?: new \Yaf\View\Simple(
 
-            $this->tpl_dir,
 
-            $this->options
 
-        );
 
-
 
-        return $this->engine;
 
-    }
 
-
 
-    /**
 
-     * Create engine instance and set the path of views and layout templates.
 
-     *
 
-     * Layout path is set by default to layout directory inside views path.
 
-     *
 
-     * @param string $path The directory to set as the path.
 
-     *
 
-     * @return void
 
-     */
 
-    public function setScriptPath($path)
 
-    {
 
-        if (is_readable($path)) {
 
-            $this->tpl_dir = $path;
 
-            $this->engine()->setScriptPath($path);
 
-
 
-            // Overwirte layouts path by setting it where views path is.
 
-            // This will force layout in modules to be placed in
 
-            // modules/views/layouts directory
 
-            $this->layout_path = $path . "/layouts";
 
-
 
-            return true;
 
-        }
 
-
 
-        throw new \Exception("Invalid path: {$path}");
 
-    }
 
-
 
-    /**
 
-     * Getter method for views path.
 
-     *
 
-     * @return string
 
-     */
 
-    public function getScriptPath()
 
-    {
 
-        return $this->engine()->getScriptPath();
 
-    }
 
-
 
-    /**
 
-     * Setter for Layout::layout variable
 
-     *
 
-     * @param string $name the name of layout file without extension.
 
-     *
 
-     * @return void
 
-     */
 
-    public function setLayout($name)
 
-    {
 
-        $this->layout = $name;
 
-    }
 
-
 
-    /**
 
-     * Getter for Layout::layout variable
 
-     *
 
-     * @return string the name of layout file without extension
 
-     */
 
-    public function getLayout()
 
-    {
 
-        return $this->layout;
 
-    }
 
-
 
-
 
-    public function setLayoutPath($path)
 
-    {
 
-        $this->layout_path = $path;
 
-    }
 
-
 
-    /**
 
-     * Get full layout path with filename and extension.
 
-     *
 
-     * @return string
 
-     */
 
-    public function getLayoutPath()
 
-    {
 
-        $config = \Yaf\Application::app()->getConfig()->get('application');
 
-        return $this->layout_path . "/" . $this->layout . ".{$config->view->ext}";
 
-    }
 
-
 
-    /**
 
-     * Assign a variable to the template
 
-     *
 
-     * @param string $name  The variable name.
 
-     * @param mixed  $value The variable value.
 
-     *
 
-     * @return void
 
-     */
 
-    public function __set($name, $value)
 
-    {
 
-        $this->assign($name, $value);
 
-    }
 
-
 
-    /**
 
-     * Allows testing with empty() and isset() to work
 
-     *
 
-     * @param string $name
 
-     *
 
-     * @return boolean
 
-     */
 
-    public function __isset($name)
 
-    {
 
-        return (null !== $this->engine()->$name);
 
-    }
 
-
 
-    /**
 
-     * Allows unset() on object properties to work
 
-     *
 
-     * @param string $name
 
-     *
 
-     * @return void
 
-     */
 
-    public function __unset($name)
 
-    {
 
-        $this->engine()->clear($name);
 
-    }
 
-
 
-    /**
 
-     * Assign variables to the template
 
-     *
 
-     * Allows setting a specific key to the specified value, OR passing
 
-     * an array of key => value pairs to set en masse.
 
-     *
 
-     * @see __set()
 
-     *
 
-     * @param string|array $name  The assignment strategy to use (key or
 
-     *                            array of key => value pairs)
 
-     * @param mixed        $value (Optional) If assigning a named variable,
 
-     *                            use this as the value.
 
-     *
 
-     * @return void
 
-     */
 
-    public function assign($name, $value = null)
 
-    {
 
-
 
-        $this->tpl_vars[$name] = $value;
 
-
 
-        $this->engine()->assign($name, $value);
 
-    }
 
-
 
-    /**
 
-     * Assign variables by reference to the template
 
-     *
 
-     */
 
-    public function assignRef($name, &$value)
 
-    {
 
-        $this->tpl_vars[$name] = $value;
 
-
 
-        $this->engine()->assignRef($name, $value);
 
-    }
 
-
 
-    /**
 
-     * Clear all assigned variables
 
-     *
 
-     * Clears all variables assigned to Yaf\View either via
 
-     * {@link assign()} or property overloading
 
-     * ({@link __get()}/{@link __set()}).
 
-     *
 
-     * @return void
 
-     */
 
-    public function clearVars() {
 
-        $this->tpl_vars = array();
 
-        $this->engine()->clear();
 
-    }
 
-
 
-    /**
 
-     * Processes a view and returns the output.
 
-     *
 
-     * This method called once from controller to render the given view.
 
-     * So render the view at $this->content property and then render the
 
-     * layout template.
 
-     *
 
-     * @param string $tpl      The template to process.
 
-     * @param array  $tpl_vars Additional variables to be assigned to template.
 
-     *
 
-     * @return string The view or layout template output.
 
-     */
 
-    public function render($tpl, $tpl_vars=array()) {
 
-
 
-        $tpl_vars = array_merge($this->tpl_vars, $tpl_vars);
 
-
 
-        $this->content = $this->engine()->render($tpl, $tpl_vars);
 
-
 
-        // if no layout is defined,
 
-        // return the rendered view template
 
-        if (null == $this->layout) {
 
-
 
-            return $this->content;
 
-        }
 
-
 
-        // If we assign some variables into view template, then maybe we need
 
-        // them to layout view.
 
-        // Hack??
 
-        // Get template vars from view via Reflection class and assign them to
 
-        // layout view
 
-        $ref = new \ReflectionClass($this->engine());
 
-        $prop = $ref->getProperty('_tpl_vars');
 
-        $prop->setAccessible(true);
 
-        $view_vars = $prop->getValue($this->engine());
 
-
 
-        $tpl_vars = array_merge($tpl_vars, $view_vars);
 
-        $tpl_vars['_content_'] = $this->content;
 
-
 
-        return $this->engine()->render(
 
-            $this->getLayoutPath(),
 
-            $tpl_vars
 
-        );
 
-    }
 
-
 
-    /**
 
-     * Directly display the constens of a view / layout template.
 
-     *
 
-     * @param string $tpl      The template to process.
 
-     * @param array  $tpl_vars Additional variables to be assigned to template.
 
-     *
 
-     * @return void
 
-     */
 
-    public function display($tpl, $tpl_vars=array()) {
 
-        echo $this->render($tpl, $tpl_vars);
 
-    }
 
-
 
-}

+ 2 - 2
php-yaf/public/index.php
View File 

@@ -1,5 +1,5 @@
 
 <?php
 
 <?php
 
 
 
 define('APP_PATH', __DIR__ . '/..');
 
 define('APP_PATH', __DIR__ . '/..');
 
-$app = new Yaf\Application(APP_PATH . '/app/conf/application.ini', 'product');
 
-$app->bootstrap()->run();
 
+$app = new Yaf\Application(APP_PATH . '/app/conf/application.ini');
 
+$app->run();

+ 2 - 3
php-yaf/source_code
View File 

@@ -1,4 +1,3 @@
 
-./php-yaf/app/Bootstrap.php
 
 ./php-yaf/app/controllers/
 
 ./php-yaf/app/controllers/
 
 ./php-yaf/app/controllers/Index.php
 
 ./php-yaf/app/controllers/Index.php
 
 ./php-yaf/app/modules/
 
 ./php-yaf/app/modules/
 
@@ -9,8 +8,8 @@
 
 ./php-yaf/app/modules/Bench/views/raw
 
 ./php-yaf/app/modules/Bench/views/raw
 
 ./php-yaf/app/modules/Bench/views/raw/fortunes.phtml
 
 ./php-yaf/app/modules/Bench/views/raw/fortunes.phtml
 
 ./php-yaf/app/views/
 
 ./php-yaf/app/views/
 
-./php-yaf/app/views/layouts
 
-./php-yaf/app/views/layouts/fortunes.phtml
 
+./php-yaf/app/views/index/
 
+./php-yaf/app/views/index/index.phtml
 
 ./php-yaf/public/
 
 ./php-yaf/public/
 
 ./php-yaf/public/index.php
 
 ./php-yaf/public/index.php
 
 ./php-yaf/public/favicon.ico
 
 ./php-yaf/public/favicon.ico