Commit Graph
62 Commits
Author SHA1 Message Date
Rajesh Kumar d83e01def8 AC-9670::Adobe Commerce 2.4.7 core code is compatible with PHP 8.3 2023-11-14 17:51:23 +05:30
Dmytro Shevtsov 5c026b5926 Update devdocs links 2022-12-20 10:59:16 -06:00
Faizan Shaikh 80497d15f9 AC-6646::Add PHP 8.2 Compatibility Support 2022-09-12 15:14:52 +05:30
Faizan Shaikh 748062480b AC-2841:PHP 7.4 compatibility removal from the codebase 2022-09-12 14:37:38 +05:30
Andrii Beziazychnyi d536ff4db4 Changed restrictions for php to "~7.4.0||~8.1.0" into composer.json files 2021-12-20 14:25:47 +02:00
andrii.zinkevych fd59832a1e Added PHP 8.1 to require for all modules 2021-11-09 22:59:19 +01:00
Andrii Beziazychnyi eb89ea8c64 Updated PHP versions in composer files 2021-09-14 12:26:58 +03:00
chiranjeevi c95fee989c Update README.md 2021-01-11 21:06:48 +05:30
chiranjeevi 54d95d0dd5 Update README.md 2021-01-11 20:59:15 +05:30
CJ db1be3fd78 Updated webapi security module readme file 2020-12-23 15:31:07 +05:30
Maksym Aposov 2196548ebc MC-31797: Remove compatibility with PHP 7.1 and 7.2 2020-04-08 13:30:50 -05:00
Maksym Aposov a9385429da MC-33066: Add PHP 7.4 to composer.json files
- Update composer files
2020-04-03 14:05:11 -05:00
Bartłomiej Szubert 5ce399a1a6 Cleanup system.xml files 2020-01-12 23:34:08 +01:00
Łukasz Bajsarowicz 2179e73729 use section does not need leading backslash 2019-12-19 05:04:27 +01:00
Harald Deiser 392b34fc8e MC-16192: Added php7.3 composer updates for submodules 2019-07-08 21:00:10 +02:00
Yogesh Suhagiya 007bad9cca Added translation for label/comment tags 2018-08-22 12:48:33 +03:00
Yogesh Suhagiya b9b94765c2 Added translation for comment tag 2018-08-11 11:43:45 +05:30
KevinBKozan bb3beea3b0 MQE-1167: Remove composer.json from Mftf folder in app/code
- removed composer.json from all app/code/<module>/Test/Mftf folders.
2018-08-02 13:33:49 -05:00
Alex Kolesnyk e0c6caf8e3 MQE-1075: Move MFTF tests from dev/tests/acceptance to app/code 2018-07-05 16:04:51 -05:00
Joan He 758f382d41 Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade
# Conflicts:
#	app/code/Magento/AdvancedPricingImportExport/composer.json
#	app/code/Magento/AdvancedSearch/composer.json
#	app/code/Magento/Amqp/composer.json
#	app/code/Magento/Analytics/composer.json
#	app/code/Magento/AsynchronousOperations/composer.json
#	app/code/Magento/Authorization/composer.json
#	app/code/Magento/Authorizenet/composer.json
#	app/code/Magento/Backend/composer.json
#	app/code/Magento/Backup/composer.json
#	app/code/Magento/Braintree/composer.json
#	app/code/Magento/Bundle/composer.json
#	app/code/Magento/BundleGraphQl/composer.json
#	app/code/Magento/BundleImportExport/composer.json
#	app/code/Magento/CacheInvalidate/composer.json
#	app/code/Magento/Captcha/composer.json
#	app/code/Magento/Catalog/composer.json
#	app/code/Magento/CatalogAnalytics/composer.json
#	app/code/Magento/CatalogGraphQl/composer.json
#	app/code/Magento/CatalogInventory/composer.json
#	app/code/Magento/CatalogRule/composer.json
#	app/code/Magento/CatalogRuleConfigurable/composer.json
#	app/code/Magento/CatalogSearch/composer.json
#	app/code/Magento/CatalogUrlRewrite/composer.json
#	app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
#	app/code/Magento/CatalogWidget/composer.json
#	app/code/Magento/Checkout/composer.json
#	app/code/Magento/CheckoutAgreements/composer.json
#	app/code/Magento/Cms/composer.json
#	app/code/Magento/CmsUrlRewrite/composer.json
#	app/code/Magento/CmsUrlRewriteGraphQl/composer.json
#	app/code/Magento/Config/composer.json
#	app/code/Magento/ConfigurableImportExport/composer.json
#	app/code/Magento/ConfigurableProduct/composer.json
#	app/code/Magento/ConfigurableProductGraphQl/composer.json
#	app/code/Magento/ConfigurableProductSales/composer.json
#	app/code/Magento/Contact/composer.json
#	app/code/Magento/Cookie/composer.json
#	app/code/Magento/Cron/composer.json
#	app/code/Magento/CurrencySymbol/composer.json
#	app/code/Magento/Customer/composer.json
#	app/code/Magento/CustomerAnalytics/composer.json
#	app/code/Magento/CustomerGraphQl/composer.json
#	app/code/Magento/CustomerImportExport/composer.json
#	app/code/Magento/Deploy/composer.json
#	app/code/Magento/Developer/composer.json
#	app/code/Magento/Downloadable/composer.json
#	app/code/Magento/DownloadableGraphQl/composer.json
#	app/code/Magento/DownloadableImportExport/composer.json
#	app/code/Magento/Eav/composer.json
#	app/code/Magento/EavGraphQl/composer.json
#	app/code/Magento/Elasticsearch/composer.json
#	app/code/Magento/Email/composer.json
#	app/code/Magento/EncryptionKey/composer.json
#	app/code/Magento/GiftMessage/composer.json
#	app/code/Magento/GoogleAdwords/composer.json
#	app/code/Magento/GoogleAnalytics/composer.json
#	app/code/Magento/GoogleOptimizer/composer.json
#	app/code/Magento/GraphQl/composer.json
#	app/code/Magento/GroupedImportExport/composer.json
#	app/code/Magento/GroupedProduct/composer.json
#	app/code/Magento/GroupedProductGraphQl/composer.json
#	app/code/Magento/Indexer/composer.json
#	app/code/Magento/InstantPurchase/composer.json
#	app/code/Magento/Integration/composer.json
#	app/code/Magento/LayeredNavigation/composer.json
#	app/code/Magento/Marketplace/composer.json
#	app/code/Magento/MediaStorage/composer.json
#	app/code/Magento/Msrp/composer.json
#	app/code/Magento/Multishipping/composer.json
#	app/code/Magento/MysqlMq/composer.json
#	app/code/Magento/NewRelicReporting/composer.json
#	app/code/Magento/Newsletter/composer.json
#	app/code/Magento/OfflinePayments/composer.json
#	app/code/Magento/OfflineShipping/composer.json
#	app/code/Magento/PageCache/composer.json
#	app/code/Magento/Payment/composer.json
#	app/code/Magento/Persistent/composer.json
#	app/code/Magento/ProductAlert/composer.json
#	app/code/Magento/ProductVideo/composer.json
#	app/code/Magento/Quote/composer.json
#	app/code/Magento/QuoteAnalytics/composer.json
#	app/code/Magento/ReleaseNotification/composer.json
#	app/code/Magento/Reports/composer.json
#	app/code/Magento/RequireJs/composer.json
#	app/code/Magento/Review/composer.json
#	app/code/Magento/ReviewAnalytics/composer.json
#	app/code/Magento/Robots/composer.json
#	app/code/Magento/Rss/composer.json
#	app/code/Magento/Sales/composer.json
#	app/code/Magento/SalesAnalytics/composer.json
#	app/code/Magento/SalesInventory/composer.json
#	app/code/Magento/SalesRule/composer.json
#	app/code/Magento/SalesSequence/composer.json
#	app/code/Magento/SampleData/composer.json
#	app/code/Magento/Search/composer.json
#	app/code/Magento/Security/composer.json
#	app/code/Magento/SendFriend/composer.json
#	app/code/Magento/Signifyd/composer.json
#	app/code/Magento/Sitemap/composer.json
#	app/code/Magento/Store/composer.json
#	app/code/Magento/Swagger/composer.json
#	app/code/Magento/SwaggerWebapi/composer.json
#	app/code/Magento/SwaggerWebapiAsync/composer.json
#	app/code/Magento/Swatches/composer.json
#	app/code/Magento/SwatchesGraphQl/composer.json
#	app/code/Magento/SwatchesLayeredNavigation/composer.json
#	app/code/Magento/Tax/composer.json
#	app/code/Magento/TaxGraphQl/composer.json
#	app/code/Magento/TaxImportExport/composer.json
#	app/code/Magento/Theme/composer.json
#	app/code/Magento/Tinymce3/composer.json
#	app/code/Magento/Translation/composer.json
#	app/code/Magento/Ui/composer.json
#	app/code/Magento/Ups/composer.json
#	app/code/Magento/UrlRewrite/composer.json
#	app/code/Magento/UrlRewriteGraphQl/composer.json
#	app/code/Magento/User/composer.json
#	app/code/Magento/Variable/composer.json
#	app/code/Magento/Vault/composer.json
#	app/code/Magento/Version/composer.json
#	app/code/Magento/Webapi/composer.json
#	app/code/Magento/WebapiAsync/composer.json
#	app/code/Magento/WebapiSecurity/composer.json
#	app/code/Magento/Weee/composer.json
#	app/code/Magento/WeeeGraphQl/composer.json
#	app/code/Magento/Widget/composer.json
#	app/code/Magento/Wishlist/composer.json
#	app/code/Magento/WishlistAnalytics/composer.json
#	app/design/adminhtml/Magento/backend/composer.json
#	app/design/frontend/Magento/blank/composer.json
#	app/design/frontend/Magento/luma/composer.json
#	app/design/frontend/Magento/rush/composer.json
#	composer.lock
#	dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
#	dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
#	dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
#	dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
#	dev/tests/integration/_files/Magento/TestModuleSample/composer.json
#	dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json
#	dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json
#	dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json
#	dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
#	dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
#	lib/internal/Magento/Framework/Amqp/composer.json
#	lib/internal/Magento/Framework/Bulk/composer.json
#	lib/internal/Magento/Framework/MessageQueue/composer.json
2018-04-09 15:55:20 -05:00
Alex Paliarush 95bfd2c790 MAGETWO-89542: Eliminate module versions in Git 2018-04-05 13:50:13 -05:00
Joan He bbe64e6666 Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-89081
# Conflicts:
#	app/code/Magento/SalesSequence/composer.json
#	composer.json
#	composer.lock
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
#	lib/internal/Magento/Framework/composer.json
2018-03-12 16:06:44 -05:00
Patrick McLain e20d5b8f02 Update PHP version requirements in all composer.json
Update to "~7.1.3||~7.2.0"
2018-02-28 21:19:05 -05:00
Sergii Kovalenko 7120e062be MAGETWO-87551: Convert existing data install/upgrade scripts
--fix L2 EE-Setup
2018-02-13 17:54:09 +02:00
Andreas Möller f24b03f01b Fix: Keep packages sorted 2017-10-10 20:57:38 +02:00
Sviatoslav Mankivskyi e2c783403b Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71696
# Conflicts:
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
#	app/code/Magento/Checkout/Controller/Cart/Addgroup.php
#	app/code/Magento/Customer/Block/CustomerScopeData.php
#	app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
#	app/code/Magento/Sitemap/Helper/Data.php
#	app/code/Magento/Sitemap/Model/Sitemap.php
#	dev/tests/static/testsuite/Magento/Test/Js/_files/jshint/blacklist/core.txt
#	lib/internal/Magento/Framework/Mail/Message.php
#	lib/internal/Magento/Framework/Mail/Transport.php
#	lib/internal/Magento/Framework/Mail/TransportInterface.php
2017-08-23 14:48:10 +03:00
Igor Melnikov 6b2d13052e MAGETWO-71414: Merge 2.2-develop into develop
- merge 2.2-develop into develop, conflicts:
setup/src/Magento/Setup/Test/Unit/Model/PackagesAuthTest.php
lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
lib/internal/Magento/Framework/Mail/TransportInterface.php
lib/internal/Magento/Framework/Mail/Transport.php
lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
lib/internal/Magento/Framework/Mail/Message.php
dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
composer.lock
composer.json
app/code/Magento/WishlistAnalytics/registration.php
app/code/Magento/WishlistAnalytics/composer.json
app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
app/code/Magento/Sitemap/Test/Unit/Helper/DataTest.php
app/code/Magento/Sitemap/Model/Sitemap.php
app/code/Magento/Sitemap/Helper/Data.php
app/code/Magento/SalesAnalytics/registration.php
app/code/Magento/SalesAnalytics/composer.json
app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
app/code/Magento/ReviewAnalytics/registration.php
app/code/Magento/ReviewAnalytics/composer.json
app/code/Magento/QuoteAnalytics/registration.php
app/code/Magento/QuoteAnalytics/composer.json
app/code/Magento/OfflineShipping/composer.json
app/code/Magento/CustomerAnalytics/registration.php
app/code/Magento/CustomerAnalytics/composer.json
app/code/Magento/Customer/Block/CustomerScopeData.php
app/code/Magento/Checkout/Controller/Cart/Addgroup.php
app/code/Magento/CatalogAnalytics/registration.php
app/code/Magento/CatalogAnalytics/composer.json
app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
app/code/Magento/Analytics/registration.php
app/code/Magento/Analytics/composer.json
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
2017-08-11 19:18:54 -05:00
Oleksii Korshenko e60d3a2d8f MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- removed useless class docBlocks
2017-08-11 15:41:59 -05:00
Oleksii Korshenko 4b5626478a MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- replaced release version with package version in @since and @depreacated tags
 - removed @since tag from private properties/methods  and non @api classes
2017-08-04 19:15:55 -05:00
Oleksii Korshenko 56af1e73ce MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- removed @since 2.0.0 as it is a base release
 - updated version in @since and @deprecated tag taking into account all patch releases
2017-08-02 14:14:33 -05:00
Cristian Partica 80b137e661 Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71255-2.2-in-2.3-merge
# Conflicts:
#	app/code/Magento/Catalog/Block/Product/View/Gallery.php
#	app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
#	app/code/Magento/Catalog/i18n/en_US.csv
#	app/code/Magento/Swatches/i18n/en_US.csv
#	app/etc/di.xml
#	composer.lock
#	lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php
2017-08-01 11:28:53 -05:00
Oleksii Korshenko bd74370771 MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- added release number to all existing @deprecated tag in php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
 - added tag @since to all existing php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
2017-07-28 15:43:18 -05:00
Cristian Partica 81a184e547 MAGETWO-71052: 2.3 version bump 2017-07-28 14:36:11 -05:00
Oleksii Korshenko 2bad2ceb6e MAGETWO-70576: Update registration files formatting #2204 2017-07-10 13:07:45 -05:00
David Alger cecc352c84 Update registration files formatting 2017-07-07 16:49:00 -05:00
Tommy Wiebell e824400396 MAGETWO-67296: String localization is not working when phrase contains quote (\')
- Regenerate language files to include new escaping logic. Additionally merge in aliases not compiled from core.
2017-06-15 14:18:30 -05:00
Illia Grybkov 0364bf93b3 MAGETWO-65525: Add support for PHP 7.1.x
- Drop PHP 5.6 support
  - Add PHP 7.1.x to the list of supported versions
  - MAGETWO-60101: Suppress "deprecated" warning for mcrypt library
  - MAGETWO-66299: Fix integration tests which fails due to arithmetic with invalid strings in CatalogImportExport

MAGETWO-63672: Upgrade outdated libraries w/composer (minor versions)

MAGETWO-65715: Upgrade zend Framework 1 to 1.12.20

  - MAGETWO-66733: Fix cases where MySQL expression used in Order/Group statements and not wrapped with \Zend_Db_Expr

MAGETWO-52770: Upgrade composer to stable version

  - Now Magento uses stable composer/composer v1.4.1
2017-04-26 13:58:44 +03:00
Oleksii Korshenko 231709b4ac MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 19:37:54 +03:00
Oleksii Korshenko 1b5dc60a26 MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 04:48:40 +03:00
Vlad Veselov 002d771100 [PSR-2 Compliance] Fix #8612: Hundreds of PHPCS-based static tests violations in mainline
- apply automatic PHPCBF fixes to make PHPCS happy
- Step 0. Install phpcs globally: composer global require squizlabs/php_codesniffer:2.8.0
- Step 1. Execute tool to fix PSR-2 violations in PHP files: ~/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf --standard=PSR2 --extensions=php --ignore=generated/*,vendor/*,var/* .
2017-03-11 13:45:04 +02:00
James Halsall a31f4a35c0 Remove the copyright year from file headers 2017-02-22 09:09:36 +00:00
Anton Evers 0b243b899f Make Magento compatible with composer ~1.3.0 2017-02-21 12:53:24 +01:00
Sergii Kovalenko eb30343a09 MAGETWO-62855: Copyright Year Update 2017 2017-01-05 13:01:45 +02:00
Oleksii Korshenko 9666070bd1 MAGETWO-60073: Functional Improvements for Magento 2.2-dev 2016-10-25 14:48:39 -05:00
Bohdan Korablov 175485265b MAGETWO-54737: PHP 7.0.4 Support 2016-07-05 14:06:27 +03:00
mage2-team 7e9d1812b6 MAGETWO-54483: Magento 2.2.0-dev Publication
(build 2.2.0-dev.001)
2016-06-23 16:22:01 +00:00
mage2-team 909a2d7e8c MAGETWO-50211: Magento 2.1.0 Publication
(build 2.1.0.051)
2016-06-23 07:59:40 +00:00
mage2-team 3561b6614e MAGETWO-54330: Magento 2.1.0-rc3 Publication
(build 2.1.0-rc3.011)
2016-06-16 16:20:59 +00:00
Ievgen Shakhsuvarov 5904a74514 MAGETWO-53293: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-53293
Conflicts:
	composer.lock
2016-06-08 15:53:11 +03:00
mage2-team ef6ad274c7 MAGETWO-53677: Magento 2.1.0-rc2 publication
(build 2.1.0-rc2.012)
2016-06-07 19:21:34 +00:00