Merge pull request #331 from perftools/psr-4

composer.json

@@ -3,8 +3,8 @@
     "description": "A web based interface for viewing profile data collected by XHProf",
     "license": "MIT",
     "autoload": {
-        "psr-0": {
-            "Xhgui_": "src/"
+        "psr-4": {
+            "XHGui\\": "src/Xhgui/"
         }
     },
     "autoload-dev": {

external/import.php

@@ -1,4 +1,8 @@
 <?php
+
+use XHGui\Saver\SaverInterface;
+use XHGui\ServiceContainer;
+
 if (!defined('XHGUI_ROOT_DIR')) {
     require dirname(__DIR__) . '/src/bootstrap.php';
 }
@@ -20,8 +24,8 @@
     throw new RuntimeException('Can\'t open '.$file);
 }
 
-$container = Xhgui_ServiceContainer::instance();
-/** @var Xhgui_Saver_Interface $saver */
+$container = ServiceContainer::instance();
+/** @var SaverInterface $saver */
 $saver = $container['saver'];
 
 while (!feof($fp)) {

src/Xhgui/Controller.php → src/Xhgui/AbstractController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace XHGui;
+
 use Slim\Slim;
 
-abstract class Xhgui_Controller
+abstract class AbstractController
 {
     /**
      * @var array

src/Xhgui/Config.php

@@ -1,8 +1,11 @@
 <?php
+
+namespace XHGui;
+
 /**
  * Loads and reads config file.
  */
-class Xhgui_Config
+class Config
 {
     private static $config = [];
 

src/Xhgui/Controller/Custom.php → src/Xhgui/Controller/CustomController.php

@@ -1,15 +1,19 @@
 <?php
 
+namespace XHGui\Controller;
+
 use Slim\Slim;
+use XHGui\Searcher\SearcherInterface;
+use XHGui\AbstractController;
 
-class Xhgui_Controller_Custom extends Xhgui_Controller
+class CustomController extends AbstractController
 {
     /**
-     * @var Xhgui_Searcher_Interface
+     * @var SearcherInterface
      */
     protected $searcher;
 
-    public function __construct(Slim $app, Xhgui_Searcher_Interface $searcher)
+    public function __construct(Slim $app, SearcherInterface $searcher)
     {
         parent::__construct($app);
         $this->searcher = $searcher;

src/Xhgui/Controller/Import.php → src/Xhgui/Controller/ImportController.php

@@ -1,19 +1,25 @@
 <?php
 
+namespace XHGui\Controller;
+
+use Exception;
+use InvalidArgumentException;
 use Slim\Http\Request;
 use Slim\Slim;
+use XHGui\Saver\SaverInterface;
+use XHGui\AbstractController;
 
-class Xhgui_Controller_Import extends Xhgui_Controller
+class ImportController extends AbstractController
 {
     /**
-     * @var Xhgui_Saver_Interface
+     * @var SaverInterface
      */
     private $saver;
 
     /** @var string */
     private $token;
 
-    public function __construct(Slim $app, Xhgui_Saver_Interface $saver, $token)
+    public function __construct(Slim $app, SaverInterface $saver, $token)
     {
         parent::__construct($app);
         $this->saver = $saver;

src/Xhgui/Controller/Metrics.php → src/Xhgui/Controller/MetricsController.php

@@ -1,15 +1,19 @@
 <?php
 
+namespace XHGui\Controller;
+
 use Slim\Slim;
+use XHGui\Searcher\SearcherInterface;
+use XHGui\AbstractController;
 
-class Xhgui_Controller_Metrics extends Xhgui_Controller
+class MetricsController extends AbstractController
 {
     /**
-     * @var Xhgui_Searcher_Interface
+     * @var SearcherInterface
      */
     protected $searcher;
 
-    public function __construct(Slim $app, Xhgui_Searcher_Interface $searcher)
+    public function __construct(Slim $app, SearcherInterface $searcher)
     {
         parent::__construct($app);
         $this->searcher = $searcher;

src/Xhgui/Controller/Run.php → src/Xhgui/Controller/RunController.php

@@ -1,20 +1,25 @@
 <?php
 
+namespace XHGui\Controller;
+
+use Exception;
 use Slim\Slim;
+use XHGui\Searcher\SearcherInterface;
+use XHGui\AbstractController;
 
-class Xhgui_Controller_Run extends Xhgui_Controller
+class RunController extends AbstractController
 {
     /**
      * HTTP GET attribute name for comma separated filters
      */
     const FILTER_ARGUMENT_NAME = 'filter';
 
     /**
-     * @var Xhgui_Searcher_Interface
+     * @var SearcherInterface
      */
     private $searcher;
 
-    public function __construct(Slim $app, Xhgui_Searcher_Interface $searcher)
+    public function __construct(Slim $app, SearcherInterface $searcher)
     {
         parent::__construct($app);
         $this->searcher = $searcher;

src/Xhgui/Controller/Watch.php → src/Xhgui/Controller/WatchController.php

@@ -1,15 +1,19 @@
 <?php
 
+namespace XHGui\Controller;
+
 use Slim\Slim;
+use XHGui\Searcher\SearcherInterface;
+use XHGui\AbstractController;
 
-class Xhgui_Controller_Watch extends Xhgui_Controller
+class WatchController extends AbstractController
 {
     /**
-     * @var Xhgui_Searcher_Interface
+     * @var SearcherInterface
      */
     protected $searcher;
 
-    public function __construct(Slim $app, Xhgui_Searcher_Interface $searcher)
+    public function __construct(Slim $app, SearcherInterface $searcher)
     {
         parent::__construct($app);
         $this->searcher = $searcher;

src/Xhgui/Controller/Waterfall.php → src/Xhgui/Controller/WaterfallController.php

@@ -1,15 +1,20 @@
 <?php
 
+namespace XHGui\Controller;
+
 use Slim\Slim;
+use XHGui\Searcher\SearcherInterface;
+use XHGui\AbstractController;
+use XHGui\Profile;
 
-class Xhgui_Controller_Waterfall extends Xhgui_Controller
+class WaterfallController extends AbstractController
 {
     /**
-     * @var Xhgui_Searcher_Interface
+     * @var SearcherInterface
      */
     protected $searcher;
 
-    public function __construct(Slim $app, Xhgui_Searcher_Interface $searcher)
+    public function __construct(Slim $app, SearcherInterface $searcher)
     {
         parent::__construct($app);
         $this->searcher = $searcher;
@@ -64,7 +69,7 @@ public function query()
             'projection' => true,
         ]);
         $datas = [];
-        /** @var Xhgui_Profile $r */
+        /** @var Profile $r */
         foreach ($result['results'] as $r) {
             $duration = $r->get('main()', 'wt');
             $start = $r->getMeta('SERVER.REQUEST_TIME_FLOAT');

src/Xhgui/Db/Mapper.php

@@ -1,6 +1,12 @@
 <?php
 
-class Xhgui_Db_Mapper
+namespace XHGui\Db;
+
+use DateInterval;
+use DateTime;
+use MongoDate;
+
+class Mapper
 {
     /**
      * Convert request data keys into mongo values.
@@ -117,6 +123,7 @@ protected function _direction($options)
 
         return 'desc';
     }
+
     /**
      * Get sort options for a paginated set.
      *

src/Xhgui/Middleware/Render.php → src/Xhgui/Middleware/RenderMiddleware.php

@@ -1,7 +1,10 @@
 <?php
+
+namespace XHGui\Middleware;
+
 use Slim\Middleware;
 
-class Xhgui_Middleware_Render extends Middleware
+class RenderMiddleware extends Middleware
 {
     public function call()
     {

src/Xhgui/Profile.php

@@ -1,10 +1,16 @@
 <?php
+
+namespace XHGui;
+
+use DateTime;
+use Exception;
+
 /**
  * Domain object for handling profile runs.
  *
  * Provides method to manipulate the data from a single profile run.
  */
-class Xhgui_Profile
+class Profile
 {
     /**
      * @const Key used for methods with no parent
@@ -369,7 +375,7 @@ public function extractDimension($dimension, $limit)
      * Notes:
      *  Function names are not unique, but we're merging them
      *
-     * @return Xhgui_Profile A new instance with exclusive data set.
+     * @return Profile A new instance with exclusive data set.
      */
     public function calculateSelf()
     {
@@ -431,7 +437,7 @@ public function filter($profileData, $filters = [])
         foreach ($filters as $key => $item) {
             foreach ($profileData as $keyItem => $method) {
                 if (fnmatch($item, $keyItem)) {
-                    unset($profileData[ $keyItem ]);
+                    unset($profileData[$keyItem]);
                 }
             }
         }
@@ -478,10 +484,10 @@ public function getFunctionCount()
     /**
      * Compare this run to another run.
      *
-     * @param Xhgui_Profile $head The other run to compare with
+     * @param Profile $head The other run to compare with
      * @return array An array of comparison data.
      */
-    public function compare(Xhgui_Profile $head)
+    public function compare(Profile $head)
     {
         $this->calculateSelf();
         $head->calculateSelf();

src/Xhgui/Saver/Mongo.php → src/Xhgui/Saver/MongoSaver.php

@@ -1,6 +1,12 @@
 <?php
 
-class Xhgui_Saver_Mongo implements Xhgui_Saver_Interface
+namespace XHGui\Saver;
+
+use MongoCollection;
+use MongoDate;
+use MongoId;
+
+class MongoSaver implements SaverInterface
 {
     /**
      * @var MongoCollection

src/Xhgui/Saver/Pdo.php → src/Xhgui/Saver/PdoSaver.php

@@ -1,6 +1,12 @@
 <?php
 
-class Xhgui_Saver_Pdo implements Xhgui_Saver_Interface
+namespace XHGui\Saver;
+
+use PDO;
+use PDOStatement;
+use XHGui\Util;
+
+class PdoSaver implements SaverInterface
 {
     const TABLE_DDL = <<<SQL
 
@@ -68,7 +74,7 @@ class Xhgui_Saver_Pdo implements Xhgui_Saver_Interface
     private $stmt;
 
     /**
-     * @param PDO    $pdo
+     * @param PDO $pdo
      * @param string $table
      */
     public function __construct(PDO $pdo, $table)
@@ -88,7 +94,7 @@ public function save(array $data)
         $usec = $ts['usec'];
 
         $this->stmt->execute([
-            'id'               => Xhgui_Util::generateId(),
+            'id'               => Util::generateId(),
             'profile'          => json_encode($data['profile']),
             'url'              => $data['meta']['url'],
             'SERVER'           => json_encode($data['meta']['SERVER']),

src/Xhgui/Saver/Interface.php → src/Xhgui/Saver/SaverInterface.php

@@ -1,6 +1,8 @@
 <?php
 
-interface Xhgui_Saver_Interface
+namespace XHGui\Saver;
+
+interface SaverInterface
 {
     public function save(array $data);
 }