Merge branch 'release/1.97.9'

.travis.yml

@@ -14,64 +14,65 @@ php:
   - 5.5
 
 env:
-  - MAGENTO_VERSION="magento-mirror-1.4.2.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-  - MAGENTO_VERSION="magento-mirror-1.5.1.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-  - MAGENTO_VERSION="magento-mirror-1.6.2.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-  - MAGENTO_VERSION="magento-mirror-1.7.0.2" DB=mysql INSTALL_SAMPLE_DATA=yes
-  - MAGENTO_VERSION="magento-mirror-1.8.1.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-  # Do not download sample data of 1.9 -> The file is too big
-  - MAGENTO_VERSION="magento-mirror-1.9.0.1" DB=mysql INSTALL_SAMPLE_DATA=no
-  - MAGENTO_VERSION="magento-mirror-1.9.1.1" DB=mysql INSTALL_SAMPLE_DATA=no
-  - MAGENTO_VERSION="magento-mirror-1.9.2.1" DB=mysql INSTALL_SAMPLE_DATA=no
-  - MAGENTO_VERSION="magento-mirror-1.9.2.2" DB=mysql INSTALL_SAMPLE_DATA=no
+  global:
+    - DB=mysql
+  matrix:
+    - MAGENTO_VERSION="magento-mirror-1.4.2.0" INSTALL_SAMPLE_DATA=yes
+    - MAGENTO_VERSION="magento-mirror-1.5.1.0" INSTALL_SAMPLE_DATA=yes
+    - MAGENTO_VERSION="magento-mirror-1.6.2.0" INSTALL_SAMPLE_DATA=yes
+    - MAGENTO_VERSION="magento-mirror-1.7.0.2" INSTALL_SAMPLE_DATA=yes
+    - MAGENTO_VERSION="magento-mirror-1.8.1.0" INSTALL_SAMPLE_DATA=yes
+    # Do not download sample data of 1.9 -> The file is too big
+    - MAGENTO_VERSION="magento-mirror-1.9.0.1" INSTALL_SAMPLE_DATA=no
+    - MAGENTO_VERSION="magento-mirror-1.9.1.1" INSTALL_SAMPLE_DATA=no
+    - MAGENTO_VERSION="magento-mirror-1.9.2.1" INSTALL_SAMPLE_DATA=no
+    - MAGENTO_VERSION="magento-mirror-1.9.2.2" INSTALL_SAMPLE_DATA=no
 
 matrix:
   fast_finish: true
   exclude:
     # Newer Magento versions uses newer PHP versions
     - php: 5.3
       env: MAGENTO_VERSION="magento-mirror-1.9.0.1" DB=mysql INSTALL_SAMPLE_DATA=no
-
     - php: 5.3
       env: MAGENTO_VERSION="magento-mirror-1.9.1.1" DB=mysql INSTALL_SAMPLE_DATA=no
-
     - php: 5.3
       env: MAGENTO_VERSION="magento-mirror-1.9.2.1" DB=mysql INSTALL_SAMPLE_DATA=no
-
     - php: 5.3
       env: MAGENTO_VERSION="magento-mirror-1.9.2.2" DB=mysql INSTALL_SAMPLE_DATA=no
-
     # Old Magento Versions are not officially supported to run with PHP 5.5
     - php: 5.5
       env: MAGENTO_VERSION="magento-mirror-1.4.2.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-
     - php: 5.5
       env: MAGENTO_VERSION="magento-mirror-1.5.1.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-
     - php: 5.5
       env: MAGENTO_VERSION="magento-mirror-1.6.2.0" DB=mysql INSTALL_SAMPLE_DATA=yes
-
     - php: 5.5
       env: MAGENTO_VERSION="magento-mirror-1.7.0.2" DB=mysql INSTALL_SAMPLE_DATA=no
   include:
-    # Run the build script with an older PHP version
+    # Lint PHP code with PHP 7.0
+    - php: 7.0
+      env: LINTSH=1
+      script: find {src,tests} -name "*.php" ! -path '*/String.php' -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected'; test $? -eq 1
+    # Run the build script with different PHP versions
     - php: 5.3
       env: BUILDSH=1
       script: ./build.sh
-
-    # Run the build script with a recent PHP version
+    - php: 5.4
+      env: BUILDSH=1
+      script: ./build.sh
     - php: 5.5
       env: BUILDSH=1
       script: ./build.sh
-
-    # Run the build script with upcoming PHP 7.0 version
+    - php: 5.6
+      env: BUILDSH=1
+      script: ./build.sh
     - php: 7.0
-      env: MAGENTO_VERSION="magento-mirror-1.9.2.1" DB=mysql INSTALL_SAMPLE_DATA=no
-
-    # Lint PHP code with PHP 7.0
+      env: BUILDSH=1
+      script: ./build.sh
+    # Run with upcoming PHP 7.0 version
     - php: 7.0
-      env: LINTSH=1
-      script: find {src,tests} -name "*.php" ! -path '*/String.php' -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected'; test $? -eq 1
+      env: MAGENTO_VERSION="magento-mirror-1.9.2.2" DB=mysql INSTALL_SAMPLE_DATA=no
 
 before_install:
   - phpenv config-rm xdebug.ini
@@ -81,7 +82,7 @@ install:
   - travis_retry composer install --prefer-source --no-interaction --ignore-platform-reqs
 
 before_script:
-  - source ./build/travis/before_script.sh
+  - source build/travis/before_script.sh
 
 script:
   - vendor/bin/phpunit --debug --stop-on-error --stop-on-failure

build/travis/before_script.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # only install magento if MAGENTO_VERSION has been set
 
 if [ ! -z ${MAGENTO_VERSION+x} ]; then

changes.txt

@@ -2,6 +2,14 @@
 RECENT CHANGES
 **************
 
+======
+1.97.9
+======
+
+* #741 Fix remove customer exec dependency (by Tom Klingenberg)
+* #745 Fix Sys:cron:run all marked with [1] (by Christian Münch)
+* Test and code improvements (by Tom Klingenberg)
+
 ======
 1.97.8
 ======
@@ -12,103 +20,6 @@ RECENT CHANGES
 * #732 Fix DB:console unknown variable (reported by robinero)
 * #729 Fix YAML::parse input type (by Dane MacMillan)
 
-======
-1.97.7
-======
-
-* #724 Add missing versions from magento-mirror (by Fabrizio Branca)
-* #722 Magento downloads are no longer working from magentocommerce.com (by Tom Klingenberg)
-* #720 Add Info notice if dev:class:lookup returns a non-existent class (by Robbie Averill)
-* Improve installer magento version switch argument parsing (by Tom Klingenberg)
-
-======
-1.97.6
-======
-
-* #704 Fix missing custom cache types (fixed by Jon Acker)
-* #691 Fix PHP 7 forward compat (reported by Yireo, fixed by Tom Klingenberg)
-* #678 Fix sys:maintenance result report (by Wojtek Naruniec)
-* #670 Fix Slow Unit-Tests on Travis (reported by Aydin Hassan, fixed by Tom Klingenberg)
-* #664 Fix GenerateCommand::wrapCdata (by Tom Klingenberg)
-* #669 Fix Magerun2 download instructions (by Pierre du Plessis)
-* #665 Fix Magento 1.9.2.1 announced as 1.9.2.0 (reported by jurgisl)
-* #657 Fix and improve input processing in "local-config:generate" command (by Aydin Hassan)
-* #654 Fix PHP warning in Rewrite command (by Pieter Hoste)
-* #648 Fix FPC cleared - even if not (by Steve Robbins)
-* Add support for single autoloader files (by Christian Münch)
-* #718 Package magento-mirror-1.9.2.2 (by Achim Rosenhagen)
-* #698 Add path completion in bash autocomplete (by Chris N)
-* #651 Update symfony dependencies to ~2.3 (by James Halsall)
-* #671 Unit Tests for Uninstall command (by Aydin Hassan)
-* #662 Unit Test for LocalConfigGenerate (by Aydin Hassan)
-
-======
-1.97.5
-======
-
-* #643 Fix fatal error in customer:delete (by Tom Klingenberg)
-* #640 Fix db:dump duplicate help (by Alexander Menk)
-* #645 Add fish autocomplete file (by Simon Sprankel)
-* #616 Add db:dump exclude option (by Alexander Menk)
-* Add js and css merging commands (by Simon Sippert)
-* Add cache:dir:flush command (by Tom Klingenberg)
-* Show supported compression values (by Tom Klingenberg)
-
-======
-1.97.4
-======
-
-* #634 regression in user-interaction (reported by 25thhour, fixed by Tom Klingenberg)
-
-======
-1.97.3
-======
-
-* Changed phar compression from bzip2 to gzip
-* #627 n98-magerun: command not found (reported by Qbixx, fixed by Tom Klingenberg)
-* #620 cache:disable does not validate code (by Luke Rodgers)
-
-======
-1.97.2
-======
-
-* Minor fix bumping the revision (by Tom Klingenberg)
-
-======
-1.97.1
-======
-
-* #630 Magento 1.9.2.1 is out (by Tom Klingenberg)
-* #632 fix of PHP Fatal error: [] operator not supported for strings (by Tom Klingenberg)
-
-======
-1.97.0
-======
-
-* #549 general code cleanup (by Simon Bräuer)
-* #564 Print only magento version -> sys:info command (by David Alger)
-* #572 fixes and improvements (by Tom Klingenberg)
-* #573 Improve observer list accuracy (by Peter O'Callaghan)
-* #574 reduced complexity observer list command (by Tom Klingenberg)
-* #580 reset magento root folder in `N98\Magento\Application::reinit` (by Claudio Kressibucher)
-* #590 Bugfix/Bash Completion on OS X (by Joey Hoer)
-* #591 Bugfix/Configuration Agnostic ZSH Completion (by Joey Hoer)
-* #593 n98-magerun.phar dev:module:create --add-all does not create setup scripts (by Michael Lühr)
-* #599 Excluding wishlist tables (by Aaron Edmonds)
-* #600 Update lookup command (by Tomas Liubinas)
-* #602 Update Travis configuration (by Tom Klingenberg)
-* #603 Feature/autoload restorer (by Tom Klingenberg)
-* #604 Fix Cookie Domain validation (by Tom Klingenberg)
-* #610 Checksum for package downloads (by Tom Klingenberg)
-* #614 Package magento-mirror-1.9.2.0 (by Achim Rosenhagen)
-* #618 CommandTester normalization of Display (by Tom Klingenberg)
-
-======
-1.96.1
-======
-
-* Changed self-update URLs to new download page: http://files.magerun.net
-
 -----------------------------------------
 SEE FULL CHANGELOG: http://bit.ly/10IDU1H
 -----------------------------------------

composer.json

@@ -31,6 +31,11 @@
             "Composer": "src"
         }
     },
+    "autoload-dev": {
+        "psr-0": {
+            "N98": "tests"
+        }
+    },
     "authors": [
         {
             "name": "Christian Münch",

config.yaml

@@ -13,6 +13,7 @@ helpers:
   dialog: Composer\Command\Helper\DialogHelper
   parameter: N98\Util\Console\Helper\ParameterHelper
   table: N98\Util\Console\Helper\TableHelper
+  io: N98\Util\Console\Helper\IoHelper
 
 script:
   folders:
@@ -38,6 +39,7 @@ event:
   subscriber:
     - N98\Magento\EventSubscriber
     - N98\Magento\Command\ComposerWrapper\EventSubscriber
+    - N98\Util\Console\Helper\IoHelper
 
 commands:
   customCommands:

src/N98/Magento/Application.php

@@ -28,25 +28,24 @@
 class Application extends BaseApplication
 {
     /**
-     * @var int
+     * @var string
      */
-    const MAGENTO_MAJOR_VERSION_1 = 1;
 
+    const APP_NAME = 'n98-magerun';
     /**
-     * @var int
+     * @var string
      */
-    const MAGENTO_MAJOR_VERSION_2 = 2;
+    const APP_VERSION = '1.97.9';
 
     /**
-     * @var string
+     * @var int
      */
-
-    const APP_NAME = 'n98-magerun';
+    const MAGENTO_MAJOR_VERSION_1 = 1;
 
     /**
-     * @var string
+     * @var int
      */
-    const APP_VERSION = '1.97.8';
+    const MAGENTO_MAJOR_VERSION_2 = 2;
 
     /**
      * @var string

src/N98/Magento/Command/AbstractMagentoCommand.php

@@ -8,7 +8,6 @@
 use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
 use Composer\Package\Loader\ArrayLoader as PackageLoader;
 use Composer\Factory as ComposerFactory;

src/N98/Magento/Command/Admin/User/UnlockCommand.php

@@ -42,8 +42,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($username = $input->getArgument('username')) {
                 $user = \Mage::getModel('admin/user')->loadByUsername($username);
                 if (!$user || !$user->getId()) {
-                     $output->writeln('<error>Couldn\'t find admin ' . $username . '</error>');
-                     return;
+                    $output->writeln('<error>Couldn\'t find admin ' . $username . '</error>');
+                    return;
                 }
                 \Mage::getResourceModel('enterprise_pci/admin_user')->unlock($user->getId());
                 $output->writeln('<info><comment>' . $username . '</comment> unlocked</info>');

src/N98/Magento/Command/Config/SetCommand.php

@@ -47,22 +47,29 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->detectMagento($output, true);
-        if ($this->initMagento()) {
-            $config = $this->_getConfigModel();
+        if (!$this->initMagento()) {
+            return;
+        }
 
-            $this->_validateScopeParam($input->getOption('scope'));
-            $scopeId = $this->_convertScopeIdParam($input->getOption('scope'), $input->getOption('scope-id'));
+        $config = $this->_getConfigModel();
+        if (!$config->getResourceModel()) {
+            // without a resource model, a config option can't be saved.
+            return;
+        }
 
-            $value = str_replace(array('\n', '\r'), array("\n", "\r"), $input->getArgument('value'));
-            $value = $this->_formatValue($value, ($input->getOption('encrypt') ? 'encrypt' : false));
+        $this->_validateScopeParam($input->getOption('scope'));
+        $scopeId = $this->_convertScopeIdParam($input->getOption('scope'), $input->getOption('scope-id'));
 
-            $config->saveConfig(
-                $input->getArgument('path'),
-                $value,
-                $input->getOption('scope'),
-                $scopeId
-            );
-            $output->writeln('<comment>' . $input->getArgument('path') . "</comment> => <comment>" . $input->getArgument('value') . '</comment>');
-        }
+        $value = str_replace(array('\n', '\r'), array("\n", "\r"), $input->getArgument('value'));
+        $value = $this->_formatValue($value, ($input->getOption('encrypt') ? 'encrypt' : false));
+
+        $config->saveConfig(
+            $input->getArgument('path'),
+            $value,
+            $input->getOption('scope'),
+            $scopeId
+        );
+
+        $output->writeln('<comment>' . $input->getArgument('path') . "</comment> => <comment>" . $input->getArgument('value') . '</comment>');
     }
 }

src/N98/Magento/Command/Customer/AbstractCustomerCommand.php

@@ -56,13 +56,4 @@ protected function getCountryCollection()
     {
         return $this->_getResourceModel('directory/country_collection', 'Mage_Directory_Model_Resource_Country_Collection');
     }
-
-
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return Exec::allowed();
-    }
 }