From f9c8441edb66db0103de960c3b3ff74cb4cc3bfc Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sun, 29 Jul 2018 15:17:35 +0200 Subject: [PATCH] renaming controller #342 --- index.php | 2 +- lib/{PrivateBin.php => Controller.php} | 10 +-- lib/Data/Database.php | 10 +-- lib/Model/Paste.php | 6 +- ...{PrivateBinTest.php => ControllerTest.php} | 86 +++++++++---------- ...ithDbTest.php => ControllerWithDbTest.php} | 4 +- tst/Data/DatabaseTest.php | 4 +- tst/JsonApiTest.php | 22 ++--- vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_static.php | 2 +- 10 files changed, 74 insertions(+), 74 deletions(-) rename lib/{PrivateBin.php => Controller.php} (99%) rename tst/{PrivateBinTest.php => ControllerTest.php} (97%) rename tst/{PrivateBinWithDbTest.php => ControllerWithDbTest.php} (92%) diff --git a/index.php b/index.php index ef9cb608..5be37e3b 100644 --- a/index.php +++ b/index.php @@ -15,4 +15,4 @@ define('PATH', ''); define('PUBLIC_PATH', __DIR__); require PATH . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; -new PrivateBin\PrivateBin; +new PrivateBin\Controller; diff --git a/lib/PrivateBin.php b/lib/Controller.php similarity index 99% rename from lib/PrivateBin.php rename to lib/Controller.php index 4d0df3f4..7060e44e 100644 --- a/lib/PrivateBin.php +++ b/lib/Controller.php @@ -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 */ diff --git a/lib/Data/Database.php b/lib/Data/Database.php index e609f250..4627f4f0 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -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') ); } } diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php index c0d7e6de..e5cee7f4 100644 --- a/lib/Model/Paste.php +++ b/lib/Model/Paste.php @@ -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(); diff --git a/tst/PrivateBinTest.php b/tst/ControllerTest.php similarity index 97% rename from tst/PrivateBinTest.php rename to tst/ControllerTest.php index 7b953b0c..48705677 100644 --- a/tst/PrivateBinTest.php +++ b/tst/ControllerTest.php @@ -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( diff --git a/tst/PrivateBinWithDbTest.php b/tst/ControllerWithDbTest.php similarity index 92% rename from tst/PrivateBinWithDbTest.php rename to tst/ControllerWithDbTest.php index 25e6082b..e3c67054 100644 --- a/tst/PrivateBinWithDbTest.php +++ b/tst/ControllerWithDbTest.php @@ -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, diff --git a/tst/Data/DatabaseTest.php b/tst/Data/DatabaseTest.php index 4e06586c..dbd6ad55 100644 --- a/tst/Data/DatabaseTest.php +++ b/tst/Data/DatabaseTest.php @@ -1,7 +1,7 @@ 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); } } diff --git a/tst/JsonApiTest.php b/tst/JsonApiTest.php index 8588aca7..65fcf014 100644 --- a/tst/JsonApiTest.php +++ b/tst/JsonApiTest.php @@ -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'); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 8f36d522..2a560ae6 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -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', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index bc6ffd2f..1f260993 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -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',