Larval framework upated to v5.6.33

Updated laravel frameowrk version to as suggested for security patch update which was released in v5.6.30
This commit is contained in:
Manish Verma
2018-08-15 18:38:24 +05:30
parent 5d3ffdf379
commit 8148bbd920
319 changed files with 647 additions and 1078 deletions

View File

@@ -1,6 +1,8 @@
<?php
namespace Aws\Endpoint;
use JmesPath\Env;
class PartitionEndpointProvider
{
/** @var Partition[] */
@@ -51,7 +53,7 @@ class PartitionEndpointProvider
* the provided name can be found.
*
* @param string $name
*
*
* @return Partition|null
*/
public function getPartitionByName($name)
@@ -71,7 +73,36 @@ class PartitionEndpointProvider
public static function defaultProvider()
{
$data = \Aws\load_compiled_json(__DIR__ . '/../data/endpoints.json');
$prefixData = \Aws\load_compiled_json(__DIR__ . '/../data/endpoints_prefix_history.json');
$mergedData = self::mergePrefixData($data, $prefixData);
return new self($data['partitions']);
return new self($mergedData['partitions']);
}
/**
* Copy endpoint data for other prefixes used by a given service
*
* @param $data
* @param $prefixData
* @return array
*/
public static function mergePrefixData($data, $prefixData)
{
$prefixGroups = $prefixData['prefix-groups'];
foreach ($data["partitions"] as $index => $partition) {
foreach ($prefixGroups as $current => $old) {
$serviceData = Env::search("services.{$current}", $partition);
if (!empty($serviceData)) {
foreach ($old as $prefix) {
if (empty(Env::search("services.{$prefix}", $partition))) {
$data["partitions"][$index]["services"][$prefix] = $serviceData;
}
}
}
}
}
return $data;
}
}