Skip to content

Commit

Permalink
Merge pull request #561 from magento-ogre/PR_Branch
Browse files Browse the repository at this point in the history 
[Ogres] Component Management and System upgrade
  • Loading branch information
Kopylova,Olga(okopylova) committed Sep 3, 2015
2 parents 871ac64 + 0f263d8 commit 6ba36cf
Show file tree
Hide file tree
Showing 277 changed files with 12,606 additions and 1,571 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-admin-notification",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
"magento/module-media-storage": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdvancedPricingImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-advanced-pricing-import-export",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-catalog": "1.0.0-beta",
"magento/module-catalog-inventory": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-authorization",
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-backend": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"magento/magento-composer-installer": "*"
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-authorizenet",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-sales": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-quote": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-backend",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-directory": "1.0.0-beta",
"magento/module-developer": "1.0.0-beta",
Expand Down
19 changes: 19 additions & 0 deletions app/code/Magento/Backup/Model/Db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,25 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
return $this;
}

/**
* Get database backup size
*
* @return int
*/
public function getDBBackupSize()
{
$tables = $this->getResource()->getTables();
$ignoreDataTablesList = $this->getIgnoreDataTablesList();
$size = 0;
foreach ($tables as $table) {
$tableStatus = $this->getResource()->getTableStatus($table);
if ($tableStatus->getRows() && !in_array($table, $ignoreDataTablesList)) {
$size += $tableStatus->getDataLength() + $tableStatus->getIndexLength();
}
}
return $size;
}

/**
* Returns the list of tables which data should not be backed up
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backup/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-backup",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
"magento/module-cron": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Braintree/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-braintree",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-config": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-checkout": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-bundle",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
"magento/module-tax": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/BundleImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-bundle-import-export",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-catalog": "1.0.0-beta",
"magento/module-import-export": "1.0.0-beta",
"magento/module-catalog-import-export": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CacheInvalidate/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-cache-invalidate",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-page-cache": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"magento/magento-composer-installer": "*"
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Captcha/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-captcha",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-customer": "1.0.0-beta",
"magento/module-checkout": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
"magento/module-cms": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-import-export",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-catalog": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
"magento/module-import-export": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogInventory/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-inventory",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-config": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogRule/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-rule",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-rule": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogSearch/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-search",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
"magento/module-search": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogUrlRewrite/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-url-rewrite",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-backend": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
"magento/module-catalog-import-export": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogWidget/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-catalog-widget",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-catalog": "1.0.0-beta",
"magento/module-widget": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Checkout/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-checkout",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-sales": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CheckoutAgreements/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-checkout-agreements",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-checkout": "1.0.0-beta",
"magento/module-quote": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-cms",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-theme": "1.0.0-beta",
"magento/module-widget": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CmsUrlRewrite/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-cms-url-rewrite",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-cms": "1.0.0-beta",
"magento/module-url-rewrite": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Config/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-config",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/framework": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-cron": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ConfigurableImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-configurable-import-export",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-catalog": "1.0.0-beta",
"magento/module-catalog-import-export": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ConfigurableProduct/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-configurable-product",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
"magento/module-catalog-inventory": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Contact/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-contact",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-config": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-customer": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Cron/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-cron",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-config": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CurrencySymbol/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-currency-symbol",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-config": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-page-cache": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-customer",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
"magento/module-directory": "1.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CustomerImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/module-customer-import-export",
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"php": "~5.5.0|~5.6.0|~7.0.0",
"magento/module-store": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
"magento/module-customer": "1.0.0-beta",
Expand Down
Loading

0 comments on commit 6ba36cf

Please sign in to comment.