arno
/
privatebin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PHP < 5.6 compatibility and StyleCI recommendations

Browse Source
El RIDO 7 years ago
parent 6b87a6e0e1
commit f94f61a8c6
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File

6
lib/Configuration.php
Unescape View File

@ -27,7 +27,7 @@ class Configuration
* *
* @const string * @const string
*/ */
const PROTECTION_LINE = ';<?php http_response_code(403); /*' . PHP_EOL; const PROTECTION_LINE = ';<?php http_response_code(403); /*';
/** /**
* parsed configuration * parsed configuration
@ -114,7 +114,7 @@ class Configuration
// don't overwrite already converted file // don't overwrite already converted file
if (!is_file($configFile)) { if (!is_file($configFile)) {
$iniHandle = fopen($configIni, 'r', false, $context); $iniHandle = fopen($configIni, 'r', false, $context);
file_put_contents($configFile, self::PROTECTION_LINE); file_put_contents($configFile, self::PROTECTION_LINE . PHP_EOL);
file_put_contents($configFile, $iniHandle, FILE_APPEND); file_put_contents($configFile, $iniHandle, FILE_APPEND);
fclose($iniHandle); fclose($iniHandle);
} }
@ -126,7 +126,7 @@ class Configuration
if (is_readable($configIniSample)) { if (is_readable($configIniSample)) {
if (!is_readable($configSample)) { if (!is_readable($configSample)) {
$iniSampleHandle = fopen($configIniSample, 'r', false, $context); $iniSampleHandle = fopen($configIniSample, 'r', false, $context);
file_put_contents($configSample, self::PROTECTION_LINE); file_put_contents($configSample, self::PROTECTION_LINE . PHP_EOL);
file_put_contents($configSample, $iniSampleHandle, FILE_APPEND); file_put_contents($configSample, $iniSampleHandle, FILE_APPEND);
fclose($iniSampleHandle); fclose($iniSampleHandle);
} }

14
lib/Data/Filesystem.php
Unescape View File

@ -27,7 +27,7 @@ class Filesystem extends AbstractData
* *
* @const string * @const string
*/ */
const PROTECTION_LINE = '<?php http_response_code(403); /*' . PHP_EOL; const PROTECTION_LINE = '<?php http_response_code(403); /*';
/** /**
* directory where data is stored * directory where data is stored
@ -81,7 +81,7 @@ class Filesystem extends AbstractData
if (!is_dir($storagedir)) { if (!is_dir($storagedir)) {
mkdir($storagedir, 0700, true); mkdir($storagedir, 0700, true);
} }
return (bool) file_put_contents($storagedir . $pasteid . '.php', self::PROTECTION_LINE . Json::encode($paste)); return (bool) file_put_contents($storagedir . $pasteid . '.php', self::PROTECTION_LINE . PHP_EOL . Json::encode($paste));
} }
/** /**
@ -157,7 +157,7 @@ class Filesystem extends AbstractData
// don't overwrite already converted file // don't overwrite already converted file
if (!is_file($pastePath)) { if (!is_file($pastePath)) {
$handle = fopen($basePath, 'r', false, $context); $handle = fopen($basePath, 'r', false, $context);
file_put_contents($pastePath, self::PROTECTION_LINE); file_put_contents($pastePath, self::PROTECTION_LINE . PHP_EOL);
file_put_contents($pastePath, $handle, FILE_APPEND); file_put_contents($pastePath, $handle, FILE_APPEND);
fclose($handle); fclose($handle);
} }
@ -173,7 +173,7 @@ class Filesystem extends AbstractData
// don't overwrite already converted file // don't overwrite already converted file
if (!is_file($commentFilename)) { if (!is_file($commentFilename)) {
$handle = fopen($discdir . $filename, 'r', false, $context); $handle = fopen($discdir . $filename, 'r', false, $context);
file_put_contents($commentFilename, self::PROTECTION_LINE); file_put_contents($commentFilename, self::PROTECTION_LINE . PHP_EOL);
file_put_contents($commentFilename, $handle, FILE_APPEND); file_put_contents($commentFilename, $handle, FILE_APPEND);
fclose($handle); fclose($handle);
} }
@ -207,7 +207,7 @@ class Filesystem extends AbstractData
if (!is_dir($storagedir)) { if (!is_dir($storagedir)) {
mkdir($storagedir, 0700, true); mkdir($storagedir, 0700, true);
} }
return (bool) file_put_contents($storagedir . $filename, self::PROTECTION_LINE . Json::encode($comment)); return (bool) file_put_contents($storagedir . $filename, self::PROTECTION_LINE . PHP_EOL . Json::encode($comment));
} }
/** /**
@ -302,7 +302,7 @@ class Filesystem extends AbstractData
} }
$thirdLevel = array_filter( $thirdLevel = array_filter(
array_map( array_map(
function($filename) { function ($filename) {
return strlen($filename) >= 20 ? return strlen($filename) >= 20 ?
substr($filename, 0, -4) : substr($filename, 0, -4) :
$filename; $filename;
@ -434,6 +434,6 @@ class Filesystem extends AbstractData
*/ */
private static function _decodeFile($file) private static function _decodeFile($file)
{ {
return json_decode(substr(file_get_contents($file), strlen(self::PROTECTION_LINE))); return json_decode(substr(file_get_contents($file), strlen(self::PROTECTION_LINE . PHP_EOL)));
} }
} }

8
tst/Data/FilesystemTest.php
Unescape View File

@ -131,15 +131,15 @@ class FilesystemTest extends PHPUnit_Framework_TestCase
public function testOldFilesGetConverted() public function testOldFilesGetConverted()
{ {
// generate 10 (default purge batch size) pastes in the old format // generate 10 (default purge batch size) pastes in the old format
$paste = Helper::getPaste(); $paste = Helper::getPaste();
$comment = Helper::getComment(); $comment = Helper::getComment();
$commentid = Helper::getCommentId(); $commentid = Helper::getCommentId();
$ids = array(); $ids = array();
for ($i = 0, $max = 10; $i < $max; ++$i) { for ($i = 0, $max = 10; $i < $max; ++$i) {
// PHPs mt_rand only supports 32 bit or up 0x7fffffff on 64 bit systems to be precise :-/ // PHPs mt_rand only supports 32 bit or up 0x7fffffff on 64 bit systems to be precise :-/
$dataid = str_pad(dechex(mt_rand(0, mt_getrandmax())), 8, '0', STR_PAD_LEFT) . $dataid = str_pad(dechex(mt_rand(0, mt_getrandmax())), 8, '0', STR_PAD_LEFT) .
str_pad(dechex(mt_rand(0, mt_getrandmax())), 8, '0', STR_PAD_LEFT); str_pad(dechex(mt_rand(0, mt_getrandmax())), 8, '0', STR_PAD_LEFT);
$storagedir = $this->_path . DIRECTORY_SEPARATOR . substr($dataid, 0, 2) . $storagedir = $this->_path . DIRECTORY_SEPARATOR . substr($dataid, 0, 2) .
DIRECTORY_SEPARATOR . substr($dataid, 2, 2) . DIRECTORY_SEPARATOR; DIRECTORY_SEPARATOR . substr($dataid, 2, 2) . DIRECTORY_SEPARATOR;
$ids[$dataid] = $storagedir; $ids[$dataid] = $storagedir;

2
tst/PrivateBinTest.php
Unescape View File

@ -111,7 +111,7 @@ class PrivateBinTest extends PHPUnit_Framework_TestCase
*/ */
public function testViewUrlShortener() public function testViewUrlShortener()
{ {
$shortener = 'https://shortener.example.com/api?link='; $shortener = 'https://shortener.example.com/api?link=';
$options = parse_ini_file(CONF, true); $options = parse_ini_file(CONF, true);
$options['main']['urlshortener'] = $shortener; $options['main']['urlshortener'] = $shortener;
Helper::createIniFile(CONF, $options); Helper::createIniFile(CONF, $options);

1
tst/PrivateBinWithDbTest.php
Unescape View File

@ -1,7 +1,6 @@
<?php <?php
use PrivateBin\Data\Database; use PrivateBin\Data\Database;
use PrivateBin\Persistence\ServerSalt;
require_once 'PrivateBinTest.php'; require_once 'PrivateBinTest.php';

Write Preview
Loading…
Cancel
Save