Inicio Explorar Axuda
Iniciar sesión
computer_glamour
/
privatebin-mirror
réplica de https://github.com/PrivateBin/PrivateBin
1
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

renaming controller #342

El RIDO %!s(int64=8) %!d(string=hai) anos
pai
90e83ddb30
achega
f9c8441edb
Modificáronse 10 ficheiros con 74 adicións e 74 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      index.php
  2. 5 5
      lib/Controller.php
  3. 5 5
      lib/Data/Database.php
  4. 3 3
      lib/Model/Paste.php
  5. 43 43
      tst/ControllerTest.php
  6. 2 2
      tst/ControllerWithDbTest.php
  7. 2 2
      tst/Data/DatabaseTest.php
  8. 11 11
      tst/JsonApiTest.php
  9. 1 1
      vendor/composer/autoload_classmap.php
  10. 1 1
      vendor/composer/autoload_static.php

+ 1 - 1
index.php
Ver ficheiro 

@@ -15,4 +15,4 @@ define('PATH', '');
 
 
 define('PUBLIC_PATH', __DIR__);
 
 require PATH . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-new PrivateBin\PrivateBin;
 
+new PrivateBin\Controller;

+ 5 - 5
lib/PrivateBin.php → lib/Controller.php
Ver ficheiro 

@@ -17,11 +17,11 @@ use PrivateBin\Persistence\ServerSalt;
 
 use PrivateBin\Persistence\TrafficLimiter;
 
 
 /**
 
- * PrivateBin
 
+ * Controller
 
  *
 
- * Controller, puts it all together.
 
+ * Puts it all together.
 
  */
 
-class PrivateBin
 
+class Controller
 
 {
 
     /**
 
      * version
 
@@ -151,7 +151,7 @@ class PrivateBin
 
     }
 
 
     /**
 
-     * initialize privatebin
 
+     * initialize PrivateBin
 
      *
 
      * @access private
 
      */
 
@@ -368,7 +368,7 @@ class PrivateBin
 
     }
 
 
     /**
 
-     * Display PrivateBin frontend.
 
+     * Display frontend.
 
      *
 
      * @access private
 
      */

+ 5 - 5
lib/Data/Database.php
Ver ficheiro 

@@ -15,7 +15,7 @@ namespace PrivateBin\Data;
 
 use Exception;
 
 use PDO;
 
 use PDOException;
 
-use PrivateBin\PrivateBin;
 
+use PrivateBin\Controller;
 
 use stdClass;
 
 
 /**
 
@@ -122,7 +122,7 @@ class Database extends AbstractData
 
                 }
 
 
                 // create config table if necessary
 
-                $db_version = PrivateBin::VERSION;
 
+                $db_version = Controller::VERSION;
 
                 if (!in_array(self::_sanitizeIdentifier('config'), $tables)) {
 
                     self::_createConfigTable();
 
                     // if we only needed to create the config table, the DB is older then 0.22
 
@@ -134,7 +134,7 @@ class Database extends AbstractData
 
                 }
 
 
                 // update database structure if necessary
 
-                if (version_compare($db_version, PrivateBin::VERSION, '<')) {
 
+                if (version_compare($db_version, Controller::VERSION, '<')) {
 
                     self::_upgradeDatabase($db_version);
 
                 }
 
             } else {
 
@@ -623,7 +623,7 @@ class Database extends AbstractData
 
         self::_exec(
 
             'INSERT INTO ' . self::_sanitizeIdentifier('config') .
 
             ' VALUES(?,?)',
 
-            array('VERSION', PrivateBin::VERSION)
 
+            array('VERSION', Controller::VERSION)
 
         );
 
     }
 
 
@@ -698,7 +698,7 @@ class Database extends AbstractData
 
                 self::_exec(
 
                     'UPDATE ' . self::_sanitizeIdentifier('config') .
 
                     ' SET value = ? WHERE id = ?',
 
-                    array(PrivateBin::VERSION, 'VERSION')
 
+                    array(Controller::VERSION, 'VERSION')
 
                 );
 
         }
 
     }

+ 3 - 3
lib/Model/Paste.php
Ver ficheiro 

@@ -14,7 +14,7 @@ namespace PrivateBin\Model;
 
 
 use Exception;
 
 use PrivateBin\Persistence\ServerSalt;
 
-use PrivateBin\PrivateBin;
 
+use PrivateBin\Controller;
 
 use PrivateBin\Sjcl;
 
 
 /**
 
@@ -35,14 +35,14 @@ class Paste extends AbstractModel
 
     {
 
         $data = $this->_store->read($this->getId());
 
         if ($data === false) {
 
-            throw new Exception(PrivateBin::GENERIC_ERROR, 64);
 
+            throw new Exception(Controller::GENERIC_ERROR, 64);
 
         }
 
 
         // check if paste has expired and delete it if neccessary.
 
         if (property_exists($data->meta, 'expire_date')) {
 
             if ($data->meta->expire_date < time()) {
 
                 $this->delete();
 
-                throw new Exception(PrivateBin::GENERIC_ERROR, 63);
 
+                throw new Exception(Controller::GENERIC_ERROR, 63);
 
             }
 
             // We kindly provide the remaining time before expiration (in seconds)
 
             $data->meta->remaining_time = $data->meta->expire_date - time();

+ 43 - 43
tst/PrivateBinTest.php → tst/ControllerTest.php
Ver ficheiro 

@@ -3,9 +3,9 @@
 
 use PrivateBin\Data\Filesystem;
 
 use PrivateBin\Persistence\ServerSalt;
 
 use PrivateBin\Persistence\TrafficLimiter;
 
-use PrivateBin\PrivateBin;
 
+use PrivateBin\Controller;
 
 
-class PrivateBinTest extends PHPUnit_Framework_TestCase
 
+class ControllerTest extends PHPUnit_Framework_TestCase
 
 {
 
     protected $_model;
 
 
@@ -49,7 +49,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
     public function testView()
 
     {
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertContains(
 
@@ -74,7 +74,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         Helper::createIniFile(CONF, $options);
 
         $_COOKIE['lang'] = 'de';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertContains(
 
@@ -95,7 +95,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         Helper::createIniFile(CONF, $options);
 
         $_COOKIE['lang'] = 'de';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertContains(
 
@@ -116,7 +116,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         Helper::createIniFile(CONF, $options);
 
         $_COOKIE['lang'] = 'de';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -139,7 +139,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         ob_end_clean();
 
 
         $this->assertFileExists($file, 'htaccess recreated');
 
@@ -152,7 +152,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
     public function testConf()
 
     {
 
         file_put_contents(CONF, '');
 
-        new PrivateBin;
 
+        new Controller;
 
     }
 
 
     /**
 
@@ -168,7 +168,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -196,7 +196,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         TrafficLimiter::canPass();
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -224,7 +224,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -246,7 +246,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -274,7 +274,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -298,7 +298,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $time                             = time();
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -329,7 +329,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $time                             = time();
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -359,7 +359,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -387,7 +387,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -409,7 +409,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -432,7 +432,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $this->assertFalse($this->_model->exists(Helper::getPasteId()), 'paste does not exists before posting data');
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -469,7 +469,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $this->assertFalse($this->_model->exists(Helper::getPasteId()), 'paste does not exists before posting data');
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -487,11 +487,11 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         ob_end_clean();
 
         $this->_model->delete(Helper::getPasteId());
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -513,7 +513,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -544,7 +544,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $this->_model->create(Helper::getPasteId(), Helper::getPaste());
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -568,7 +568,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $this->_model->create(Helper::getPasteId(), Helper::getPaste());
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -592,7 +592,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         $this->_model->create(Helper::getPasteId(), Helper::getPaste());
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -617,7 +617,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $paste                            = Helper::getPaste(array('opendiscussion' => false));
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -640,7 +640,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -666,7 +666,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -682,7 +682,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = 'foo';
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -698,7 +698,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -716,7 +716,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -734,7 +734,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -762,7 +762,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -792,7 +792,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -818,7 +818,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = Helper::getPasteId();
 
         $_GET['deletetoken'] = hash_hmac('sha256', Helper::getPasteId(), $paste->meta->salt);
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -838,7 +838,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = 'foo';
 
         $_GET['deletetoken'] = 'bar';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -857,7 +857,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = Helper::getPasteId();
 
         $_GET['deletetoken'] = 'bar';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -876,7 +876,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = Helper::getPasteId();
 
         $_GET['deletetoken'] = 'bar';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -900,7 +900,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -920,7 +920,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -940,7 +940,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = Helper::getPasteId();
 
         $_GET['deletetoken'] = 'does not matter in this context, but has to be set';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(
 
@@ -963,7 +963,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
 
         $_GET['pasteid']     = Helper::getPasteId();
 
         $_GET['deletetoken'] = hash_hmac('sha256', Helper::getPasteId(), ServerSalt::get());
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertRegExp(

+ 2 - 2
tst/PrivateBinWithDbTest.php → tst/ControllerWithDbTest.php
Ver ficheiro 

@@ -2,9 +2,9 @@
 
 
 use PrivateBin\Data\Database;
 
 
-require_once 'PrivateBinTest.php';
 
+require_once 'ControllerTest.php';
 
 
-class PrivateBinWithDbTest extends PrivateBinTest
 
+class ControllerWithDbTest extends ControllerTest
 
 {
 
     private $_options = array(
 
         'usr' => null,

+ 2 - 2
tst/Data/DatabaseTest.php
Ver ficheiro 

@@ -1,7 +1,7 @@
 
 <?php
 
 
 use PrivateBin\Data\Database;
 
-use PrivateBin\PrivateBin;
 
+use PrivateBin\Controller;
 
 
 class DatabaseTest extends PHPUnit_Framework_TestCase
 
 {
 
@@ -318,7 +318,7 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
 
         $statement->execute(array('VERSION'));
 
         $result = $statement->fetch(PDO::FETCH_ASSOC);
 
         $statement->closeCursor();
 
-        $this->assertEquals(PrivateBin::VERSION, $result['value']);
 
+        $this->assertEquals(Controller::VERSION, $result['value']);
 
         Helper::rmDir($this->_path);
 
     }
 
 }

+ 11 - 11
tst/JsonApiTest.php
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 
 use PrivateBin\Data\Filesystem;
 
 use PrivateBin\Persistence\ServerSalt;
 
-use PrivateBin\PrivateBin;
 
+use PrivateBin\Controller;
 
 use PrivateBin\Request;
 
 
 class JsonApiTest extends PHPUnit_Framework_TestCase
 
@@ -53,7 +53,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -86,7 +86,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['REQUEST_METHOD']        = 'PUT';
 
         $_SERVER['REMOTE_ADDR']           = '::1';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         unlink($file);
 
@@ -120,7 +120,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         $_SERVER['REQUEST_METHOD']        = 'DELETE';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         unlink($file);
 
@@ -144,7 +144,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         $_SERVER['REQUEST_METHOD']        = 'POST';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -166,7 +166,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $_SERVER['QUERY_STRING']          = Helper::getPasteId();
 
         $_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $response = json_decode($content, true);
 
@@ -192,7 +192,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         $_GET['jsonld'] = 'paste';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertEquals(str_replace(
 
@@ -211,7 +211,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         $_GET['jsonld'] = 'comment';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertEquals(str_replace(
 
@@ -230,7 +230,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         $_GET['jsonld'] = 'pastemeta';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertEquals(str_replace(
 
@@ -249,7 +249,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         $_GET['jsonld'] = 'commentmeta';
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertEquals(str_replace(
 
@@ -268,7 +268,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
 
         $this->_model->create(Helper::getPasteId(), $paste);
 
         $_GET['jsonld'] = CONF;
 
         ob_start();
 
-        new PrivateBin;
 
+        new Controller;
 
         $content = ob_get_contents();
 
         ob_end_clean();
 
         $this->assertEquals('{}', $content, 'does not output nasty data');

+ 1 - 1
vendor/composer/autoload_classmap.php
Ver ficheiro 

@@ -12,6 +12,7 @@ return array(
 
     'Identicon\\Generator\\ImageMagickGenerator' => $vendorDir . '/yzalis/identicon/src/Identicon/Generator/ImageMagickGenerator.php',
 
     'Identicon\\Identicon' => $vendorDir . '/yzalis/identicon/src/Identicon/Identicon.php',
 
     'PrivateBin\\Configuration' => $baseDir . '/lib/Configuration.php',
 
+    'PrivateBin\\Controller' => $baseDir . '/lib/Controller.php',
 
     'PrivateBin\\Data\\AbstractData' => $baseDir . '/lib/Data/AbstractData.php',
 
     'PrivateBin\\Data\\Database' => $baseDir . '/lib/Data/Database.php',
 
     'PrivateBin\\Data\\Filesystem' => $baseDir . '/lib/Data/Filesystem.php',
 
@@ -27,7 +28,6 @@ return array(
 
     'PrivateBin\\Persistence\\PurgeLimiter' => $baseDir . '/lib/Persistence/PurgeLimiter.php',
 
     'PrivateBin\\Persistence\\ServerSalt' => $baseDir . '/lib/Persistence/ServerSalt.php',
 
     'PrivateBin\\Persistence\\TrafficLimiter' => $baseDir . '/lib/Persistence/TrafficLimiter.php',
 
-    'PrivateBin\\PrivateBin' => $baseDir . '/lib/PrivateBin.php',
 
     'PrivateBin\\Request' => $baseDir . '/lib/Request.php',
 
     'PrivateBin\\Sjcl' => $baseDir . '/lib/Sjcl.php',
 
     'PrivateBin\\View' => $baseDir . '/lib/View.php',

+ 1 - 1
vendor/composer/autoload_static.php
Ver ficheiro 

@@ -41,6 +41,7 @@ class ComposerStaticInitDontChange
 
         'Identicon\\Generator\\ImageMagickGenerator' => __DIR__ . '/..' . '/yzalis/identicon/src/Identicon/Generator/ImageMagickGenerator.php',
 
         'Identicon\\Identicon' => __DIR__ . '/..' . '/yzalis/identicon/src/Identicon/Identicon.php',
 
         'PrivateBin\\Configuration' => __DIR__ . '/../..' . '/lib/Configuration.php',
 
+        'PrivateBin\\Controller' => __DIR__ . '/../..' . '/lib/Controller.php',
 
         'PrivateBin\\Data\\AbstractData' => __DIR__ . '/../..' . '/lib/Data/AbstractData.php',
 
         'PrivateBin\\Data\\Database' => __DIR__ . '/../..' . '/lib/Data/Database.php',
 
         'PrivateBin\\Data\\Filesystem' => __DIR__ . '/../..' . '/lib/Data/Filesystem.php',
 
@@ -56,7 +57,6 @@ class ComposerStaticInitDontChange
 
         'PrivateBin\\Persistence\\PurgeLimiter' => __DIR__ . '/../..' . '/lib/Persistence/PurgeLimiter.php',
 
         'PrivateBin\\Persistence\\ServerSalt' => __DIR__ . '/../..' . '/lib/Persistence/ServerSalt.php',
 
         'PrivateBin\\Persistence\\TrafficLimiter' => __DIR__ . '/../..' . '/lib/Persistence/TrafficLimiter.php',
 
-        'PrivateBin\\PrivateBin' => __DIR__ . '/../..' . '/lib/PrivateBin.php',
 
         'PrivateBin\\Request' => __DIR__ . '/../..' . '/lib/Request.php',
 
         'PrivateBin\\Sjcl' => __DIR__ . '/../..' . '/lib/Sjcl.php',
 
         'PrivateBin\\View' => __DIR__ . '/../..' . '/lib/View.php',