Commit Graph
37 Commits
Author SHA1 Message Date
Andrii Beziazychnyi eb89ea8c64 Updated PHP versions in composer files 2021-09-14 12:26:58 +03:00
Maksym Aposov 809f96eac6 MC-31797: Remove compatibility with PHP 7.1 and 7.2 2020-04-14 14:03:14 -05:00
Falk Ulbricht 6f9b93c413 MC-16958: Update composer.json's to compatible with PHP 7.3 for dev/tests 2019-07-08 21:00:10 +02: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 083678cfc6 MAGETWO-87551: Convert existing data install/upgrade scripts
--fix L1
2018-02-14 00:22:05 +02:00
Andreas Möller f24b03f01b Fix: Keep packages sorted 2017-10-10 20:57:38 +02: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
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
Volodymyr Kublytskyi 01ab812ccf MAGETWO-53293: Remove PHP 5.5 from supported versions
- Update requirements in composer.json files
2016-05-27 14:39:21 +03:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Hayder Sharhan 5b1787984e MAGETWO-48568: CLONE - PHP bug in libxml can bring website down [is relevant for php versions less than 5.5.22]
- Updated the rest of the composer files.
2016-03-10 14:07:49 -06:00
Hayder Sharhan 1cafdf5ca7 MAGETWO-46020: [Integration] 2 config files needed to create single integartion
- Refactored integration.xsd to account for integration data defined in different files.
- Removed integrations node since config node was added.
- Updated tests
2016-01-05 17:54:14 -06:00
Hayder Sharhan e73b7f66ba MAGETWO-46020: [Integration] 2 config files needed to create single integartion
- Fixed tests.
- Updated xsd file to work with config definition.
2015-12-30 15:44:06 -06:00
Hayder Sharhan c054518848 Merge remote-tracking branch 'remotes/api/MAGETWO-45161-RPC' into bug-fixes 2015-12-30 15:42:11 -06:00
Arkadii Chyzhov 687d649fcd MAGETWO-46019: [Integration] Integration is not created after adding integration/config.xml file
- fixed processing if there is no api.xml
- removed unused installData from testModule
2015-12-29 12:34:42 +02:00
Maddy Chellathurai 1c28084138 MAGETWO-43225: Remove references to magento/magento-composer-installer
- removing composer-installer
2015-09-28 11:36:10 -05:00
Maksym Savich 58ffcb7e4d MAGETWO-42855: XSD URN format 2015-09-21 13:41:42 -05:00
Eddie Lau d9b2a7d39b Merge branch 'develop_mainline' into MAGETWO-40848-components-from-vendor
Conflicts:
	app/code/Magento/DesignEditor/Model/Editor/Tools/Controls/Factory.php
	app/code/Magento/DownloadableImportExport/composer.json
	app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
	app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
	app/code/Magento/Translation/Model/Js/DataProvider.php
	composer.lock
	dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/themes.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tools/Magento/Tools/Migration/Acl/Db/Logger/File.php
	dev/tools/Magento/Tools/Migration/Acl/FileManager.php
	dev/tools/Magento/Tools/Migration/System/Writer/FileSystem.php
2015-09-15 16:12:34 -05:00
Ankur Kaneria 87e83f1b4d MAGETWO-42263: Register non-composer components
- updates to fix failing api-functional tests
2015-09-14 15:19:03 -05:00
Ankur Kaneria 9825233b95 MAGETWO-42263: Register non-composer components
- review updates
2015-09-10 13:09:51 -05:00
Ankur Kaneria 2bd91026d1 MAGETWO-42263: Register non-composer components
- minor updates to resolve static code anaylysis build issues
2015-09-10 10:33:00 -05:00
Ankur Kaneria 9ebcbe3e54 MAGETWO-42263: Register non-composer components
- updates to make api-functional tests work from original location
2015-09-10 09:51:54 -05:00
Ankur Kaneria 955ada4da2 MAGETWO-42263: Register non-composer components
- Added registration.php files for various api-functional test modules
- Optimized search algorithm for non-composer registration.php files
2015-09-09 15:48:20 -05:00
Maddy Chellathurai 6f8cdf2944 MAGETWO-41762: [php 7.0] Can't update composer if EE linked version
- adding support for php 7.0
2015-08-19 16:30:56 -05:00
Maddy Chellathurai 3867e959bc MAGETWO-34528: Contribution of Sprint 24 Work to Mainline
- correcting namespace for api-functional test module
2015-03-04 12:00:40 -06:00
Maddy Chellathurai 20ec02d738 MAGETWO-34528: Contribution of Sprint 24 Work to Mainline
- fixesin api-functional test modules
- adding obsolete classes
2015-03-04 11:39:36 -06:00
Maddy Chellathurai c1566222bf MAGETWO-34528: Contribution of Sprint 24 Work to Mainline
- fixing merging issues
2015-03-03 17:03:05 -06:00
Arkadii Chyzhov bf01a4bb88 MAGETWO-34457: Merge and Fix tests
- fix static tests
2015-02-24 15:53:01 +02:00
Arkadii Chyzhov 6b258833e0 MAGETWO-33455: Cover Config-based Integration Creation with Test
- fix test and added dependency in composer
2015-02-19 12:30:49 +02:00
Arkadii Chyzhov e932beb579 MAGETWO-33455: Cover Config-based Integration Creation with Test
- added license block
2015-02-18 15:45:39 +02:00
Arkadii Chyzhov a417de3c07 MAGETWO-33455: Cover Config-based Integration Creation with Test 2015-02-17 18:28:39 +02:00