Browse Source

Updating vendors

Julio Montoya 12 years ago
parent
commit
9b8e7a4384
25 changed files with 713 additions and 369 deletions
  1. 1 1
      vendor/autoload.php
  2. 2 4
      vendor/chamilo/chash/.travis.yml
  3. 5 3
      vendor/chamilo/chash/README.md
  4. BIN
      vendor/chamilo/chash/chash.phar
  5. 7 2
      vendor/chamilo/chash/chash.php
  6. 47 0
      vendor/chamilo/chash/src/Chash/Command/Database/ShowConnInfoCommand.php
  7. 2 2
      vendor/chamilo/chash/src/Chash/Command/Files/CleanConfigFiles.php
  8. 56 0
      vendor/chamilo/chash/src/Chash/Command/Files/MailConfCommand.php
  9. BIN
      vendor/chamilo/chash/src/Chash/Command/User/.DisableAdminsCommand.php.swp
  10. 31 0
      vendor/chamilo/chash/src/Chash/Command/User/CommonChamiloUserCommand.php
  11. 54 0
      vendor/chamilo/chash/src/Chash/Command/User/DisableAdminsCommand.php
  12. 66 0
      vendor/chamilo/chash/src/Chash/Command/User/MakeAdminCommand.php
  13. 55 0
      vendor/chamilo/chash/src/Chash/Command/User/ResetLoginCommand.php
  14. 1 0
      vendor/composer/autoload_namespaces.php
  15. 4 3
      vendor/composer/autoload_real.php
  16. 323 342
      vendor/composer/installed.json
  17. 1 0
      vendor/franmomu/silex-pagerfanta-provider
  18. 1 0
      vendor/jmontoyaa/phpqrcode
  19. 1 1
      vendor/mheap/silex-assetic
  20. 1 1
      vendor/pagerfanta/pagerfanta/src/Pagerfanta/PagerfantaInterface.php
  21. 15 4
      vendor/pagerfanta/pagerfanta/src/Pagerfanta/View/Template/DefaultTemplate.php
  22. 1 1
      vendor/pagerfanta/pagerfanta/tests/Pagerfanta/Tests/Adapter/DoctrineSelectableAdapterTest.php
  23. 29 0
      vendor/pagerfanta/pagerfanta/tests/Pagerfanta/Tests/View/DefaultViewTest.php
  24. 7 4
      vendor/symfony/console/Symfony/Component/Console/Input/ArgvInput.php
  25. 3 1
      vendor/symfony/console/Symfony/Component/Console/Input/Input.php

+ 1 - 1
vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInite3eac84f820647d7ebea40212225226a::getLoader();
+return ComposerAutoloaderInitc73a9e0c63d442c0e11d2514c427155a::getLoader();

+ 2 - 4
vendor/chamilo/chash/.travis.yml

@@ -1,6 +1,4 @@
 language: php
-
 php:
-  - 5.3
-  - 5.4
-  - 5.5
+  - "5.4"
+  - "5.3"

+ 5 - 3
vendor/chamilo/chash/README.md

@@ -9,7 +9,7 @@ To get the most out of Chash, you should move the chash.phar file to your
 you put chash.phar and doing:
 
     chmod +x chash.phar
-    mv chash.phar /usr/local/bin/chash
+    sudo ln -s /path/to/chash.phar /usr/local/bin/chash
 
 Then you can launch chash by moving into any Chamilo installation directory and
 typing
@@ -37,7 +37,7 @@ Remember to add execution permissions to the phar file.
     cd chash
     php -d phar.readonly=0 createPhar.php
     chmod +x chash.phar
-    sudo mv chash.phar /usr/local/bin/chash
+    sudo ln -s /path/to/chash.phar /usr/local/bin/chash
     Then you can call the chash.phar file in your Chamilo installation
 
     cd /var/www/chamilo
@@ -51,11 +51,13 @@ Available commands:
         db:dump                 Outputs a dump of the database
         db:full_backup          Generates a .tgz from the Chamilo files and database
         db:restore              Allows you to restore an SQL dump right into the active database of a given Chamilo installation (which will also erase all previous data in that database)
+        db:show_conn_info       Shows database connection credentials for the current Chamilo install
         db:sql_cli              Enters to the SQL command line
         db:sql_count            Count the number of rows in a specific table
 
     files
         files:clean_archives          Cleans the archives directory
+        files:clean_config_files      Cleans the config files to help you re-install
 
     translation
         translation:export_language   Exports a Chamilo language package
@@ -85,4 +87,4 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Mail: info@chamilo.org
+Mail: info@chamilo.org

BIN
vendor/chamilo/chash/chash.phar


+ 7 - 2
vendor/chamilo/chash/chash.php

@@ -42,10 +42,15 @@ $application->addCommands(array(
     new Chash\Command\Database\SQLCountCommand(),
     new Chash\Command\Database\FullBackupCommand(),
     new Chash\Command\Database\DropDatabaseCommand(),
+    new Chash\Command\Database\ShowConnInfoCommand(),
     new Chash\Command\Files\CleanTempFolderCommand(),
     new Chash\Command\Files\CleanConfigFiles(),
+    new Chash\Command\Files\MailConfCommand(),
     new Chash\Command\Translation\ExportLanguageCommand(),
-    new Chash\Command\Translation\ImportLanguageCommand()
+    new Chash\Command\Translation\ImportLanguageCommand(),
+    new Chash\Command\User\DisableAdminsCommand(),
+    new Chash\Command\User\MakeAdminCommand(),
+    new Chash\Command\User\ResetLoginCommand(),
 ));
 
 $application->run();
@@ -157,4 +162,4 @@ function _chash_find_config_file()
 function _t($var)
 {
     return $var;
-}
+}

+ 47 - 0
vendor/chamilo/chash/src/Chash/Command/Database/ShowConnInfoCommand.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Chash\Command\Database;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ShowConnInfoCommand extends CommonChamiloDatabaseCommand
+{
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('db:show_conn_info')
+            ->setDescription('Shows database connection credentials for the current Chamilo install');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        parent::execute($input, $output);
+
+        $dialog = $this->getHelperSet()->get('dialog');
+
+        if (!$dialog->askConfirmation(
+            $output,
+            '<question>Are you sure you want to show the database connection info here? (y/N)</question>',
+            false
+        )
+        ) {
+            return;
+        }
+
+        $_configuration = $this->getHelper('configuration')->getConfiguration();
+
+        $output->writeln("Database connection details:");
+        $output->writeln("Host:\t".$_configuration['db_host']);
+        $output->writeln("User:\t".$_configuration['db_user']);
+        $output->writeln("Pass:\t".$_configuration['db_password']);
+        $output->writeln("DB:\t".$_configuration['main_database']);
+        $output->writeln("Connection string (add password manually for increased security:");
+        $output->writeln("mysql -h ".$_configuration['db_host']." -u ".$_configuration['db_user']." -p ".$_configuration['main_database']."\n");
+    }
+}

+ 2 - 2
vendor/chamilo/chash/src/Chash/Command/Files/CleanConfigFiles.php

@@ -21,7 +21,7 @@ class CleanConfigFiles extends CommonChamiloDatabaseCommand
         parent::configure();
         $this
             ->setName('files:clean_config_files')
-            ->setDescription('Cleans the archives directory');
+            ->setDescription('Cleans the config files to help you re-install');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -62,4 +62,4 @@ class CleanConfigFiles extends CommonChamiloDatabaseCommand
             $output->writeln("<comment>Nothing to delete</comment>");
         }
     }
-}
+}

+ 56 - 0
vendor/chamilo/chash/src/Chash/Command/Files/MailConfCommand.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Chash\Command\Files;
+
+use Chash\Command\Database\CommonChamiloDatabaseCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Returns the current mail configuration 
+ */
+class MailConfCommand extends CommonChamiloDatabaseCommand
+{
+    protected function configure()
+    {
+        parent::configure();
+        $this
+            ->setName('files:show_mail_conf')
+            ->setDescription('Returns the current mail config');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        parent::execute($input, $output);
+
+        $output->writeln('<comment>Current mail configuration:</comment>');
+
+        $path = $this->getHelper('configuration')->getConfigurationPath();
+        $path .= 'mail.conf.php';
+        define('IS_WINDOWS_OS',strtolower(substr(php_uname(), 0, 3 )) == 'win'?true:false);
+        if (isset($path) && is_file($path)) {
+            $output->writeln('File: '.$path);
+            $lines = file($path);
+            $list = array('SMTP_HOST','SMTP_PORT','SMTP_MAILER','SMTP_AUTH','SMTP_USER','SMTP_PASS');
+            foreach ($lines as $line) {
+                $match = array();
+                if (preg_match("/platform_email\['(.*)'\]/",$line,$match)) {
+                    if (in_array($match[1],$list)) {
+                        eval($line);
+                    }
+                }
+            }
+            $output->writeln('Host:     '.$platform_email['SMTP_HOST']);
+            $output->writeln('Port:     '.$platform_email['SMTP_PORT']);
+            $output->writeln('Mailer:   '.$platform_email['SMTP_MAILER']);
+            $output->writeln('Auth SMTP:'.$platform_email['SMTP_AUTH']);
+            $output->writeln('User:     '.$platform_email['SMTP_USER']);
+            $output->writeln('Pass:     '.$platform_email['SMTP_PASS']);
+        } else {
+            $output->writeln("<comment>Nothing to print</comment>");
+        }
+    }
+}

BIN
vendor/chamilo/chash/src/Chash/Command/User/.DisableAdminsCommand.php.swp


+ 31 - 0
vendor/chamilo/chash/src/Chash/Command/User/CommonChamiloUserCommand.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Chash\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+
+class CommonChamiloUserCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->addOption(
+                'conf',
+                null,
+                InputOption::VALUE_NONE,
+                'Set a configuration file'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $configuration = $input->getOption('conf');
+        $this->getHelper('configuration')->readConfigurationFile($configuration);
+    }
+}

+ 54 - 0
vendor/chamilo/chash/src/Chash/Command/User/DisableAdminsCommand.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Chash\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+/**
+ * Command functions meant to deal with what the user of this script is calling
+ * it for.
+ */
+/**
+ * Remove the "admin" role from *ALL* users on all portals of this instance
+ */
+class DisableAdminsCommand extends CommonChamiloUserCommand
+{
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('user:disable_admins')
+            ->setDescription('Makes the given user admin on the main portal');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        parent::execute($input, $output);
+        $_configuration = $this->getHelper('configuration')->getConfiguration();
+        $dbh = $this->getHelper('configuration')->getConnection();
+        $dialog = $this->getHelperSet()->get('dialog');
+        if (!$dialog->askConfirmation(
+            $output,
+            '<question>This action will make all admins normal teachers. Are you sure? (y/N)</question>',
+            false
+        )
+        ) {
+            return;
+        }
+
+        $us = "DELETE FROM admin";
+        $uq = mysql_query($us);
+        if ($uq === false) {
+            $output->writeln('Could not delete admins.');
+        } else {
+            $output->writeln('All admins disabled.');
+        }
+        return null;
+    }
+}

+ 66 - 0
vendor/chamilo/chash/src/Chash/Command/User/MakeAdminCommand.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Chash\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+/**
+ * Command functions meant to deal with what the user of this script is calling
+ * it for.
+ */
+/**
+ * Makes the given user an admin on the main portal
+ */
+class MakeAdminCommand extends CommonChamiloUserCommand
+{
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('user:make_admin')
+            ->setDescription('Makes the given user admin on the main portal')
+            ->addArgument(
+                'username', 
+                InputArgument::REQUIRED,
+                'Allows you to specify a username to make admin'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        parent::execute($input, $output);
+        $_configuration = $this->getHelper('configuration')->getConfiguration();
+        $dbh = $this->getHelper('configuration')->getConnection();
+        $username = $input->getArgument('username');
+        $us = "SELECT * FROM user WHERE username = '".mysql_real_escape_string($username)."'";
+        $uq = mysql_query($us);
+        $un = mysql_num_rows($uq);
+        if ($un >= 1) {
+            $user = mysql_fetch_assoc($uq);
+            $as = "SELECT * FROM admin WHERE user_id = ".$user['user_id'];
+            $aq = mysql_query($as);
+            $an = mysql_num_rows($aq);
+            if ($an < 1) {
+                //$output->writeln('User '.$username.' is not an admin. Making him one.');
+                $ms = "INSERT INTO admin (user_id) VALUES (".$user['user_id'].")";
+                $mq = mysql_query($ms);
+                if ($mq === false) {
+                    $output->writeln('Error making '.$username.' an admin.');
+                } else {
+                    $output->writeln('User '.$username.' is now an admin.');
+                }
+            } else {
+                $output->writeln('User '.$username.' is alreay an admin.');
+            }
+        } else {
+            $output->writeln('Could not find user '.$username);
+        }
+        return null;
+    }
+}

+ 55 - 0
vendor/chamilo/chash/src/Chash/Command/User/ResetLoginCommand.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Chash\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+/**
+ * Command functions meant to deal with what the user of this script is calling
+ * it for.
+ */
+/**
+ * Returns a password reset link for the given username (user will receive
+ * an e-mail with new login + password)
+ */
+class ResetLoginCommand extends CommonChamiloUserCommand
+{
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('user:reset_login')
+            ->setDescription('Outputs login link for given username')
+            ->addArgument(
+                'username', 
+                InputArgument::REQUIRED,
+                'Allows you to specify a username to login as'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        parent::execute($input, $output);
+        $_configuration = $this->getHelper('configuration')->getConfiguration();
+        $dbh = $this->getHelper('configuration')->getConnection();
+        $username = $input->getArgument('username');
+        $us = "SELECT * FROM user WHERE username = '".mysql_real_escape_string($username)."'";
+        $uq = mysql_query($us);
+        $un = mysql_num_rows($uq);
+        if ($un >= 1) {
+            $user = mysql_fetch_assoc($uq);
+            $link = $_configuration['root_web'].'main/auth/lostPassword.php?reset='.md5($_configuration['security_key'].$user['email']).'&id='.$user['user_id'];
+            $output->writeln('Follow this link to login as '.$username);
+            $output->writeln($link);
+        } else {
+            $output->writeln('Could not find user '.$username);
+        }
+        return null;
+    }
+}

+ 1 - 0
vendor/composer/autoload_namespaces.php

@@ -43,6 +43,7 @@ return array(
     'HTMLPurifier' => $vendorDir . '/ezyang/htmlpurifier/library',
     'Grom\\Silex' => $vendorDir . '/grom/silex-service-provider/src',
     'Gedmo' => array($vendorDir . '/gedmo/doctrine-extensions/lib', $vendorDir . '/gedmo/doctrine-extensions/lib'),
+    'FranMoreno' => $vendorDir . '/franmomu/silex-pagerfanta-provider/src',
     'Entity' => $baseDir . '/main/inc',
     'Doctrine\\ORM' => $vendorDir . '/doctrine/orm/lib',
     'Doctrine\\DBAL\\Migrations' => $vendorDir . '/doctrine/migrations/lib',

+ 4 - 3
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php generated by Composer
 
-class ComposerAutoloaderInite3eac84f820647d7ebea40212225226a
+class ComposerAutoloaderInitc73a9e0c63d442c0e11d2514c427155a
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInite3eac84f820647d7ebea40212225226a
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInite3eac84f820647d7ebea40212225226a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitc73a9e0c63d442c0e11d2514c427155a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInite3eac84f820647d7ebea40212225226a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc73a9e0c63d442c0e11d2514c427155a', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -38,6 +38,7 @@ class ComposerAutoloaderInite3eac84f820647d7ebea40212225226a
 
         $loader->register(true);
 
+        require $vendorDir . '/jmontoyaa/phpqrcode/qrlib.php';
         require $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php';
         require $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php';
 

File diff suppressed because it is too large
+ 323 - 342
vendor/composer/installed.json


+ 1 - 0
vendor/franmomu/silex-pagerfanta-provider

@@ -0,0 +1 @@
+Subproject commit dcafa4f9788dddfb1d5c5783b9bb8439313c0d54

+ 1 - 0
vendor/jmontoyaa/phpqrcode

@@ -0,0 +1 @@
+Subproject commit c50e0fbb2f69ad961a0f7b56b082a6772b36585b

+ 1 - 1
vendor/mheap/silex-assetic

@@ -1 +1 @@
-Subproject commit a3a2747ca48897ebd1e1def300c58117969ad6aa
+Subproject commit 3294311b34848d1395ab38809756fa03be54fb61

+ 1 - 1
vendor/pagerfanta/pagerfanta/src/Pagerfanta/PagerfantaInterface.php

@@ -12,7 +12,7 @@
 namespace Pagerfanta;
 
 /**
- * Deprecated.
+ * @deprecated
  */
 interface PagerfantaInterface
 {

+ 15 - 4
vendor/pagerfanta/pagerfanta/src/Pagerfanta/View/Template/DefaultTemplate.php

@@ -22,12 +22,15 @@ class DefaultTemplate extends Template
         'css_disabled_class' => 'disabled',
         'css_dots_class'     => 'dots',
         'css_current_class'  => 'current',
-        'dots_text'          => '...'
+        'dots_text'          => '...',
+        'container_template' => '<nav>%pages%</nav>',
+        'page_template'      => '<a href="%href%">%text%</a>',
+        'span_template'      => '<span class="%class%">%text%</span>'
     );
 
     public function container()
     {
-        return '<nav>%pages%</nav>';
+        return $this->option('container_template');
     }
 
     public function page($page)
@@ -39,7 +42,12 @@ class DefaultTemplate extends Template
 
     public function pageWithText($page, $text)
     {
-        return sprintf('<a href="%s">%s</a>', $this->generateRoute($page), $text);
+        $search = array('%href%', '%text%');
+
+        $href = $this->generateRoute($page);
+        $replace = array($href, $text);
+
+        return str_replace($search, $replace, $this->option('page_template'));
     }
 
     public function previousDisabled()
@@ -84,6 +92,9 @@ class DefaultTemplate extends Template
 
     private function generateSpan($class, $page)
     {
-        return sprintf('<span class="%s">%s</span>', $class, $page);
+        $search = array('%class%', '%text%');
+        $replace = array($class, $page);
+
+        return str_replace($search, $replace, $this->option('span_template'));
     }
 }

+ 1 - 1
vendor/pagerfanta/pagerfanta/tests/Pagerfanta/Tests/Adapter/DoctrineSelectableAdapterTest.php

@@ -6,7 +6,7 @@ use Pagerfanta\Adapter\DoctrineSelectableAdapter;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\ORM\Version;
+use Doctrine\Common\Version;
 
 class DoctrineSelectableAdapterTest extends \PHPUnit_Framework_TestCase
 {

+ 29 - 0
vendor/pagerfanta/pagerfanta/tests/Pagerfanta/Tests/View/DefaultViewTest.php

@@ -262,6 +262,35 @@ EOF
         , $this->renderView($options));
     }
 
+    public function testRenderModifiyingStringTemplate()
+    {
+        $this->setNbPages(100);
+        $this->setCurrentPage(1);
+
+        $options = array(
+            'container_template' => '<nav><ul>%pages%</ul></nav>',
+            'page_template'      => '<li><a href="%href%">%text%</a></li>',
+            'span_template'      => '<li><span class="%class%">%text%</span></li>'
+        );
+
+        $this->assertRenderedView(<<<EOF
+<nav>
+    <ul>
+        <li><span class="disabled">Previous</span></li>
+        <li><span class="current">1</span></li>
+        <li><a href="|2|">2</a></li>
+        <li><a href="|3|">3</a></li>
+        <li><a href="|4|">4</a></li>
+        <li><a href="|5|">5</a></li>
+        <li><span class="dots">...</span></li>
+        <li><a href="|100|">100</a></li>
+        <li><a href="|2|">Next</a></li>
+    </ul>
+</nav>
+EOF
+        , $this->renderView($options));
+    }
+
     protected function filterExpectedView($expected)
     {
         return $this->removeWhitespacesBetweenTags($expected);

+ 7 - 4
vendor/symfony/console/Symfony/Component/Console/Input/ArgvInput.php

@@ -320,11 +320,14 @@ class ArgvInput extends Input
      */
     public function __toString()
     {
-        $tokens = array_map(function ($token) {
+        $self = $this;
+        $tokens = array_map(function ($token) use ($self) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1] . $this->escapeToken($match[2]);
-            } elseif ($token && $token[0] !== '-') {
-                return $this->escapeToken($token);
+                return $match[1] . $self->escapeToken($match[2]);
+            }
+
+            if ($token && $token[0] !== '-') {
+                return $self->escapeToken($token);
             }
 
             return $token;

+ 3 - 1
vendor/symfony/console/Symfony/Component/Console/Input/Input.php

@@ -214,9 +214,11 @@ abstract class Input implements InputInterface
     /**
      * Escapes a token through escapeshellarg if it contains unsafe chars
      *
+     * @param string $token
+     *
      * @return string
      */
-    protected function escapeToken($token)
+    public function escapeToken($token)
     {
         return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
     }

Some files were not shown because too many files changed in this diff