-
-
Save danslo/d5a96cdaffa0b35113dea8082a49d0f0 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ../p5/./vendor/composer/installed.php 2023-10-10 13:51:46.596160418 +0200 | |
+++ ./vendor/composer/installed.php 2023-10-10 13:51:14.100324341 +0200 | |
@@ -1,8 +1,8 @@ | |
<?php return array( | |
'root' => array( | |
'name' => 'magento/project-community-edition', | |
- 'pretty_version' => '2.4.4-p5', | |
- 'version' => '2.4.4.0-patch5', | |
+ 'pretty_version' => '2.4.4-p6', | |
+ 'version' => '2.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'project', | |
'install_path' => __DIR__ . '/../../', | |
@@ -827,8 +827,8 @@ | |
), | |
), | |
'magento/adobe-ims' => array( | |
- 'pretty_version' => '2.1.3-p5', | |
- 'version' => '2.1.3.0-patch5', | |
+ 'pretty_version' => '2.1.3-p6', | |
+ 'version' => '2.1.3.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
@@ -836,8 +836,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/adobe-stock-integration' => array( | |
- 'pretty_version' => '2.1.3-p5', | |
- 'version' => '2.1.3.0-patch5', | |
+ 'pretty_version' => '2.1.3-p6', | |
+ 'version' => '2.1.3.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
@@ -872,8 +872,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/framework' => array( | |
- 'pretty_version' => '103.0.4-p5', | |
- 'version' => '103.0.4.0-patch5', | |
+ 'pretty_version' => '103.0.4-p6', | |
+ 'version' => '103.0.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-library', | |
'install_path' => __DIR__ . '/../magento/framework', | |
@@ -926,8 +926,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/inventory-metapackage' => array( | |
- 'pretty_version' => '1.2.4-p5', | |
- 'version' => '1.2.4.0-patch5', | |
+ 'pretty_version' => '1.2.4-p6', | |
+ 'version' => '1.2.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
@@ -1016,8 +1016,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/magento2-base' => array( | |
- 'pretty_version' => '2.4.4-p5', | |
- 'version' => '2.4.4.0-patch5', | |
+ 'pretty_version' => '2.4.4-p6', | |
+ 'version' => '2.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-component', | |
'install_path' => __DIR__ . '/../magento/magento2-base', | |
@@ -1295,8 +1295,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-catalog' => array( | |
- 'pretty_version' => '104.0.4-p4', | |
- 'version' => '104.0.4.0-patch4', | |
+ 'pretty_version' => '104.0.4-p6', | |
+ 'version' => '104.0.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-catalog', | |
@@ -1601,8 +1601,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-currency-symbol' => array( | |
- 'pretty_version' => '100.4.3', | |
- 'version' => '100.4.3.0', | |
+ 'pretty_version' => '100.4.3-p6', | |
+ 'version' => '100.4.3.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-currency-symbol', | |
@@ -1610,8 +1610,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-customer' => array( | |
- 'pretty_version' => '103.0.4-p4', | |
- 'version' => '103.0.4.0-patch4', | |
+ 'pretty_version' => '103.0.4-p6', | |
+ 'version' => '103.0.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-customer', | |
@@ -3032,8 +3032,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-page-builder' => array( | |
- 'pretty_version' => '2.2.2-p5', | |
- 'version' => '2.2.2.0-patch5', | |
+ 'pretty_version' => '2.2.2-p6', | |
+ 'version' => '2.2.2.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-page-builder', | |
@@ -3059,8 +3059,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-page-cache' => array( | |
- 'pretty_version' => '100.4.4-p3', | |
- 'version' => '100.4.4.0-patch3', | |
+ 'pretty_version' => '100.4.4-p6', | |
+ 'version' => '100.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-page-cache', | |
@@ -3113,8 +3113,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-persistent' => array( | |
- 'pretty_version' => '100.4.4', | |
- 'version' => '100.4.4.0', | |
+ 'pretty_version' => '100.4.4-p6', | |
+ 'version' => '100.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-persistent', | |
@@ -3536,8 +3536,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-sales-rule' => array( | |
- 'pretty_version' => '101.2.4', | |
- 'version' => '101.2.4.0', | |
+ 'pretty_version' => '101.2.4-p6', | |
+ 'version' => '101.2.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-sales-rule', | |
@@ -3725,8 +3725,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-theme' => array( | |
- 'pretty_version' => '101.1.4', | |
- 'version' => '101.1.4.0', | |
+ 'pretty_version' => '101.1.4-p6', | |
+ 'version' => '101.1.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-theme', | |
@@ -3806,8 +3806,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/module-usps' => array( | |
- 'pretty_version' => '100.4.3-p4', | |
- 'version' => '100.4.3.0-patch4', | |
+ 'pretty_version' => '100.4.3-p6', | |
+ 'version' => '100.4.3.0-patch6', | |
'reference' => NULL, | |
'type' => 'magento2-module', | |
'install_path' => __DIR__ . '/../magento/module-usps', | |
@@ -3932,8 +3932,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/page-builder' => array( | |
- 'pretty_version' => '1.7.1-p5', | |
- 'version' => '1.7.1.0-patch5', | |
+ 'pretty_version' => '1.7.1-p6', | |
+ 'version' => '1.7.1.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
@@ -3941,8 +3941,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/product-community-edition' => array( | |
- 'pretty_version' => '2.4.4-p5', | |
- 'version' => '2.4.4.0-patch5', | |
+ 'pretty_version' => '2.4.4-p6', | |
+ 'version' => '2.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
@@ -3950,8 +3950,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/project-community-edition' => array( | |
- 'pretty_version' => '2.4.4-p5', | |
- 'version' => '2.4.4.0-patch5', | |
+ 'pretty_version' => '2.4.4-p6', | |
+ 'version' => '2.4.4.0-patch6', | |
'reference' => NULL, | |
'type' => 'project', | |
'install_path' => __DIR__ . '/../../', | |
@@ -3959,8 +3959,8 @@ | |
'dev_requirement' => false, | |
), | |
'magento/security-package' => array( | |
- 'pretty_version' => '1.1.3-p5', | |
- 'version' => '1.1.3.0-patch5', | |
+ 'pretty_version' => '1.1.3-p6', | |
+ 'version' => '1.1.3.0-patch6', | |
'reference' => NULL, | |
'type' => 'metapackage', | |
'install_path' => NULL, | |
--- ../p5/./vendor/composer/autoload_static.php 2023-10-10 13:51:46.908158844 +0200 | |
+++ ./vendor/composer/autoload_static.php 2023-10-10 13:51:14.456322545 +0200 | |
@@ -4,7 +4,7 @@ | |
namespace Composer\Autoload; | |
-class ComposerStaticInit789187619809001ddb5c560c324ddb86 | |
+class ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd | |
{ | |
public static $files = array ( | |
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', | |
@@ -3876,11 +3876,11 @@ | |
public static function getInitializer(ClassLoader $loader) | |
{ | |
return \Closure::bind(function () use ($loader) { | |
- $loader->prefixLengthsPsr4 = ComposerStaticInit789187619809001ddb5c560c324ddb86::$prefixLengthsPsr4; | |
- $loader->prefixDirsPsr4 = ComposerStaticInit789187619809001ddb5c560c324ddb86::$prefixDirsPsr4; | |
- $loader->prefixesPsr0 = ComposerStaticInit789187619809001ddb5c560c324ddb86::$prefixesPsr0; | |
- $loader->fallbackDirsPsr0 = ComposerStaticInit789187619809001ddb5c560c324ddb86::$fallbackDirsPsr0; | |
- $loader->classMap = ComposerStaticInit789187619809001ddb5c560c324ddb86::$classMap; | |
+ $loader->prefixLengthsPsr4 = ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$prefixLengthsPsr4; | |
+ $loader->prefixDirsPsr4 = ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$prefixDirsPsr4; | |
+ $loader->prefixesPsr0 = ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$prefixesPsr0; | |
+ $loader->fallbackDirsPsr0 = ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$fallbackDirsPsr0; | |
+ $loader->classMap = ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$classMap; | |
}, null, ClassLoader::class); | |
} | |
--- ../p5/./vendor/composer/autoload_real.php 2023-10-10 13:51:46.908158844 +0200 | |
+++ ./vendor/composer/autoload_real.php 2023-10-10 13:51:14.456322545 +0200 | |
@@ -2,7 +2,7 @@ | |
// autoload_real.php @generated by Composer | |
-class ComposerAutoloaderInit789187619809001ddb5c560c324ddb86 | |
+class ComposerAutoloaderInite3976ee5e7c3bf48dc4aeca887bcc8fd | |
{ | |
private static $loader; | |
@@ -22,20 +22,20 @@ | |
return self::$loader; | |
} | |
- spl_autoload_register(array('ComposerAutoloaderInit789187619809001ddb5c560c324ddb86', 'loadClassLoader'), true, true); | |
+ spl_autoload_register(array('ComposerAutoloaderInite3976ee5e7c3bf48dc4aeca887bcc8fd', 'loadClassLoader'), true, true); | |
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); | |
- spl_autoload_unregister(array('ComposerAutoloaderInit789187619809001ddb5c560c324ddb86', 'loadClassLoader')); | |
+ spl_autoload_unregister(array('ComposerAutoloaderInite3976ee5e7c3bf48dc4aeca887bcc8fd', 'loadClassLoader')); | |
$includePaths = require __DIR__ . '/include_paths.php'; | |
$includePaths[] = get_include_path(); | |
set_include_path(implode(PATH_SEPARATOR, $includePaths)); | |
require __DIR__ . '/autoload_static.php'; | |
- call_user_func(\Composer\Autoload\ComposerStaticInit789187619809001ddb5c560c324ddb86::getInitializer($loader)); | |
+ call_user_func(\Composer\Autoload\ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::getInitializer($loader)); | |
$loader->register(true); | |
- $filesToLoad = \Composer\Autoload\ComposerStaticInit789187619809001ddb5c560c324ddb86::$files; | |
+ $filesToLoad = \Composer\Autoload\ComposerStaticInite3976ee5e7c3bf48dc4aeca887bcc8fd::$files; | |
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) { | |
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { | |
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; | |
--- ../p5/./vendor/magento/framework/App/Http/Context.php 2023-07-21 11:20:50.000000000 +0200 | |
+++ ./vendor/magento/framework/App/Http/Context.php 2023-09-11 17:11:40.000000000 +0200 | |
@@ -5,7 +5,9 @@ | |
*/ | |
namespace Magento\Framework\App\Http; | |
+use Magento\Framework\App\DeploymentConfig; | |
use Magento\Framework\App\ObjectManager; | |
+use Magento\Framework\Config\ConfigOptionsListConstants; | |
use Magento\Framework\Serialize\Serializer\Json; | |
/** | |
@@ -16,7 +18,7 @@ | |
/** | |
* Currency cache context | |
*/ | |
- const CONTEXT_CURRENCY = 'current_currency'; | |
+ public const CONTEXT_CURRENCY = 'current_currency'; | |
/** | |
* Data storage | |
@@ -36,6 +38,11 @@ | |
private $serializer; | |
/** | |
+ * @var DeploymentConfig | |
+ */ | |
+ private DeploymentConfig $deploymentConfig; | |
+ | |
+ /** | |
* @param array $data | |
* @param array $default | |
* @param Json|null $serializer | |
@@ -112,8 +119,11 @@ | |
{ | |
$data = $this->getData(); | |
if (!empty($data)) { | |
+ $salt = (string)$this->getDeploymentConfig()->get( | |
+ ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY | |
+ ); | |
ksort($data); | |
- return sha1($this->serializer->serialize($data)); | |
+ return hash('sha256', $this->serializer->serialize($data) . '|' . $salt); | |
} | |
return null; | |
} | |
@@ -130,4 +140,18 @@ | |
'default' => $this->default | |
]; | |
} | |
+ | |
+ /** | |
+ * Get DeploymentConfig | |
+ * | |
+ * @return DeploymentConfig | |
+ */ | |
+ private function getDeploymentConfig() : DeploymentConfig | |
+ { | |
+ if (!isset($this->deploymentConfig)) { | |
+ $this->deploymentConfig = ObjectManager::getInstance() | |
+ ->get(DeploymentConfig::class); | |
+ } | |
+ return $this->deploymentConfig; | |
+ } | |
} | |
--- ../p5/./vendor/magento/framework/Url/Validator.php 2023-07-21 11:20:52.000000000 +0200 | |
+++ ./vendor/magento/framework/Url/Validator.php 2023-09-11 17:11:40.000000000 +0200 | |
@@ -16,7 +16,7 @@ | |
/**#@+ | |
* Error keys | |
*/ | |
- const INVALID_URL = 'invalidUrl'; | |
+ public const INVALID_URL = 'invalidUrl'; | |
/**#@-*/ | |
/** | |
@@ -55,10 +55,14 @@ | |
$valid = $this->validator->isValid($value); | |
- if (!$valid) { | |
- $this->_error(self::INVALID_URL); | |
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction | |
+ $protocol = parse_url($value ? $value : '', PHP_URL_SCHEME); | |
+ if ($valid && ($protocol === 'https' || $protocol === 'http')) { | |
+ return true; | |
} | |
- return $valid; | |
+ $this->_error(self::INVALID_URL); | |
+ | |
+ return false; | |
} | |
} | |
--- ../p5/./vendor/magento/module-page-cache/Controller/Block.php 2023-02-13 23:18:06.000000000 +0100 | |
+++ ./vendor/magento/module-page-cache/Controller/Block.php 2023-09-27 23:24:22.000000000 +0200 | |
@@ -8,16 +8,19 @@ | |
namespace Magento\PageCache\Controller; | |
+use Magento\Framework\App\Action\Context; | |
use Magento\Framework\Serialize\Serializer\Base64Json; | |
use Magento\Framework\Serialize\Serializer\Json; | |
+use Magento\Framework\Translate\InlineInterface; | |
use Magento\Framework\Validator\RegexFactory; | |
use Magento\Framework\App\ObjectManager; | |
use Magento\Framework\View\Layout\LayoutCacheKeyInterface; | |
+use Magento\Framework\App\Config\ScopeConfigInterface; | |
abstract class Block extends \Magento\Framework\App\Action\Action | |
{ | |
/** | |
- * @var \Magento\Framework\Translate\InlineInterface | |
+ * @var InlineInterface | |
*/ | |
protected $translateInline; | |
@@ -54,20 +57,32 @@ | |
private const VALIDATION_RULE_PATTERN = '/^[a-z0-9]+[a-z0-9_]*$/i'; | |
/** | |
- * @param \Magento\Framework\App\Action\Context $context | |
- * @param \Magento\Framework\Translate\InlineInterface $translateInline | |
- * @param Json $jsonSerializer | |
- * @param Base64Json $base64jsonSerializer | |
- * @param LayoutCacheKeyInterface $layoutCacheKey | |
+ * @var ScopeConfigInterface | |
+ */ | |
+ private $config; | |
+ | |
+ /** | |
+ * Handle size system name | |
+ */ | |
+ private const XML_HANDLES_SIZE = 'system/full_page_cache/handles_size'; | |
+ | |
+ /** | |
+ * @param Context $context | |
+ * @param InlineInterface $translateInline | |
+ * @param Json|null $jsonSerializer | |
+ * @param Base64Json|null $base64jsonSerializer | |
+ * @param LayoutCacheKeyInterface|null $layoutCacheKey | |
* @param RegexFactory|null $regexValidatorFactory | |
+ * @param ScopeConfigInterface|null $scopeConfig | |
*/ | |
public function __construct( | |
- \Magento\Framework\App\Action\Context $context, | |
- \Magento\Framework\Translate\InlineInterface $translateInline, | |
+ Context $context, | |
+ InlineInterface $translateInline, | |
Json $jsonSerializer = null, | |
Base64Json $base64jsonSerializer = null, | |
LayoutCacheKeyInterface $layoutCacheKey = null, | |
- ?RegexFactory $regexValidatorFactory = null | |
+ ?RegexFactory $regexValidatorFactory = null, | |
+ ScopeConfigInterface $scopeConfig = null | |
) { | |
parent::__construct($context); | |
$this->translateInline = $translateInline; | |
@@ -79,6 +94,8 @@ | |
?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class); | |
$this->regexValidatorFactory = $regexValidatorFactory | |
?: ObjectManager::getInstance()->get(RegexFactory::class); | |
+ $this->config = $scopeConfig | |
+ ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class); | |
} | |
/** | |
@@ -96,6 +113,10 @@ | |
} | |
$blocks = $this->jsonSerializer->unserialize($blocks); | |
$handles = $this->base64jsonSerializer->unserialize($handles); | |
+ $handlesSize = (int)$this->config->getValue(self::XML_HANDLES_SIZE); | |
+ $handles = ($handlesSize && count($handles) > $handlesSize) | |
+ ? array_splice($handles, 0, $handlesSize) : $handles; | |
+ | |
if (!$this->validateHandleParam($handles)) { | |
return []; | |
} | |
--- ../p5/./vendor/magento/module-customer/Plugin/Webapi/Controller/Rest/ValidateCustomerData.php 2023-05-16 17:11:06.000000000 +0200 | |
+++ ./vendor/magento/module-customer/Plugin/Webapi/Controller/Rest/ValidateCustomerData.php 2023-09-11 17:11:34.000000000 +0200 | |
@@ -28,8 +28,8 @@ | |
*/ | |
public function beforeOverride(ParamsOverrider $subject, array $inputData, array $parameters): array | |
{ | |
- if (isset($inputData[self:: CUSTOMER_KEY])) { | |
- $inputData[self:: CUSTOMER_KEY] = $this->validateInputData($inputData[self:: CUSTOMER_KEY]); | |
+ if (isset($inputData[self::CUSTOMER_KEY])) { | |
+ $inputData[self::CUSTOMER_KEY] = $this->validateInputData($inputData[self::CUSTOMER_KEY]); | |
} | |
return [$inputData, $parameters]; | |
} | |
@@ -43,9 +43,8 @@ | |
private function validateInputData(array $inputData): array | |
{ | |
$result = []; | |
- | |
$data = array_filter($inputData, function ($k) use (&$result) { | |
- $key = is_string($k) ? strtolower($k) : $k; | |
+ $key = is_string($k) ? strtolower(str_replace('_', "", $k)) : $k; | |
return !isset($result[$key]) && ($result[$key] = true); | |
}, ARRAY_FILTER_USE_KEY); | |
--- ../p5/./vendor/magento/module-usps/Helper/Data.php 2023-05-16 17:11:08.000000000 +0200 | |
+++ ./vendor/magento/module-usps/Helper/Data.php 2023-09-11 17:11:38.000000000 +0200 | |
@@ -8,12 +8,12 @@ | |
use Magento\Framework\App\Helper\AbstractHelper; | |
/** | |
- * Usps data helper | |
+ * USPS Allowed shipping methods | |
*/ | |
class Data extends AbstractHelper | |
{ | |
/** | |
- * Available shipping methods | |
+ * Shipping methods | |
* | |
* @var array | |
*/ | |
@@ -36,6 +36,14 @@ | |
'usps_INT_14', // First-Class Mail International Large Envelope | |
'usps_INT_16', // Priority Mail International Small Flat Rate Box | |
'usps_INT_20', // Priority Mail International Small Flat Rate Envelope | |
+ '1058', // Ground Advantage™ | |
+ '4058', // Ground Advantage™ HAZMAT | |
+ '6058', // Ground Advantage™ Parcel locker | |
+ '2058', // Ground Advantage™ Hold for pickup | |
+ '4096', // Ground Advantage™ Cubic HAZMAT | |
+ '1096', // Ground Advantage™ Cubic | |
+ '2096', // Ground Advantage™ Cubic Hold for pickup | |
+ '6096', // Ground Advantage™ Cubic Parcel locker | |
]; | |
/** | |
--- ../p5/./vendor/magento/module-usps/Model/Carrier.php 2023-05-16 17:11:08.000000000 +0200 | |
+++ ./vendor/magento/module-usps/Model/Carrier.php 2023-09-11 17:11:38.000000000 +0200 | |
@@ -809,6 +809,14 @@ | |
'INT_24' => __('Priority Mail International DVD Flat Rate priced box'), | |
'INT_25' => __('Priority Mail International Large Video Flat Rate priced box'), | |
'INT_27' => __('Priority Mail Express International Padded Flat Rate Envelope'), | |
+ '1058' => __('Ground Advantage™'), | |
+ '4058' => __('Ground Advantage™ HAZMAT'), | |
+ '6058' => __('Ground Advantage™ Parcel locker'), | |
+ '2058' => __('Ground Advantage™ Hold for pickup'), | |
+ '4096' => __('Ground Advantage™ Cubic HAZMAT'), | |
+ '1096' => __('Ground Advantage™ Cubic'), | |
+ '2096' => __('Ground Advantage™ Cubic Hold for pickup'), | |
+ '6096' => __('Ground Advantage™ Cubic Parcel locker') | |
], | |
'service_to_code' => [ | |
'0_FCLE' => 'First Class', | |
@@ -885,6 +893,14 @@ | |
'INT_24' => 'Priority', | |
'INT_25' => 'Priority', | |
'INT_27' => 'Priority Express', | |
+ '1058' => 'Ground Advantage', | |
+ '4058' => 'Ground Advantage', | |
+ '6058' => 'Ground Advantage', | |
+ '2058' => 'Ground Advantage', | |
+ '4096' => 'Ground Advantage', | |
+ '1096' => 'Ground Advantage', | |
+ '2096' => 'Ground Advantage', | |
+ '6096' => 'Ground Advantage', | |
], | |
'method_to_code' => [ | |
'First-Class Mail Large Envelope' => '0_FCLE', | |
--- ../p5/./vendor/magento/module-usps/Setup/Patch/Data/UpdateAllowedMethods.php 2023-05-16 17:11:08.000000000 +0200 | |
+++ ./vendor/magento/module-usps/Setup/Patch/Data/UpdateAllowedMethods.php 2023-09-11 17:11:38.000000000 +0200 | |
@@ -11,8 +11,7 @@ | |
use Magento\Framework\Setup\Patch\PatchVersionInterface; | |
/** | |
- * Class UpdateAllowedMethods | |
- * @package Magento\Usps\Setup\Patch | |
+ * Updates all methods on the configuration | |
*/ | |
class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface | |
{ | |
@@ -23,6 +22,7 @@ | |
/** | |
* UpdateAllowedMethods constructor. | |
+ * | |
* @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup | |
*/ | |
public function __construct( | |
@@ -32,7 +32,7 @@ | |
} | |
/** | |
- * {@inheritdoc} | |
+ * @inheritdoc | |
*/ | |
public function apply() | |
{ | |
@@ -113,10 +113,11 @@ | |
$connection->update($configDataTable, ['value' => $newValue], $whereConfigId); | |
} | |
} | |
+ return $this; | |
} | |
/** | |
- * {@inheritdoc} | |
+ * @inheritdoc | |
*/ | |
public static function getDependencies() | |
{ | |
@@ -124,7 +125,7 @@ | |
} | |
/** | |
- * {@inheritdoc} | |
+ * @inheritdoc | |
*/ | |
public static function getVersion() | |
{ | |
@@ -132,7 +133,7 @@ | |
} | |
/** | |
- * {@inheritdoc} | |
+ * @inheritdoc | |
*/ | |
public function getAliases() | |
{ | |
Common subdirectories: ../p5/./vendor/wikimedia/less.php/bin and ./vendor/wikimedia/less.php/bin | |
Common subdirectories: ../p5/./vendor/wikimedia/less.php/lib and ./vendor/wikimedia/less.php/lib | |
Common subdirectories: ../p5/./vendor/mtdowling/jmespath.php/bin and ./vendor/mtdowling/jmespath.php/bin | |
Common subdirectories: ../p5/./vendor/mtdowling/jmespath.php/src and ./vendor/mtdowling/jmespath.php/src | |
--- ../p5/./vendor/autoload.php 2023-10-10 13:51:46.908158844 +0200 | |
+++ ./vendor/autoload.php 2023-10-10 13:51:14.456322545 +0200 | |
@@ -22,4 +22,4 @@ | |
require_once __DIR__ . '/composer/autoload_real.php'; | |
-return ComposerAutoloaderInit789187619809001ddb5c560c324ddb86::getLoader(); | |
+return ComposerAutoloaderInite3976ee5e7c3bf48dc4aeca887bcc8fd::getLoader(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment