updated core to 1.7.15
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package Grav.Console
|
||||
* @package Grav\Console\Cli
|
||||
*
|
||||
* @copyright Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
|
||||
* @copyright Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
|
||||
* @license MIT License; see LICENSE file for details.
|
||||
*/
|
||||
|
||||
@@ -13,18 +14,20 @@ use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
|
||||
/**
|
||||
* Class CleanCommand
|
||||
* @package Grav\Console\Cli
|
||||
*/
|
||||
class CleanCommand extends Command
|
||||
{
|
||||
/* @var InputInterface $output */
|
||||
/** @var InputInterface */
|
||||
protected $input;
|
||||
/** @var SymfonyStyle */
|
||||
protected $io;
|
||||
|
||||
/* @var OutputInterface $output */
|
||||
protected $output;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
/** @var array */
|
||||
protected $paths_to_remove = [
|
||||
'codeception.yml',
|
||||
'tests/',
|
||||
@@ -61,6 +64,11 @@ class CleanCommand extends Command
|
||||
'user/plugins/email/vendor/swiftmailer/swiftmailer/doc',
|
||||
'user/themes/antimatter/.sass-cache',
|
||||
'vendor/antoligy/dom-string-iterators/composer.json',
|
||||
'vendor/composer/ca-bundle/composer.json',
|
||||
'vendor/composer/ca-bundle/phpstan.neon.dist',
|
||||
'vendor/composer/semver/CHANGELOG.md',
|
||||
'vendor/composer/semver/composer.json',
|
||||
'vendor/composer/semver/phpstan.neon.dist',
|
||||
'vendor/doctrine/cache/.travis.yml',
|
||||
'vendor/doctrine/cache/build.properties',
|
||||
'vendor/doctrine/cache/build.xml',
|
||||
@@ -70,16 +78,35 @@ class CleanCommand extends Command
|
||||
'vendor/doctrine/cache/.gitignore',
|
||||
'vendor/doctrine/cache/.git',
|
||||
'vendor/doctrine/cache/tests',
|
||||
'vendor/doctrine/cache/UPGRADE.md',
|
||||
'vendor/doctrine/collections/docs',
|
||||
'vendor/doctrine/collections/.doctrine-project.json',
|
||||
'vendor/doctrine/collections/CONTRIBUTING.md',
|
||||
'vendor/doctrine/collections/psalm.xml.dist',
|
||||
'vendor/doctrine/collections/composer.json',
|
||||
'vendor/doctrine/collections/phpunit.xml.dist',
|
||||
'vendor/doctrine/collections/tests',
|
||||
'vendor/donatj/phpuseragentparser/.git',
|
||||
'vendor/donatj/phpuseragentparser/.github',
|
||||
'vendor/donatj/phpuseragentparser/.gitignore',
|
||||
'vendor/donatj/phpuseragentparser/.editorconfig',
|
||||
'vendor/donatj/phpuseragentparser/.travis.yml',
|
||||
'vendor/donatj/phpuseragentparser/composer.json',
|
||||
'vendor/donatj/phpuseragentparser/phpunit.xml.dist',
|
||||
'vendor/donatj/phpuseragentparser/Tests',
|
||||
'vendor/donatj/phpuseragentparser/tests',
|
||||
'vendor/donatj/phpuseragentparser/Tools',
|
||||
'vendor/donatj/phpuseragentparser/CONTRIBUTING.md',
|
||||
'vendor/donatj/phpuseragentparser/Makefile',
|
||||
'vendor/donatj/phpuseragentparser/.mddoc.xml',
|
||||
'vendor/dragonmantank/cron-expression/.editorconfig',
|
||||
'vendor/dragonmantank/cron-expression/composer.json',
|
||||
'vendor/dragonmantank/cron-expression/tests',
|
||||
'vendor/dragonmantank/cron-expression/CHANGELOG.md',
|
||||
'vendor/enshrined/svg-sanitize/tests',
|
||||
'vendor/enshrined/svg-sanitize/.gitignore',
|
||||
'vendor/enshrined/svg-sanitize/.travis.yml',
|
||||
'vendor/enshrined/svg-sanitize/composer.json',
|
||||
'vendor/enshrined/svg-sanitize/phpunit.xml',
|
||||
'vendor/erusev/parsedown/composer.json',
|
||||
'vendor/erusev/parsedown/phpunit.xml.dist',
|
||||
'vendor/erusev/parsedown/.travis.yml',
|
||||
@@ -95,12 +122,20 @@ class CleanCommand extends Command
|
||||
'vendor/filp/whoops/examples',
|
||||
'vendor/filp/whoops/tests',
|
||||
'vendor/filp/whoops/.git',
|
||||
'vendor/filp/whoops/.github',
|
||||
'vendor/filp/whoops/.gitignore',
|
||||
'vendor/filp/whoops/.scrutinizer.yml',
|
||||
'vendor/filp/whoops/.travis.yml',
|
||||
'vendor/filp/whoops/phpunit.xml.dist',
|
||||
'vendor/filp/whoops/CHANGELOG.md',
|
||||
'vendor/gregwar/image/Gregwar/Image/composer.json',
|
||||
'vendor/gregwar/image/Gregwar/Image/phpunit.xml',
|
||||
'vendor/gregwar/image/Gregwar/Image/phpunit.xml.dist',
|
||||
'vendor/gregwar/image/Gregwar/Image/Makefile',
|
||||
'vendor/gregwar/image/Gregwar/Image/.editorconfig',
|
||||
'vendor/gregwar/image/Gregwar/Image/.php_cs',
|
||||
'vendor/gregwar/image/Gregwar/Image/.styleci.yml',
|
||||
'vendor/gregwar/image/Gregwar/Image/.travis.yml',
|
||||
'vendor/gregwar/image/Gregwar/Image/.gitignore',
|
||||
'vendor/gregwar/image/Gregwar/Image/.git',
|
||||
'vendor/gregwar/image/Gregwar/Image/doc',
|
||||
@@ -108,22 +143,30 @@ class CleanCommand extends Command
|
||||
'vendor/gregwar/image/Gregwar/Image/tests',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/composer.json',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/phpunit.xml',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/.travis.yml',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/.gitignore',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/.git',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/demo',
|
||||
'vendor/gregwar/cache/Gregwar/Cache/tests',
|
||||
'vendor/ircmaxell/password-compat/composer.json',
|
||||
'vendor/ircmaxell/password-compat/phpunit.xml.dist',
|
||||
'vendor/ircmaxell/password-compat/version-test.php',
|
||||
'vendor/ircmaxell/password-compat/.travis.yml',
|
||||
'vendor/ircmaxell/password-compat/test',
|
||||
'vendor/guzzlehttp/psr7/composer.json',
|
||||
'vendor/guzzlehttp/psr7/.editorconfig',
|
||||
'vendor/guzzlehttp/psr7/CHANGELOG.md',
|
||||
'vendor/itsgoingd/clockwork/.gitattributes',
|
||||
'vendor/itsgoingd/clockwork/CHANGELOG.md',
|
||||
'vendor/itsgoingd/clockwork/composer.json',
|
||||
'vendor/league/climate/composer.json',
|
||||
'vendor/league/climate/CHANGELOG.md',
|
||||
'vendor/league/climate/CONTRIBUTING.md',
|
||||
'vendor/league/climate/Dockerfile',
|
||||
'vendor/league/climate/CODE_OF_CONDUCT.md',
|
||||
'vendor/matthiasmullie/minify/.github',
|
||||
'vendor/matthiasmullie/minify/bin',
|
||||
'vendor/matthiasmullie/minify/composer.json',
|
||||
'vendor/matthiasmullie/minify/docker-composer.yml',
|
||||
'vendor/matthiasmullie/minify/docker-compose.yml',
|
||||
'vendor/matthiasmullie/minify/Dockerfile',
|
||||
'vendor/matthiasmullie/minify/CONTRIBUTING.md',
|
||||
'vendor/matthiasmullie/path-converter/composer.json',
|
||||
'vendor/maximebf/debugbar/.github',
|
||||
'vendor/maximebf/debugbar/bower.json',
|
||||
'vendor/maximebf/debugbar/composer.json',
|
||||
'vendor/maximebf/debugbar/.bowerrc',
|
||||
@@ -140,119 +183,210 @@ class CleanCommand extends Command
|
||||
'vendor/miljar/php-exif/phpunit.xml.dist',
|
||||
'vendor/miljar/php-exif/Resources',
|
||||
'vendor/miljar/php-exif/tests',
|
||||
'vendor/miljar/php-exif/CHANGELOG.rst',
|
||||
'vendor/monolog/monolog/composer.json',
|
||||
'vendor/monolog/monolog/doc',
|
||||
'vendor/monolog/monolog/phpunit.xml.dist',
|
||||
'vendor/monolog/monolog/.php_cs',
|
||||
'vendor/monolog/monolog/tests',
|
||||
'vendor/monolog/monolog/CHANGELOG.md',
|
||||
'vendor/monolog/monolog/phpstan.neon.dist',
|
||||
'vendor/nyholm/psr7/composer.json',
|
||||
'vendor/nyholm/psr7/phpstan.neon.dist',
|
||||
'vendor/nyholm/psr7/CHANGELOG.md',
|
||||
'vendor/nyholm/psr7/psalm.xml',
|
||||
'vendor/nyholm/psr7-server/.github',
|
||||
'vendor/nyholm/psr7-server/composer.json',
|
||||
'vendor/nyholm/psr7-server/CHANGELOG.md',
|
||||
'vendor/phive/twig-extensions-deferred/.gitignore',
|
||||
'vendor/phive/twig-extensions-deferred/.travis.yml',
|
||||
'vendor/phive/twig-extensions-deferred/composer.json',
|
||||
'vendor/phive/twig-extensions-deferred/phpunit.xml.dist',
|
||||
'vendor/phive/twig-extensions-deferred/tests',
|
||||
'vendor/php-http/message-factory/composer.json',
|
||||
'vendor/php-http/message-factory/puli.json',
|
||||
'vendor/php-http/message-factory/CHANGELOG.md',
|
||||
'vendor/pimple/pimple/.gitignore',
|
||||
'vendor/pimple/pimple/.travis.yml',
|
||||
'vendor/pimple/pimple/composer.json',
|
||||
'vendor/pimple/pimple/ext',
|
||||
'vendor/pimple/pimple/phpunit.xml.dist',
|
||||
'vendor/pimple/pimple/src/Pimple/Tests',
|
||||
'vendor/pimple/pimple/.php_cs.dist',
|
||||
'vendor/pimple/pimple/CHANGELOG',
|
||||
'vendor/psr/cache/CHANGELOG.md',
|
||||
'vendor/psr/cache/composer.json',
|
||||
'vendor/psr/container/composer.json',
|
||||
'vendor/psr/container/.gitignore',
|
||||
'vendor/psr/http-factory/.gitignore',
|
||||
'vendor/psr/http-factory/.pullapprove.yml',
|
||||
'vendor/psr/http-factory/composer.json',
|
||||
'vendor/psr/http-message/composer.json',
|
||||
'vendor/psr/http-message/CHANGELOG.md',
|
||||
'vendor/psr/http-server-handler/composer.json',
|
||||
'vendor/psr/http-server-middleware/composer.json',
|
||||
'vendor/psr/simple-cache/.editorconfig',
|
||||
'vendor/psr/simple-cache/composer.json',
|
||||
'vendor/psr/log/composer.json',
|
||||
'vendor/psr/log/.gitignore',
|
||||
'vendor/ralouphie/getallheaders/.gitignore',
|
||||
'vendor/ralouphie/getallheaders/.travis.yml',
|
||||
'vendor/ralouphie/getallheaders/composer.json',
|
||||
'vendor/ralouphie/getallheaders/phpunit.xml',
|
||||
'vendor/ralouphie/getallheaders/tests/',
|
||||
'vendor/rockettheme/toolbox/.git',
|
||||
'vendor/rockettheme/toolbox/.gitignore',
|
||||
'vendor/rockettheme/toolbox/.scrutinizer.yml',
|
||||
'vendor/rockettheme/toolbox/.travis.yml',
|
||||
'vendor/rockettheme/toolbox/composer.json',
|
||||
'vendor/rockettheme/toolbox/phpunit.xml',
|
||||
'vendor/rockettheme/toolbox/CHANGELOG.md',
|
||||
'vendor/rockettheme/toolbox/Blueprints/tests',
|
||||
'vendor/rockettheme/toolbox/ResourceLocator/tests',
|
||||
'vendor/rockettheme/toolbox/Session/tests',
|
||||
'vendor/rockettheme/toolbox/tests',
|
||||
'vendor/seld/cli-prompt/composer.json',
|
||||
'vendor/seld/cli-prompt/.gitignore',
|
||||
'vendor/seld/cli-prompt/.github',
|
||||
'vendor/seld/cli-prompt/phpstan.neon.dist',
|
||||
'vendor/symfony/console/composer.json',
|
||||
'vendor/symfony/console/phpunit.xml.dist',
|
||||
'vendor/symfony/console/.gitignore',
|
||||
'vendor/symfony/console/.git',
|
||||
'vendor/symfony/console/Tester',
|
||||
'vendor/symfony/console/Tests',
|
||||
'vendor/symfony/debug/.gitignore',
|
||||
'vendor/symfony/debug/.git',
|
||||
'vendor/symfony/debug/phpunit.xml.dist',
|
||||
'vendor/symfony/debug/composer.json',
|
||||
'vendor/symfony/debug/Tests',
|
||||
'vendor/symfony/debug/Resources',
|
||||
'vendor/symfony/console/CHANGELOG.md',
|
||||
'vendor/symfony/contracts/Cache/.gitignore',
|
||||
'vendor/symfony/contracts/Cache/composer.json',
|
||||
'vendor/symfony/contracts/EventDispatcher/.gitignore',
|
||||
'vendor/symfony/contracts/EventDispatcher/composer.json',
|
||||
'vendor/symfony/contracts/HttpClient/.gitignore',
|
||||
'vendor/symfony/contracts/HttpClient/composer.json',
|
||||
'vendor/symfony/contracts/HttpClient/Test',
|
||||
'vendor/symfony/contracts/Service/.gitignore',
|
||||
'vendor/symfony/contracts/Service/composer.json',
|
||||
'vendor/symfony/contracts/Service/Test',
|
||||
'vendor/symfony/contracts/Tests',
|
||||
'vendor/symfony/contracts/Translation/.gitignore',
|
||||
'vendor/symfony/contracts/Translation/composer.json',
|
||||
'vendor/symfony/contracts/Translation/Test',
|
||||
'vendor/symfony/contracts/.gitignore',
|
||||
'vendor/symfony/contracts/composer.json',
|
||||
'vendor/symfony/contracts/phpunit.xml.dist',
|
||||
'vendor/symfony/event-dispatcher/.git',
|
||||
'vendor/symfony/event-dispatcher/.gitignore',
|
||||
'vendor/symfony/event-dispatcher/composer.json',
|
||||
'vendor/symfony/event-dispatcher/phpunit.xml.dist',
|
||||
'vendor/symfony/event-dispatcher/Tests',
|
||||
'vendor/symfony/event-dispatcher/CHANGELOG.md',
|
||||
'vendor/symfony/http-client/CHANGELOG.md',
|
||||
'vendor/symfony/http-client/composer.json',
|
||||
'vendor/symfony/polyfill-ctype/composer.json',
|
||||
'vendor/symfony/polyfill-iconv/.git',
|
||||
'vendor/symfony/polyfill-iconv/.gitignore',
|
||||
'vendor/symfony/polyfill-iconv/composer.json',
|
||||
'vendor/symfony/polyfill-mbstring/.git',
|
||||
'vendor/symfony/polyfill-mbstring/.gitignore',
|
||||
'vendor/symfony/polyfill-mbstring/composer.json',
|
||||
'vendor/symfony/polyfill-php72/composer.json',
|
||||
'vendor/symfony/polyfill-php73/composer.json',
|
||||
'vendor/symfony/process/.gitignore',
|
||||
'vendor/symfony/process/composer.json',
|
||||
'vendor/symfony/process/phpunit.xml.dist',
|
||||
'vendor/symfony/process/Tests',
|
||||
'vendor/symfony/process/CHANGELOG.md',
|
||||
'vendor/symfony/var-dumper/.git',
|
||||
'vendor/symfony/var-dumper/.gitignore',
|
||||
'vendor/symfony/var-dumper/composer.json',
|
||||
'vendor/symfony/var-dumper/phpunit.xml.dist',
|
||||
'vendor/symfony/var-dumper/Test',
|
||||
'vendor/symfony/var-dumper/Tests',
|
||||
'vendor/symfony/var-dumper/CHANGELOG.md',
|
||||
'vendor/symfony/yaml/composer.json',
|
||||
'vendor/symfony/yaml/phpunit.xml.dist',
|
||||
'vendor/symfony/yaml/.gitignore',
|
||||
'vendor/symfony/yaml/.git',
|
||||
'vendor/symfony/yaml/Tests',
|
||||
'vendor/symfony/yaml/CHANGELOG.md',
|
||||
'vendor/twig/twig/.editorconfig',
|
||||
'vendor/twig/twig/.php_cs.dist',
|
||||
'vendor/twig/twig/.travis.yml',
|
||||
'vendor/twig/twig/.gitignore',
|
||||
'vendor/twig/twig/.git',
|
||||
'vendor/twig/twig/.github',
|
||||
'vendor/twig/twig/composer.json',
|
||||
'vendor/twig/twig/phpunit.xml.dist',
|
||||
'vendor/twig/twig/doc',
|
||||
'vendor/twig/twig/ext',
|
||||
'vendor/twig/twig/test',
|
||||
'vendor/twig/twig/.gitattributes',
|
||||
'vendor/twig/twig/CHANGELOG',
|
||||
'vendor/twig/twig/drupal_test.sh',
|
||||
'vendor/willdurand/negotiation/.gitignore',
|
||||
'vendor/willdurand/negotiation/.travis.yml',
|
||||
'vendor/willdurand/negotiation/appveyor.yml',
|
||||
'vendor/willdurand/negotiation/composer.json',
|
||||
'vendor/willdurand/negotiation/phpunit.xml.dist',
|
||||
'vendor/willdurand/negotiation/tests',
|
||||
'vendor/willdurand/negotiation/CONTRIBUTING.md',
|
||||
'user/config/security.yaml',
|
||||
'cache/compiled/',
|
||||
];
|
||||
|
||||
/**
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function configure()
|
||||
protected function configure(): void
|
||||
{
|
||||
$this
|
||||
->setName("clean")
|
||||
->setDescription("Handles cleaning chores for Grav distribution")
|
||||
->setName('clean')
|
||||
->setDescription('Handles cleaning chores for Grav distribution')
|
||||
->setHelp('The <info>clean</info> clean extraneous folders and data');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param InputInterface $input
|
||||
* @param OutputInterface $output
|
||||
*
|
||||
* @return int|null|void
|
||||
* @return int
|
||||
*/
|
||||
protected function execute(InputInterface $input, OutputInterface $output)
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$this->setupConsole($input, $output);
|
||||
|
||||
$this->cleanPaths();
|
||||
return $this->cleanPaths() ? 0 : 1;
|
||||
}
|
||||
|
||||
private function cleanPaths()
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
private function cleanPaths(): bool
|
||||
{
|
||||
$this->output->writeln('');
|
||||
$this->output->writeln('<red>DELETING</red>');
|
||||
$success = true;
|
||||
|
||||
$this->io->writeln('');
|
||||
$this->io->writeln('<red>DELETING</red>');
|
||||
$anything = false;
|
||||
foreach ($this->paths_to_remove as $path) {
|
||||
$path = ROOT_DIR . $path;
|
||||
if (is_dir($path) && @Folder::delete($path)) {
|
||||
$anything = true;
|
||||
$this->output->writeln('<red>dir: </red>' . $path);
|
||||
} elseif (is_file($path) && @unlink($path)) {
|
||||
$anything = true;
|
||||
$this->output->writeln('<red>file: </red>' . $path);
|
||||
$path = GRAV_ROOT . DS . $path;
|
||||
try {
|
||||
if (is_dir($path) && Folder::delete($path)) {
|
||||
$anything = true;
|
||||
$this->io->writeln('<red>dir: </red>' . $path);
|
||||
} elseif (is_file($path) && @unlink($path)) {
|
||||
$anything = true;
|
||||
$this->io->writeln('<red>file: </red>' . $path);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$success = false;
|
||||
$this->io->error(sprintf('Failed to delete %s: %s', $path, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
if (!$anything) {
|
||||
$this->output->writeln('');
|
||||
$this->output->writeln('<green>Nothing to clean...</green>');
|
||||
$this->io->writeln('');
|
||||
$this->io->writeln('<green>Nothing to clean...</green>');
|
||||
}
|
||||
|
||||
return $success;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -260,19 +394,19 @@ class CleanCommand extends Command
|
||||
*
|
||||
* @param InputInterface $input
|
||||
* @param OutputInterface $output
|
||||
* @return void
|
||||
*/
|
||||
public function setupConsole(InputInterface $input, OutputInterface $output)
|
||||
public function setupConsole(InputInterface $input, OutputInterface $output): void
|
||||
{
|
||||
$this->input = $input;
|
||||
$this->output = $output;
|
||||
$this->io = new SymfonyStyle($input, $output);
|
||||
|
||||
$this->output->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
|
||||
$this->output->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
|
||||
$this->output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
|
||||
$this->output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
|
||||
$this->output->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
|
||||
$this->output->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
|
||||
$this->output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
|
||||
$this->io->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
|
||||
$this->io->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user