diff --git a/CHANGELOG.md b/CHANGELOG.md index b897b67..61d258c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # PrivateBin version history * **1.4.1 (not yet released)** + * ADDED: script for data storage backend migrations (#1012) * ADDED: Translations for Turkish, Slovak and Greek * ADDED: S3 Storage backend (#994) * CHANGED: Avoid `SUPER` privilege for setting the `sql_mode` for MariaDB/MySQL (#919) diff --git a/lib/Data/Database.php b/lib/Data/Database.php index 05952a9..f431858 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -481,7 +481,7 @@ class Database extends AbstractData // migrate filesystem based salt into database $file = 'data' . DIRECTORY_SEPARATOR . 'salt.php'; if ($namespace === 'salt' && is_readable($file)) { - $fs = new Filesystem(array('dir' => 'data')); + $fs = new Filesystem(array('dir' => 'data')); $value = $fs->getValue('salt'); $this->setValue($value, 'salt'); @unlink($file); diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php index 3dd6957..2d08214 100644 --- a/lib/Data/Filesystem.php +++ b/lib/Data/Filesystem.php @@ -409,29 +409,29 @@ class Filesystem extends AbstractData */ public function getAllPastes() { - $pastes = array(); + $pastes = array(); $subdirs = scandir($this->_path); if ($subdirs === false) { - dieerr("Unable to list directory " . $this->_path); + dieerr('Unable to list directory ' . $this->_path); } - $subdirs = preg_grep("/^[^.].$/", $subdirs); + $subdirs = preg_grep('/^[^.].$/', $subdirs); foreach ($subdirs as $subdir) { $subpath = $this->_path . DIRECTORY_SEPARATOR . $subdir; $subsubdirs = scandir($subpath); if ($subsubdirs === false) { - dieerr("Unable to list directory " . $subpath); + dieerr('Unable to list directory ' . $subpath); } - $subsubdirs = preg_grep("/^[^.].$/", $subsubdirs); + $subsubdirs = preg_grep('/^[^.].$/', $subsubdirs); foreach ($subsubdirs as $subsubdir) { $subsubpath = $subpath . DIRECTORY_SEPARATOR . $subsubdir; $files = scandir($subsubpath); if ($files === false) { - dieerr("Unable to list directory " . $subsubpath); + dieerr('Unable to list directory ' . $subsubpath); } - $files = preg_grep("/\.php$/", $files); + $files = preg_grep('/\.php$/', $files); foreach ($files as $file) { if (substr($file, 0, 4) === $subdir . $subsubdir) { diff --git a/lib/Data/GoogleCloudStorage.php b/lib/Data/GoogleCloudStorage.php index e271e2f..dd2aff3 100644 --- a/lib/Data/GoogleCloudStorage.php +++ b/lib/Data/GoogleCloudStorage.php @@ -353,7 +353,7 @@ class GoogleCloudStorage extends AbstractData public function getAllPastes() { $pastes = array(); - $prefix = $this->_prefix; + $prefix = $this->_prefix; if ($prefix != '') { $prefix .= '/'; } @@ -361,7 +361,7 @@ class GoogleCloudStorage extends AbstractData try { foreach ($this->_bucket->objects(array('prefix' => $prefix)) as $object) { $candidate = substr($object->name(), strlen($prefix)); - if (strpos($candidate, "/") === false) { + if (strpos($candidate, '/') === false) { $pastes[] = $candidate; } } diff --git a/lib/Data/S3Storage.php b/lib/Data/S3Storage.php index c59aaae..f274650 100644 --- a/lib/Data/S3Storage.php +++ b/lib/Data/S3Storage.php @@ -78,7 +78,7 @@ class S3Storage extends AbstractData * * @access public * @param array $options - * @return + * @return */ public function __construct(array $options) { @@ -453,15 +453,15 @@ class S3Storage extends AbstractData public function getAllPastes() { $pastes = array(); - $prefix = $this->_prefix; + $prefix = $this->_prefix; if ($prefix != '') { $prefix .= '/'; } try { foreach ($this->_listAllObjects($prefix) as $object) { - $candidate = substr($object["Key"], strlen($prefix)); - if (strpos($candidate, "/") === false) { + $candidate = substr($object['Key'], strlen($prefix)); + if (strpos($candidate, '/') === false) { $pastes[] = $candidate; } } diff --git a/lib/Model.php b/lib/Model.php index 94f7700..f7fdc23 100644 --- a/lib/Model.php +++ b/lib/Model.php @@ -81,7 +81,7 @@ class Model public function getStore() { if ($this->_store === null) { - $class = 'PrivateBin\\Data\\' . $this->_conf->getKey('class', 'model'); + $class = 'PrivateBin\\Data\\' . $this->_conf->getKey('class', 'model'); $this->_store = new $class($this->_conf->getSection('model_options')); } return $this->_store; diff --git a/tst/ModelTest.php b/tst/ModelTest.php index 0d715c2..cf04b4d 100644 --- a/tst/ModelTest.php +++ b/tst/ModelTest.php @@ -156,7 +156,7 @@ class ModelTest extends PHPUnit_Framework_TestCase public function testCommentDefaults() { - $class = 'PrivateBin\\Data\\' . $this->_conf->getKey('class', 'model'); + $class = 'PrivateBin\\Data\\' . $this->_conf->getKey('class', 'model'); $comment = new Comment( $this->_conf, new $class(