cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Laravel 5.6 updates

Browse Source 
Travis config update

Removed HHVM script as Laravel no longer support HHVM after releasing 5.3
This commit is contained in:
Manish Verma
2018-08-06 20:08:55 +05:30
parent 126fbb0255
commit 1ac0f42a58
2464 changed files with 65239 additions and 46734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
vendor/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php vendored
View File

@@ -11,6 +11,7 @@
namespace DebugBar\Storage;
use Memcached;
use ReflectionMethod;
/**
* Stores collected data into Memcache using the Memcached extension
@@ -21,13 +22,20 @@ class MemcachedStorage implements StorageInterface
protected $keyNamespace;
protected $expiration;
protected $newGetMultiSignature;
/**
* @param Memcached $memcached
* @param string $keyNamespace Namespace for Memcached key names (to avoid conflict with other Memcached users).
* @param int $expiration Expiration for Memcached entries (see Expiration Times in Memcached documentation).
*/
public function __construct(Memcached $memcached, $keyNamespace = 'phpdebugbar')
public function __construct(Memcached $memcached, $keyNamespace = 'phpdebugbar', $expiration = 0)
{
$this->memcached = $memcached;
$this->keyNamespace = $keyNamespace;
$this->expiration = $expiration;
}
/**
@@ -36,9 +44,12 @@ class MemcachedStorage implements StorageInterface
public function save($id, $data)
{
$key = $this->createKey($id);
$this->memcached->set($key, $data);
$this->memcached->set($key, $data, $this->expiration);
if (!$this->memcached->append($this->keyNamespace, "|$key")) {
$this->memcached->set($this->keyNamespace, $key);
$this->memcached->set($this->keyNamespace, $key, $this->expiration);
} else if ($this->expiration) {
// append doesn't support updating expiration, so do it here:
$this->memcached->touch($this->keyNamespace, $this->expiration);
}
}
@@ -60,15 +71,32 @@ class MemcachedStorage implements StorageInterface
}
$results = array();
foreach (explode('|', $keys) as $key) {
if ($data = $this->memcached->get($key)) {
$meta = $data['__meta'];
if ($this->filter($meta, $filters)) {
$results[] = $meta;
$keys = array_reverse(explode('|', $keys)); // Reverse so newest comes first
$keyPosition = 0; // Index in $keys to try to get next items from
$remainingItems = $max + $offset; // Try to obtain this many remaining items
// Loop until we've found $remainingItems matching items or no more items may exist.
while ($remainingItems > 0 && $keyPosition < count($keys)) {
// Consume some keys from $keys:
$itemsToGet = array_slice($keys, $keyPosition, $remainingItems);
$keyPosition += $remainingItems;
// Try to get them, and filter them:
$newItems = $this->memcachedGetMulti($itemsToGet, Memcached::GET_PRESERVE_ORDER);
if ($newItems) {
foreach ($newItems as $data) {
$meta = $data['__meta'];
if ($this->filter($meta, $filters)) {
$remainingItems--;
// Keep the result only if we've discarded $offset items first
if ($offset <= 0) {
$results[] = $meta;
} else {
$offset--;
}
}
}
}
}
return array_slice($results, $offset, $max);
return $results;
}
/**
@@ -108,4 +136,23 @@ class MemcachedStorage implements StorageInterface
{
return md5("{$this->keyNamespace}.$id");
}
/**
* The memcached getMulti function changed in version 3.0.0 to only have two parameters.
*
* @param array $keys
* @param int $flags
*/
protected function memcachedGetMulti($keys, $flags)
{
if ($this->newGetMultiSignature === null) {
$this->newGetMultiSignature = (new ReflectionMethod('Memcached', 'getMulti'))->getNumberOfParameters() === 2;
}
if ($this->newGetMultiSignature) {
return $this->memcached->getMulti($keys, $flags);
} else {
$null = null;
return $this->memcached->getMulti($keys, $null, $flags);
}
}
}

32
vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php vendored
View File

@@ -10,8 +10,6 @@
namespace DebugBar\Storage;
use Predis\Client;
/**
* Stores collected data into Redis
*/
@@ -25,7 +23,7 @@ class RedisStorage implements StorageInterface
* @param \Predis\Client $redis Redis Client
* @param string $hash
*/
public function __construct(Client $redis, $hash = 'phpdebugbar')
public function __construct($redis, $hash = 'phpdebugbar')
{
$this->redis = $redis;
$this->hash = $hash;
@@ -36,7 +34,9 @@ class RedisStorage implements StorageInterface
*/
public function save($id, $data)
{
$this->redis->hset($this->hash, $id, serialize($data));
$this->redis->hset("$this->hash:meta", $id, serialize($data['__meta']));
unset($data['__meta']);
$this->redis->hset("$this->hash:data", $id, serialize($data));
}
/**
@@ -44,7 +44,8 @@ class RedisStorage implements StorageInterface
*/
public function get($id)
{
return unserialize($this->redis->hget($this->hash, $id));
return array_merge(unserialize($this->redis->hget("$this->hash:data", $id)),
array('__meta' => unserialize($this->redis->hget("$this->hash:meta", $id))));
}
/**
@@ -53,14 +54,23 @@ class RedisStorage implements StorageInterface
public function find(array $filters = array(), $max = 20, $offset = 0)
{
$results = array();
foreach ($this->redis->hgetall($this->hash) as $id => $data) {
if ($data = unserialize($data)) {
$meta = $data['__meta'];
if ($this->filter($meta, $filters)) {
$results[] = $meta;
$cursor = "0";
do {
list($cursor, $data) = $this->redis->hscan("$this->hash:meta", $cursor);
foreach ($data as $meta) {
if ($meta = unserialize($meta)) {
if ($this->filter($meta, $filters)) {
$results[] = $meta;
}
}
}
}
} while($cursor);
usort($results, function ($a, $b) {
return $a['utime'] < $b['utime'];
});
return array_slice($results, $offset, $max);
}