diff --git a/box.json b/box.json index 51fff77..45fe598 100644 --- a/box.json +++ b/box.json @@ -23,7 +23,7 @@ "tests" ], "in": [ - "vendor/" + "vendor" ] } ], diff --git a/composer.json b/composer.json index 21a2765..252de21 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,20 @@ "name": "meanbee/magedbm", "description": "Magento database backup and import tool", "license": "MIT", - "keywords": ["magento", "database", "magedbm"], + "keywords": [ + "magento", + "database", + "magedbm" + ], + "homepage": "https://github.com/meanbee/magedbm", "authors": [ { "name": "Tom Robertshaw", "email": "tom.robertshaw@meanbee.com" + }, + { + "name": "MageDBM Contributors", + "homepage": "https://github.com/meanbee/magedbm/contributors" } ], "minimum-stability": "dev", @@ -15,10 +24,12 @@ "n98/magerun": "1.*", "aws/aws-sdk-php": "2.*", "piwik/ini": "dev-master", - "ifsnop/mysqldump-php":"2.*", + "ifsnop/mysqldump-php": "2.*", "herrera-io/phar-update": "2.*" }, - "require-dev": {}, + "require-dev": { + "squizlabs/php_codesniffer": "^2.3" + }, "bin": [ "bin/magedbm" ], @@ -26,5 +37,17 @@ "psr-0": { "Meanbee\\Magedbm\\": "src/" } + }, + "scripts": { + "check-style": "phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 src", + "fix-style": "phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 src", + "extra": { + "branch-alias": { + "dev-master": "1.5.1-dev" + } + }, + "config": { + "sort-packages": true + } } } diff --git a/composer.lock b/composer.lock index 598ef01..dc3696e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5b575192ab9ceefee87e56708d44ef60", - "content-hash": "e1ace7304ccf9c2b4eb182d0bdb76e66", + "hash": "e4f6e79851630d8db8cce539948ba010", + "content-hash": "9046b07545fc0f933ee0aba651193c4a", "packages": [ { "name": "aws/aws-sdk-php", @@ -13,12 +13,12 @@ "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "54b67f902bb2c5bbab481bc3c46537752a018830" + "reference": "64fa4b07f056e338a5f0f29eece75babaa83af68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/54b67f902bb2c5bbab481bc3c46537752a018830", - "reference": "54b67f902bb2c5bbab481bc3c46537752a018830", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/64fa4b07f056e338a5f0f29eece75babaa83af68", + "reference": "64fa4b07f056e338a5f0f29eece75babaa83af68", "shasum": "" }, "require": { @@ -68,42 +68,104 @@ "s3", "sdk" ], - "time": "2015-11-16 22:34:08" + "time": "2016-07-25 18:03:20" }, { - "name": "composer/composer", + "name": "composer/ca-bundle", "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "2f669c7eb836ce12bd636af51e721d25eba84e4b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/2f669c7eb836ce12bd636af51e721d25eba84e4b", + "reference": "2f669c7eb836ce12bd636af51e721d25eba84e4b", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0" + }, + "suggest": { + "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "time": "2016-12-28 18:06:04" + }, + { + "name": "composer/composer", + "version": "1.3.x-dev", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "1c525b76f81123af180743d31c208c29351cf931" + "reference": "9020b7113ca9a70dcce73fde969eff7e67312767" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/1c525b76f81123af180743d31c208c29351cf931", - "reference": "1c525b76f81123af180743d31c208c29351cf931", + "url": "https://api.github.com/repos/composer/composer/zipball/9020b7113ca9a70dcce73fde969eff7e67312767", + "reference": "9020b7113ca9a70dcce73fde969eff7e67312767", "shasum": "" }, "require": { + "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", "composer/spdx-licenses": "^1.0", - "justinrainbow/json-schema": "^1.4.4", + "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0", "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0", "seld/cli-prompt": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.5 || ^3.0", - "symfony/filesystem": "^2.5 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/process": "^2.1 || ^3.0" + "symfony/console": "^2.7 || ^3.0", + "symfony/filesystem": "^2.7 || ^3.0", + "symfony/finder": "^2.7 || ^3.0", + "symfony/process": "^2.7 || ^3.0" }, "require-dev": { "phpunit/phpunit": "^4.5 || ^5.0.5", - "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", - "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic" + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" }, "bin": [ "bin/composer" @@ -111,7 +173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -142,7 +204,7 @@ "dependency", "package" ], - "time": "2015-12-09 15:47:26" + "time": "2017-01-27 17:44:26" }, { "name": "composer/semver", @@ -150,12 +212,12 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3" + "reference": "69407bb2f739d25a5da5c69b8cc7e3f2d4fe01d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", - "reference": "0faeb6e433f6b352f0dc55ec1faf5c6b605a35d3", + "url": "https://api.github.com/repos/composer/semver/zipball/69407bb2f739d25a5da5c69b8cc7e3f2d4fe01d4", + "reference": "69407bb2f739d25a5da5c69b8cc7e3f2d4fe01d4", "shasum": "" }, "require": { @@ -204,7 +266,7 @@ "validation", "versioning" ], - "time": "2015-11-10 11:17:42" + "time": "2016-12-19 14:02:58" }, { "name": "composer/spdx-licenses", @@ -212,12 +274,12 @@ "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "022fc25ca664f612b1e7007e0d87642ef489f000" + "reference": "7fc8d83fc28dd5aa039d5b2a936a7ccf62dd4c51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/022fc25ca664f612b1e7007e0d87642ef489f000", - "reference": "022fc25ca664f612b1e7007e0d87642ef489f000", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7fc8d83fc28dd5aa039d5b2a936a7ccf62dd4c51", + "reference": "7fc8d83fc28dd5aa039d5b2a936a7ccf62dd4c51", "shasum": "" }, "require": { @@ -265,7 +327,7 @@ "spdx", "validator" ], - "time": "2015-11-04 10:29:55" + "time": "2017-01-03 08:35:48" }, { "name": "dnoegel/php-xdg-base-dir", @@ -306,16 +368,16 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "3037df47eca2e534f62f061415a071f9b5d1a1a4" + "reference": "a2dec96198bb146ffead806700074b0ec8d07f2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/3037df47eca2e534f62f061415a071f9b5d1a1a4", - "reference": "3037df47eca2e534f62f061415a071f9b5d1a1a4", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/a2dec96198bb146ffead806700074b0ec8d07f2f", + "reference": "a2dec96198bb146ffead806700074b0ec8d07f2f", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3|^7.0" }, "require-dev": { "ext-intl": "*", @@ -348,7 +410,7 @@ "faker", "fixtures" ], - "time": "2015-11-30 17:35:42" + "time": "2017-02-01 09:18:35" }, { "name": "guzzle/guzzle", @@ -356,12 +418,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle3.git", - "reference": "b3f5050cb6270c7a728a0b74ac2de50a262b3e02" + "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/b3f5050cb6270c7a728a0b74ac2de50a262b3e02", - "reference": "b3f5050cb6270c7a728a0b74ac2de50a262b3e02", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/f7778ed85e3db90009d79725afd6c3a82dab32fe", + "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe", "shasum": "" }, "require": { @@ -443,19 +505,20 @@ "rest", "web service" ], - "time": "2015-04-29 17:06:53" + "abandoned": "guzzlehttp/guzzle", + "time": "2016-10-26 18:22:07" }, { "name": "herrera-io/json", - "version": "dev-master", + "version": "1.x-dev", "source": { "type": "git", - "url": "https://github.com/kherge-abandoned/php-json.git", + "url": "https://github.com/kherge-php/json.git", "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kherge-abandoned/php-json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1", + "url": "https://api.github.com/repos/kherge-php/json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1", "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1", "shasum": "" }, @@ -503,6 +566,7 @@ "schema", "validate" ], + "abandoned": "kherge/json", "time": "2013-10-30 16:51:34" }, { @@ -560,6 +624,7 @@ "phar", "update" ], + "abandoned": true, "time": "2013-11-09 17:13:13" }, { @@ -611,20 +676,21 @@ "semantic", "version" ], + "abandoned": true, "time": "2014-08-10 03:40:12" }, { "name": "ifsnop/mysqldump-php", - "version": "v2.1", + "version": "v2.2", "source": { "type": "git", "url": "https://github.com/ifsnop/mysqldump-php.git", - "reference": "701024dd160f15796bed8130c3bdeb26c634785a" + "reference": "6c1b84c5b05d862d15ba9ddf92c7d99a3d81e439" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ifsnop/mysqldump-php/zipball/701024dd160f15796bed8130c3bdeb26c634785a", - "reference": "701024dd160f15796bed8130c3bdeb26c634785a", + "url": "https://api.github.com/repos/ifsnop/mysqldump-php/zipball/6c1b84c5b05d862d15ba9ddf92c7d99a3d81e439", + "reference": "6c1b84c5b05d862d15ba9ddf92c7d99a3d81e439", "shasum": "" }, "require": { @@ -663,7 +729,7 @@ "pdo", "sqlite" ], - "time": "2015-10-19 15:58:11" + "time": "2016-09-07 06:56:07" }, { "name": "jakub-onderka/php-console-color", @@ -754,20 +820,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "1.5.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe" + "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", - "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/cc84765fb7317f6b07bd8ac78364747f95b86341", + "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.29" }, "require-dev": { "json-schema/json-schema-test-suite": "1.1.0", @@ -780,7 +846,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -816,7 +882,7 @@ "json", "schema" ], - "time": "2015-09-08 22:28:04" + "time": "2016-01-25 15:43:01" }, { "name": "n98/junit-xml", @@ -856,23 +922,23 @@ }, { "name": "n98/magerun", - "version": "1.97.7", + "version": "1.97.28", "source": { "type": "git", "url": "https://github.com/netz98/n98-magerun.git", - "reference": "5a38bc5c009e40e59eb34001aba478e14d7775c3" + "reference": "56ee9116448d7e061bd7c49d83c58eff9bf2da6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/netz98/n98-magerun/zipball/5a38bc5c009e40e59eb34001aba478e14d7775c3", - "reference": "5a38bc5c009e40e59eb34001aba478e14d7775c3", + "url": "https://api.github.com/repos/netz98/n98-magerun/zipball/56ee9116448d7e061bd7c49d83c58eff9bf2da6b", + "reference": "56ee9116448d7e061bd7c49d83c58eff9bf2da6b", "shasum": "" }, "require": { - "composer/composer": "1.0.*@dev", + "composer/composer": "^1.3.0", "fzaninotto/faker": "~1.4", "n98/junit-xml": "~1.0", - "php": ">=5.3.3", + "php": ">=5.3.9", "psy/psysh": "~0.4", "symfony/console": "~2.3", "symfony/event-dispatcher": "~2.3", @@ -883,8 +949,12 @@ "twig/twig": "~1.0" }, "require-dev": { + "bamarni/symfony-console-autocomplete": "^1.2.0", + "friendsofphp/php-cs-fixer": "~1.12.0", "mikey179/vfsstream": "~1.4", - "phpunit/phpunit": "~4.1" + "phing/phing": "~2.10.0", + "phpunit/phpunit": "~4.1", + "seld/phar-utils": "1.0.1" }, "bin": [ "bin/n98-magerun" @@ -892,8 +962,10 @@ "type": "library", "autoload": { "psr-0": { - "N98": "src", - "Composer": "src" + "N98": "src" + }, + "psr-4": { + "N98\\": "shared/src/N98" } }, "notification-url": "https://packagist.org/downloads/", @@ -918,28 +990,28 @@ "magento", "magerun" ], - "time": "2015-11-07 02:10:14" + "time": "2017-02-10 11:54:37" }, { "name": "nikic/php-parser", - "version": "dev-master", + "version": "3.x-dev", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "719ca71d4ac80e1985dcd91dd8ec5a47db58ad80" + "reference": "0bf561dfe75ba80441c22adecc0529056671a7d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/719ca71d4ac80e1985dcd91dd8ec5a47db58ad80", - "reference": "719ca71d4ac80e1985dcd91dd8ec5a47db58ad80", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0bf561dfe75ba80441c22adecc0529056671a7d2", + "reference": "0bf561dfe75ba80441c22adecc0529056671a7d2", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.4" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0|~5.0" }, "bin": [ "bin/php-parse" @@ -947,7 +1019,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -969,7 +1041,7 @@ "parser", "php" ], - "time": "2015-12-07 11:12:00" + "time": "2017-02-10 20:20:03" }, { "name": "piwik/ini", @@ -977,12 +1049,12 @@ "source": { "type": "git", "url": "https://github.com/piwik/component-ini.git", - "reference": "9269255fd187e5bda2e5778041c8d143eb615b0a" + "reference": "bd2711ba4d5e20e4ca09b6829dc2831576b59dc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/component-ini/zipball/9269255fd187e5bda2e5778041c8d143eb615b0a", - "reference": "9269255fd187e5bda2e5778041c8d143eb615b0a", + "url": "https://api.github.com/repos/piwik/component-ini/zipball/bd2711ba4d5e20e4ca09b6829dc2831576b59dc3", + "reference": "bd2711ba4d5e20e4ca09b6829dc2831576b59dc3", "shasum": "" }, "require": { @@ -1002,7 +1074,54 @@ "license": [ "LGPL-3.0" ], - "time": "2015-04-21 04:59:09" + "time": "2016-01-14 21:13:33" + }, + { + "name": "psr/log", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2016-10-10 12:19:37" }, { "name": "psy/psysh", @@ -1010,33 +1129,34 @@ "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "753011e4e8fb5a14fdfb1cb0891b668dc8c24e50" + "reference": "a9d2a141f05321faaca40e6f2b2d2f8145becd26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/753011e4e8fb5a14fdfb1cb0891b668dc8c24e50", - "reference": "753011e4e8fb5a14fdfb1cb0891b668dc8c24e50", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a9d2a141f05321faaca40e6f2b2d2f8145becd26", + "reference": "a9d2a141f05321faaca40e6f2b2d2f8145becd26", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1", "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "^1.2.1|~2.0", + "nikic/php-parser": "~1.3|~2.0|~3.0", "php": ">=5.3.9", "symfony/console": "~2.3.10|^2.4.2|~3.0", "symfony/var-dumper": "~2.7|~3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "~1.5", - "phpunit/phpunit": "~3.7|~4.0|~5.0", - "squizlabs/php_codesniffer": "~2.0", + "friendsofphp/php-cs-fixer": "~1.11", + "hoa/console": "~3.16|~1.14", + "phpunit/phpunit": "~4.4|~5.0", "symfony/finder": "~2.1|~3.0" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", + "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." }, "bin": [ "bin/psysh" @@ -1044,7 +1164,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.7.x-dev" + "dev-develop": "0.9.x-dev" } }, "autoload": { @@ -1074,7 +1194,7 @@ "interactive", "shell" ], - "time": "2015-11-21 20:49:56" + "time": "2017-02-15 04:18:45" }, { "name": "seld/cli-prompt", @@ -1082,12 +1202,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "fe114c7a6ac5cb0ce76932ae4017024d9842a49c" + "reference": "8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/fe114c7a6ac5cb0ce76932ae4017024d9842a49c", - "reference": "fe114c7a6ac5cb0ce76932ae4017024d9842a49c", + "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4", + "reference": "8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4", "shasum": "" }, "require": { @@ -1122,20 +1242,20 @@ "input", "prompt" ], - "time": "2015-04-30 20:24:49" + "time": "2016-04-18 09:31:41" }, { "name": "seld/jsonlint", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "66834d3e3566bb5798db7294619388786ae99394" + "reference": "19495c181d6d53a0a13414154e52817e3b504189" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/66834d3e3566bb5798db7294619388786ae99394", - "reference": "66834d3e3566bb5798db7294619388786ae99394", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/19495c181d6d53a0a13414154e52817e3b504189", + "reference": "19495c181d6d53a0a13414154e52817e3b504189", "shasum": "" }, "require": { @@ -1168,7 +1288,7 @@ "parser", "validator" ], - "time": "2015-11-21 02:21:41" + "time": "2016-11-14 17:59:58" }, { "name": "seld/phar-utils", @@ -1220,16 +1340,17 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ec55a12a19fd794126f3d31a12801d92a349533b" + "reference": "6a05474dc5dc50c9fb579e117c879274b3f24b5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ec55a12a19fd794126f3d31a12801d92a349533b", - "reference": "ec55a12a19fd794126f3d31a12801d92a349533b", + "url": "https://api.github.com/repos/symfony/console/zipball/6a05474dc5dc50c9fb579e117c879274b3f24b5c", + "reference": "6a05474dc5dc50c9fb579e117c879274b3f24b5c", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/debug": "~2.7,>=2.7.2|~3.0.0", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { @@ -1272,7 +1393,64 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-12-12 20:05:07" + "time": "2017-02-14 16:24:56" + }, + { + "name": "symfony/debug", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com", + "time": "2016-07-30 07:22:48" }, { "name": "symfony/event-dispatcher", @@ -1280,12 +1458,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" + "reference": "74877977f90fb9c3e46378d5764217c55f32df34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74877977f90fb9c3e46378d5764217c55f32df34", + "reference": "74877977f90fb9c3e46378d5764217c55f32df34", "shasum": "" }, "require": { @@ -1332,29 +1510,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-30 20:15:42" + "time": "2017-01-02 20:30:24" }, { "name": "symfony/filesystem", - "version": "2.8.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "40ce10a959a67ec1db818ee3947ec474036eeb43" + "reference": "b2de62936fea037d501159f52b7b6172cc962282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/40ce10a959a67ec1db818ee3947ec474036eeb43", - "reference": "40ce10a959a67ec1db818ee3947ec474036eeb43", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b2de62936fea037d501159f52b7b6172cc962282", + "reference": "b2de62936fea037d501159f52b7b6172cc962282", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1381,7 +1559,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-12-05 11:09:21" + "time": "2017-01-08 21:15:04" }, { "name": "symfony/finder", @@ -1389,12 +1567,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "dd41ae57f4f737be271d944a0cc5f5f21203a7c6" + "reference": "355fccac526522dc5fca8ecf0e62749a149f3b8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/dd41ae57f4f737be271d944a0cc5f5f21203a7c6", - "reference": "dd41ae57f4f737be271d944a0cc5f5f21203a7c6", + "url": "https://api.github.com/repos/symfony/finder/zipball/355fccac526522dc5fca8ecf0e62749a149f3b8b", + "reference": "355fccac526522dc5fca8ecf0e62749a149f3b8b", "shasum": "" }, "require": { @@ -1430,7 +1608,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2015-12-05 11:09:21" + "time": "2017-01-02 20:30:24" }, { "name": "symfony/polyfill-mbstring", @@ -1438,12 +1616,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", "shasum": "" }, "require": { @@ -1455,7 +1633,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -1489,7 +1667,7 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/process", @@ -1497,12 +1675,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d6a21350fdce3e7f1a8ab0ed6952b358076278d8" + "reference": "0110ac49348d14eced7d3278ea7485f22196932e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d6a21350fdce3e7f1a8ab0ed6952b358076278d8", - "reference": "d6a21350fdce3e7f1a8ab0ed6952b358076278d8", + "url": "https://api.github.com/repos/symfony/process/zipball/0110ac49348d14eced7d3278ea7485f22196932e", + "reference": "0110ac49348d14eced7d3278ea7485f22196932e", "shasum": "" }, "require": { @@ -1538,7 +1716,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-12-10 17:11:25" + "time": "2017-02-03 12:08:06" }, { "name": "symfony/translation", @@ -1546,12 +1724,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "dff0867826a7068d673801b7522f8e2634016ef9" + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/dff0867826a7068d673801b7522f8e2634016ef9", - "reference": "dff0867826a7068d673801b7522f8e2634016ef9", + "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26", + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26", "shasum": "" }, "require": { @@ -1602,7 +1780,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2015-12-05 17:45:07" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/validator", @@ -1610,16 +1788,17 @@ "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "f3651e0364ace53780715b621c98afc38df77f60" + "reference": "b29f7c18e580d5e6e72aab4d1b6b752e69b77791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/f3651e0364ace53780715b621c98afc38df77f60", - "reference": "f3651e0364ace53780715b621c98afc38df77f60", + "url": "https://api.github.com/repos/symfony/validator/zipball/b29f7c18e580d5e6e72aab4d1b6b752e69b77791", + "reference": "b29f7c18e580d5e6e72aab4d1b6b752e69b77791", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0", "symfony/translation": "~2.4|~3.0.0" }, "require-dev": { @@ -1628,8 +1807,8 @@ "egulias/email-validator": "~1.2,>=1.2.1", "symfony/config": "~2.2|~3.0.0", "symfony/expression-language": "~2.4|~3.0.0", - "symfony/http-foundation": "~2.1|~3.0.0", - "symfony/intl": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.3|~3.0.0", + "symfony/intl": "~2.7.4|~2.8|~3.0.0", "symfony/property-access": "~2.3|~3.0.0", "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, @@ -1674,7 +1853,7 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2015-12-10 08:10:18" + "time": "2017-02-14 16:24:56" }, { "name": "symfony/var-dumper", @@ -1682,12 +1861,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "14ed95dc176e56b2258fea3deb936b9488de1dbe" + "reference": "7f57e98e11c6d8a77c68c51ef0f9915f7df3c8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/14ed95dc176e56b2258fea3deb936b9488de1dbe", - "reference": "14ed95dc176e56b2258fea3deb936b9488de1dbe", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7f57e98e11c6d8a77c68c51ef0f9915f7df3c8b0", + "reference": "7f57e98e11c6d8a77c68c51ef0f9915f7df3c8b0", "shasum": "" }, "require": { @@ -1703,7 +1882,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1737,7 +1916,7 @@ "debug", "dump" ], - "time": "2015-12-05 11:13:35" + "time": "2017-02-14 16:35:24" }, { "name": "symfony/yaml", @@ -1745,12 +1924,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aceecdb89565ebdedd908aaf327f5c34305be981" + "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aceecdb89565ebdedd908aaf327f5c34305be981", - "reference": "aceecdb89565ebdedd908aaf327f5c34305be981", + "url": "https://api.github.com/repos/symfony/yaml/zipball/322a8c2dfbca15ad6b1b27e182899f98ec0e0153", + "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153", "shasum": "" }, "require": { @@ -1786,7 +1965,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-12-05 13:47:06" + "time": "2017-01-21 16:40:50" }, { "name": "twig/twig", @@ -1794,12 +1973,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "db93842e80d758f6c74c3e1f1f088badb3fc84f0" + "reference": "d6715ac8c3a77ae6d0ebad9ff12511cc1b27f4a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/db93842e80d758f6c74c3e1f1f088badb3fc84f0", - "reference": "db93842e80d758f6c74c3e1f1f088badb3fc84f0", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d6715ac8c3a77ae6d0ebad9ff12511cc1b27f4a7", + "reference": "d6715ac8c3a77ae6d0ebad9ff12511cc1b27f4a7", "shasum": "" }, "require": { @@ -1807,12 +1986,12 @@ }, "require-dev": { "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "1.31-dev" } }, "autoload": { @@ -1847,10 +2026,89 @@ "keywords": [ "templating" ], - "time": "2015-11-17 12:22:13" + "time": "2017-02-03 21:34:15" + } + ], + "packages-dev": [ + { + "name": "squizlabs/php_codesniffer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "9c5f6a988ff6fb41897d8b188af3953ea90c5330" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9c5f6a988ff6fb41897d8b188af3953ea90c5330", + "reference": "9c5f6a988ff6fb41897d8b188af3953ea90c5330", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-02-14 03:28:48" } ], - "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": { diff --git a/manifest.json b/manifest.json index decf44a..739eca4 100644 --- a/manifest.json +++ b/manifest.json @@ -10,6 +10,11 @@ "sha1": "1830c419f4d7043a15ae88c5ded6bd834b656fc3", "url": "https://s3-eu-west-1.amazonaws.com/magedbm-releases/magedbm.1.4.0.phar", "version": "1.4.0" + }, + { + "name": "magedbm.phar", + "sha1": "92595eeaf3ec093ebc67f6ca28d6019f3f5b95d3", + "url": "https://s3-eu-west-1.amazonaws.com/magedbm-releases/magedbm.1.5.0.phar", + "version": "1.5.0" } ] - diff --git a/src/Meanbee/Magedbm/Application.php b/src/Meanbee/Magedbm/Application.php index 49078db..853e3f2 100644 --- a/src/Meanbee/Magedbm/Application.php +++ b/src/Meanbee/Magedbm/Application.php @@ -12,7 +12,7 @@ class Application extends \Symfony\Component\Console\Application { const APP_NAME = 'Magedbm'; - const APP_VERSION = '1.4.1'; + const APP_VERSION = '1.5.0'; protected $autoloader; diff --git a/src/Meanbee/Magedbm/Command/BaseCommand.php b/src/Meanbee/Magedbm/Command/BaseCommand.php index 9c0f3d1..3356f0e 100644 --- a/src/Meanbee/Magedbm/Command/BaseCommand.php +++ b/src/Meanbee/Magedbm/Command/BaseCommand.php @@ -147,7 +147,6 @@ public function getConfig(InputInterface $input) $this->config[$option] = $value; } } - } catch (IniReadingException $e) { $this->getOutput()->writeln('Unable to read config. Try running `configure` again.'); } @@ -221,5 +220,4 @@ protected function validateConfiguration() $configure = new ConfigureCommand(); return $configure->isConfigured(); } - -} \ No newline at end of file +} diff --git a/src/Meanbee/Magedbm/Command/ConfigureCommand.php b/src/Meanbee/Magedbm/Command/ConfigureCommand.php index db526c8..f919aca 100644 --- a/src/Meanbee/Magedbm/Command/ConfigureCommand.php +++ b/src/Meanbee/Magedbm/Command/ConfigureCommand.php @@ -74,7 +74,9 @@ protected function execute(InputInterface $input, OutputInterface $output) } if (!is_writeable($this->getAwsDirPath())) { - $this->getOutput()->writeln('Unable to write AWS credentials. Please manually add to ~/.aws/credentials'); + $this->getOutput()->writeln( + 'Unable to write AWS credentials. Please manually add to ~/.aws/credentials' + ); exit; } @@ -83,7 +85,9 @@ protected function execute(InputInterface $input, OutputInterface $output) } if (!is_writeable($this->getAppDirPath())) { - $this->getOutput()->writeln('Unable to write Magedbm config. Please manually add to ~/.magedbm/config'); + $this->getOutput()->writeln( + 'Unable to write Magedbm config. Please manually add to ~/.magedbm/config' + ); exit; } @@ -110,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $writer->writeToFile($this->getAwsConfigPath(), $config); $this->getOutput()->writeln('Successfully configured AWS region config.'); - } else if (!file_exists($this->getAwsConfigPath())) { + } elseif (!file_exists($this->getAwsConfigPath())) { $this->getOutput()->writeln('No AWS config was found, nor provided.'); } @@ -143,4 +147,4 @@ public function isConfigured() return false; } -} \ No newline at end of file +} diff --git a/src/Meanbee/Magedbm/Command/DeleteCommand.php b/src/Meanbee/Magedbm/Command/DeleteCommand.php index 1ba1ea9..bd92c4a 100644 --- a/src/Meanbee/Magedbm/Command/DeleteCommand.php +++ b/src/Meanbee/Magedbm/Command/DeleteCommand.php @@ -62,10 +62,8 @@ protected function execute(InputInterface $input, OutputInterface $output) $s3->deleteMatchingObjects($config['bucket'], $input->getArgument('name'), $regex); $this->getOutput()->writeln(sprintf('%s deleted.', $input->getArgument('file'))); - } catch (\Exception $e) { $this->getOutput()->writeln(sprintf('Failed to delete backup. %s.', $e->getMessage())); } } - -} \ No newline at end of file +} diff --git a/src/Meanbee/Magedbm/Command/GetCommand.php b/src/Meanbee/Magedbm/Command/GetCommand.php index 4426a25..05df1dc 100644 --- a/src/Meanbee/Magedbm/Command/GetCommand.php +++ b/src/Meanbee/Magedbm/Command/GetCommand.php @@ -120,7 +120,8 @@ protected function getLatestFile($s3, $config, $input) { try { // Download latest available backup - $results = $s3->getIterator('ListObjects', + $results = $s3->getIterator( + 'ListObjects', array('Bucket' => $config['bucket'], 'Prefix' => $input->getArgument('name')) ); @@ -135,7 +136,6 @@ protected function getLatestFile($s3, $config, $input) // Credentials Exception would have been thrown by now, so now we can safely check for item count. throw new \Exception('No backups found for ' . $input->getArgument('name')); } - } catch (InstanceProfileCredentialsException $e) { $this->getOutput()->writeln('AWS credentials not found. Please run `configure` command.'); exit; @@ -203,7 +203,9 @@ protected function backupImport($file, $input) $this->getOutput()->writeln('magerun db:import failed to import database.'); } } catch (\Exception $e) { + $this->cleanUp(); $this->getOutput()->writeln($e->getMessage()); + exit(1); } $this->cleanUp(); @@ -229,7 +231,9 @@ protected function backupMove($file) if ($result && file_exists($newFilename)) { $this->getOutput()->writeln("Downloaded to $newFilename"); } else { - $this->getOutput()->writeln("Failed to move backup to current working directory. Check $filename"); + $this->getOutput()->writeln( + "Failed to move backup to current working directory. Check $filename" + ); } } diff --git a/src/Meanbee/Magedbm/Command/ListCommand.php b/src/Meanbee/Magedbm/Command/ListCommand.php index 0b3a06d..7644e72 100644 --- a/src/Meanbee/Magedbm/Command/ListCommand.php +++ b/src/Meanbee/Magedbm/Command/ListCommand.php @@ -85,7 +85,9 @@ protected function execute(InputInterface $input, OutputInterface $output) if (!$results->count()) { // Credentials Exception would have been thrown by now, so now we can safely check for item count. - $this->getOutput()->writeln(sprintf('No backups found for %s', $input->getArgument('name'))); + $this->getOutput()->writeln( + sprintf('No backups found for %s', $input->getArgument('name')) + ); } } catch (InstanceProfileCredentialsException $e) { $this->getOutput()->writeln('AWS credentials not found. Please run `configure` command.'); @@ -93,5 +95,4 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->getOutput()->writeln('' . $e->getMessage() . ''); } } - -} \ No newline at end of file +} diff --git a/src/Meanbee/Magedbm/Command/PutCommand.php b/src/Meanbee/Magedbm/Command/PutCommand.php index 73d45ef..c51f2de 100644 --- a/src/Meanbee/Magedbm/Command/PutCommand.php +++ b/src/Meanbee/Magedbm/Command/PutCommand.php @@ -38,6 +38,18 @@ protected function configure() InputOption::VALUE_OPTIONAL, 'Tables to exclude from export. Default is magerun\'s @development option.' ) + ->addOption( + '--routines', + '-R', + InputOption::VALUE_NONE, + 'Include stored procedures and functions in the export' + ) + ->addOption( + '--triggers', + '-T', + InputOption::VALUE_NONE, + 'Include triggers in the export' + ) ->addOption( '--no-clean', null, @@ -94,7 +106,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $result->get('ObjectURL') ) ); - } catch (InstanceProfileCredentialsException $e) { $this->cleanUp(); $this->getOutput()->writeln('AWS credentials not found. Please run `configure` command.'); @@ -123,7 +134,11 @@ protected function maintainDatabaseHistory($input, $output, $s3, $config) try { $results = $s3->getIterator( 'ListObjects', - array('Bucket' => $config['bucket'], 'Prefix' => $input->getArgument('name') . '/', 'sort_results' => true) + array( + 'Bucket' => $config['bucket'], + 'Prefix' => $input->getArgument('name') . '/', + 'sort_results' => true + ) ); $results = iterator_to_array($results, true); @@ -133,7 +148,6 @@ protected function maintainDatabaseHistory($input, $output, $s3, $config) for ($i = 0; $i < $deleteCount; $i++) { $s3->deleteMatchingObjects($config['bucket'], $results[$i]['Key']); } - } catch (InstanceProfileCredentialsException $e) { $this->getOutput()->writeln('AWS credentials not found. Please run `configure` command.'); } catch (\Exception $e) { @@ -211,6 +225,8 @@ private function createBackup(InputInterface $input, OutputInterface $output) $filePath = $this->getFilePath($input); $stripOptions = $input->getOption('strip') ?: '@development'; + $routines = $input->getOption('routines') ?: false; + $triggers = $input->getOption('triggers') ?: false; // Exec must be unavailable so use PHP alternative (match output) $dbHelper = new DatabaseHelper(); @@ -258,7 +274,8 @@ private function createBackup(InputInterface $input, OutputInterface $output) 'include-tables' => $stripTables, 'no-data' => true, 'add-drop-table' => true, - 'skip-triggers' => true, + 'routines' => $routines, + 'skip-triggers' => !$triggers, ) ); @@ -291,9 +308,8 @@ private function createBackup(InputInterface $input, OutputInterface $output) } gzclose($zfh); fclose($fhData); - } catch (\Exception $e) { - throw new \Exception("Unable to export database."); + throw new \Exception("Unable to export database.\n" . $e->getMessage()); } } } diff --git a/src/Meanbee/Magedbm/Command/SelfUpdateCommand.php b/src/Meanbee/Magedbm/Command/SelfUpdateCommand.php index 00260b3..2f979fb 100644 --- a/src/Meanbee/Magedbm/Command/SelfUpdateCommand.php +++ b/src/Meanbee/Magedbm/Command/SelfUpdateCommand.php @@ -85,12 +85,12 @@ private function updateCurrentVersion( $version, $allowMajor, OutputInterface $output - ) - { + ) { + if ($manager->update($version, $allowMajor)) { $output->writeln('Updated to latest version.'); } else { $output->writeln('Already up-to-date.'); } } -} \ No newline at end of file +}