Skip to content

Commit

Permalink
MC-22060: Magento 2.3.3-p1 Publication
Browse files Browse the repository at this point in the history
  • Loading branch information
mage2-team committed Jan 28, 2020
1 parent 028f594 commit 55dd0c2
Show file tree
Hide file tree
Showing 1,675 changed files with 11,338 additions and 5,268 deletions.
26 changes: 13 additions & 13 deletions app/code/Magento/AdminAnalytics/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
},
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0",
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-config": "*",
"magento/module-ui": "*",
"magento/module-release-notification": "*"
"magento/framework": "102.0.*",
"magento/module-backend": "101.0.*",
"magento/module-config": "101.1.*",
"magento/module-ui": "101.1.*",
"magento/module-release-notification": "100.3.*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
],
"psr-4": {
"Magento\\AdminAnalytics\\": ""
}
}
"files": [
"registration.php"
],
"psr-4": {
"Magento\\AdminAnalytics\\": ""
}
},
"version": "100.3.0"
}

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Messages extends \Magento\Backend\Block\Template

/**
* @var \Magento\Framework\Json\Helper\Data
* @deprecated
* @deprecated 100.3.0
*/
protected $jsonHelper;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction

/**
* @var \Magento\Framework\Json\Helper\Data
* @deprecated
* @deprecated 100.3.0
*/
protected $jsonHelper;

Expand Down
15 changes: 8 additions & 7 deletions app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0",
"lib-libxml": "*",
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-media-storage": "*",
"magento/module-store": "*",
"magento/module-ui": "*",
"magento/module-config": "*"
"magento/framework": "102.0.*",
"magento/module-backend": "101.0.*",
"magento/module-media-storage": "100.3.*",
"magento/module-store": "101.0.*",
"magento/module-ui": "101.1.*",
"magento/module-config": "101.1.*"
},
"type": "magento2-module",
"license": [
Expand All @@ -26,5 +26,6 @@
"psr-4": {
"Magento\\AdminNotification\\": ""
}
}
},
"version": "100.3.3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private function prepareExportData(
* @param array $exportData
* @return array
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
* @deprecated
* @deprecated 100.3.0
* @see prepareExportData
*/
protected function correctExportData($exportData)
Expand Down Expand Up @@ -513,7 +513,7 @@ private function fetchTierPrices(array $productIds): array
* @return array|bool
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @deprecated
* @deprecated 100.3.0
* @see fetchTierPrices
*/
protected function getTierPrices(array $listSku, $table)
Expand Down
19 changes: 10 additions & 9 deletions app/code/Magento/AdvancedPricingImportExport/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
},
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0",
"magento/framework": "*",
"magento/module-catalog": "*",
"magento/module-catalog-import-export": "*",
"magento/module-catalog-inventory": "*",
"magento/module-customer": "*",
"magento/module-eav": "*",
"magento/module-import-export": "*",
"magento/module-store": "*"
"magento/framework": "102.0.*",
"magento/module-catalog": "103.0.*",
"magento/module-catalog-import-export": "101.0.*",
"magento/module-catalog-inventory": "100.3.*",
"magento/module-customer": "102.0.*",
"magento/module-eav": "102.0.*",
"magento/module-import-export": "100.3.*",
"magento/module-store": "101.0.*"
},
"type": "magento2-module",
"license": [
Expand All @@ -27,5 +27,6 @@
"psr-4": {
"Magento\\AdvancedPricingImportExport\\": ""
}
}
},
"version": "100.3.3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ClientResolver
*
* @var ScopeConfigInterface
* @since 100.1.0
* @deprecated since it is not used anymore
* @deprecated 100.3.0 since it is not used anymore
*/
protected $scopeConfig;

Expand Down Expand Up @@ -55,14 +55,14 @@ class ClientResolver
*
* @var string
* @since 100.1.0
* @deprecated since it is not used anymore
* @deprecated 100.3.0 since it is not used anymore
*/
protected $path;

/**
* Config Scope
* @since 100.1.0
* @deprecated since it is not used anymore
* @deprecated 100.3.0 since it is not used anymore
*/
protected $scope;

Expand Down
19 changes: 10 additions & 9 deletions app/code/Magento/AdvancedSearch/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"sort-packages": true
},
"require": {
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-catalog": "*",
"magento/module-catalog-search": "*",
"magento/module-config": "*",
"magento/module-customer": "*",
"magento/module-search": "*",
"magento/module-store": "*",
"magento/framework": "102.0.*",
"magento/module-backend": "101.0.*",
"magento/module-catalog": "103.0.*",
"magento/module-catalog-search": "101.0.*",
"magento/module-config": "101.1.*",
"magento/module-customer": "102.0.*",
"magento/module-search": "101.0.*",
"magento/module-store": "101.0.*",
"php": "~7.1.3||~7.2.0||~7.3.0"
},
"type": "magento2-module",
Expand All @@ -27,5 +27,6 @@
"psr-4": {
"Magento\\AdvancedSearch\\": ""
}
}
},
"version": "100.3.3"
}
9 changes: 5 additions & 4 deletions app/code/Magento/Amqp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"sort-packages": true
},
"require": {
"magento/framework": "*",
"magento/framework-amqp": "*",
"magento/framework-message-queue": "*",
"magento/framework": "102.0.*",
"magento/framework-amqp": "100.3.*",
"magento/framework-message-queue": "100.3.*",
"php": "~7.1.3||~7.2.0||~7.3.0"
},
"type": "magento2-module",
Expand All @@ -22,5 +22,6 @@
"psr-4": {
"Magento\\Amqp\\": ""
}
}
},
"version": "100.3.3"
}
13 changes: 7 additions & 6 deletions app/code/Magento/AmqpStore/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"sort-packages": true
},
"require": {
"magento/framework": "*",
"magento/framework-amqp": "*",
"magento/module-store": "*",
"magento/framework": "102.0.*",
"magento/framework-amqp": "100.3.*",
"magento/module-store": "101.0.*",
"php": "~7.1.3||~7.2.0||~7.3.0"
},
"suggest": {
"magento/module-asynchronous-operations": "*",
"magento/framework-message-queue": "*"
"magento/module-asynchronous-operations": "100.3.*",
"magento/framework-message-queue": "100.3.*"
},
"type": "magento2-module",
"license": [
Expand All @@ -26,5 +26,6 @@
"psr-4": {
"Magento\\AmqpStore\\": ""
}
}
},
"version": "100.3.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,35 @@
* Represents converter interface for http request and response body.
*
* @api
* @since 100.2.0
*/
interface ConverterInterface
{
/**
* @param string $body
*
* @return array
* @since 100.2.0
*/
public function fromBody($body);

/**
* @param array $data
*
* @return string
* @since 100.2.0
*/
public function toBody(array $data);

/**
* @return string
* @since 100.2.0
*/
public function getContentTypeHeader();

/**
* @return string
* @since 100.3.0
*/
public function getContentMediaType(): string;
}
1 change: 0 additions & 1 deletion app/code/Magento/Analytics/ReportXml/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public function getConfig()
* @link http://php.net/manual/en/jsonserializable.jsonserialize.php
* @return mixed data which can be serialized by <b>json_encode</b>,
* which is a value of any type other than a resource.
* @since 5.4.0
*/
public function jsonSerialize()
{
Expand Down
13 changes: 7 additions & 6 deletions app/code/Magento/Analytics/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "N/A",
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0",
"magento/module-backend": "*",
"magento/module-config": "*",
"magento/module-integration": "*",
"magento/module-store": "*",
"magento/framework": "*"
"magento/module-backend": "101.0.*",
"magento/module-config": "101.1.*",
"magento/module-integration": "100.3.*",
"magento/module-store": "101.0.*",
"magento/framework": "102.0.*"
},
"type": "magento2-module",
"license": [
Expand All @@ -21,5 +21,6 @@
"psr-4": {
"Magento\\Analytics\\": ""
}
}
},
"version": "100.3.3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Bulk summary data with list of operations items short data.
*
* @api
* @since 100.2.3
*/
interface BulkStatusInterface extends \Magento\Framework\Bulk\BulkStatusInterface
{
Expand All @@ -23,6 +24,7 @@ interface BulkStatusInterface extends \Magento\Framework\Bulk\BulkStatusInterfac
* @param string $bulkUuid
* @return \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @since 100.2.3
*/
public function getBulkDetailedStatus($bulkUuid);

Expand All @@ -32,6 +34,7 @@ public function getBulkDetailedStatus($bulkUuid);
* @param string $bulkUuid
* @return \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @since 100.2.3
*/
public function getBulkShortStatus($bulkUuid);
}
Loading

0 comments on commit 55dd0c2

Please sign in to comment.