hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use rhumsaa/uuid instead of custom uuid implementation

Browse Source
This commit is contained in:
Romain Neutron
2014-03-02 23:41:41 +01:00
parent 31de811cf5
commit bb7267eafb
13 changed files with 90 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/Bridge/Api/Youtube.php
View File

@@ -9,6 +9,7 @@
* file that was distributed with this source code.
*/
use Rhumsaa\Uuid\Uuid;
use Symfony\Component\HttpFoundation\Request;
class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Interface
@@ -829,7 +830,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
$this->_api = new Zend_Gdata_YouTube(
$http_client,
uuid::generate_v4(),
Uuid::uuid4(),
$this->conf->get(['main', 'bridge', 'youtube', 'client_id']),
$this->conf->get(['main', 'bridge', 'youtube', 'developer_key']));
$this->_api->setMajorProtocolVersion(2);

3
lib/classes/record/adapter.php
View File

@@ -19,6 +19,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Doctrine\ORM\EntityManager;
use MediaVorus\MediaVorus;
use Rhumsaa\Uuid\Uuid;
use Symfony\Component\HttpFoundation\File\File as SymfoFile;
class record_adapter implements record_Interface, cache_cacheableInterface
@@ -1190,7 +1191,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
':parent_record_id' => 1,
':type' => 'unknown',
':sha256' => null,
':uuid' => \uuid::generate_v4(),
':uuid' => Uuid::uuid4(),
':originalname' => null,
':mime' => null,
]);

154
lib/classes/uuid.php
View File

@@ -1,154 +0,0 @@
<?php
/*
* @author Andrew Moore
*
* Originally found at: http://www.php.net/manual/en/function.uniqid.php#94959
*/
class uuid
{
/**
* @desc UUID named based version that use MD5(hash)
* @param string $namespace
* @param string $name
* @return string
*/
public static function generate_v3($namespace, $name)
{
if ( ! self::is_valid($namespace)) {
return false;
}
// Get hexadecimal components of namespace
$nhex = str_replace(['-', '{', '}'], '', $namespace);
// Binary Value
$nstr = '';
// Convert Namespace UUID to bits
$length = strlen($nhex);
for ($i = 0; $i < $length; $i+=2) {
$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
}
// Calculate hash value
$hash = md5($nstr . $name);
return sprintf('%08s-%04s-%04x-%04x-%12s',
// 32 bits for "time_low"
substr($hash, 0, 8),
// 16 bits for "time_mid"
substr($hash, 8, 4),
// 16 bits for "time_hi_and_version",
// four most significant bits holds version number 3
(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
// 16 bits, 8 bits for "clk_seq_hi_res",
// 8 bits for "clk_seq_low",
// two most significant bits holds zero and one for variant DCE1.1
(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
// 48 bits for "node"
substr($hash, 20, 12)
);
}
/**
* @desc UUID randomly generated version
* @return string
*/
public static function generate_v4()
{
return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
// 32 bits for "time_low"
mt_rand(0, 0xffff), mt_rand(0, 0xffff),
// 16 bits for "time_mid"
mt_rand(0, 0xffff),
// 16 bits for "time_hi_and_version",
// four most significant bits holds version number 4
mt_rand(0, 0x0fff) | 0x4000,
// 16 bits, 8 bits for "clk_seq_hi_res",
// 8 bits for "clk_seq_low",
// two most significant bits holds zero and one for variant DCE1.1
mt_rand(0, 0x3fff) | 0x8000,
// 48 bits for "node"
mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
);
}
/**
* @desc UUID named version that use SHA-1 hashing
* @param string $namespace
* @param string $name
* @return string
*/
public static function generate_v5($namespace, $name)
{
if ( ! self::is_valid($namespace)) {
return false;
}
// Get hexadecimal components of namespace
$nhex = str_replace(['-', '{', '}'], '', $namespace);
// Binary Value
$nstr = '';
// Convert Namespace UUID to bits
$length = strlen($nhex);
for ($i = 0; $i < $length; $i+=2) {
$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
}
// Calculate hash value
$hash = sha1($nstr . $name);
return sprintf('%08s-%04s-%04x-%04x-%12s',
// 32 bits for "time_low"
substr($hash, 0, 8),
// 16 bits for "time_mid"
substr($hash, 8, 4),
// 16 bits for "time_hi_and_version",
// four most significant bits holds version number 5
(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
// 16 bits, 8 bits for "clk_seq_hi_res",
// 8 bits for "clk_seq_low",
// two most significant bits holds zero and one for variant DCE1.1
(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
// 48 bits for "node"
substr($hash, 20, 12)
);
}
/**
* @desc check if an uuid is a valid one
* @param string $uuid
* @return boolean
*/
public static function is_valid($uuid)
{
return preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/i', $uuid) === 1;
}
/**
* @desc Compare two UUID's "lexically"
* @param stiring $uuid1
* @param string $uuid2
* @return int
* -1 uuid1<uuid2 0 uuid1==uuid2 +1 uuid1>uuid2
*/
public static function compare($uuid1, $uuid2)
{
return (strcmp($uuid1, $uuid2) === 0);
}
/**
* @desc Check wheter an UUID is the NULL UUID 00000000-0000-0000-0000-000000000000
* @return string
*/
public static function is_null($uuid)
{
return (0 === strcmp($uuid, '00000000-0000-0000-0000-000000000000'));
}
}