Skip to content

Commit dca0943

Browse files
committed
Merge remote.
2 parents 3e8bd7f + 04522b6 commit dca0943

261 files changed

Lines changed: 8882 additions & 2980 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # [jmolivas]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: drupalconsole
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.travis.yml

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,77 @@ sudo: false
33
language: php
44

55
php:
6-
- 5.5.9
76
- 5.6
87
- 7.0
98
- 7.1
10-
- hhvm
9+
- 7.2
10+
- 7.3
11+
- 7.4snapshot
12+
13+
services:
14+
- mysql
1115

1216
matrix:
17+
include:
18+
- php: 5.5.9
19+
dist: trusty
1320
fast_finish: true
1421
allow_failures:
15-
- php: hhvm
16-
- php: 7.0
17-
- php: 7.1
22+
- php: 7.4snapshot
1823

1924
env:
2025
global:
21-
- PROJECT_DIR=/home/project
26+
# Paths.
27+
- DRUPAL_PATH="$HOME/drupal8"
28+
- PATH="$PATH:$DRUPAL_PATH/vendor/bin:$HOME/.composer/vendor/bin"
29+
30+
# Suppress deprecation handling.
31+
#- SYMFONY_DEPRECATIONS_HELPER=disabled
32+
33+
mysql:
34+
database: drupal_travis_db
35+
username: root
36+
encoding: utf8
2237

2338
before_script:
24-
- phpenv config-rm xdebug.ini
25-
# This fixes a fail when install Drupal.
26-
- echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
27-
- composer self-update
28-
- composer install --no-dev
29-
# - curl -LSs https://box-project.github.io/box2/installer.php | php
30-
# - composer global require drupal/coder:~8.1
39+
- phpenv config-rm xdebug.ini || true
40+
41+
# Set variables.
42+
- |
43+
if [[ "$TRAVIS_PHP_VERSION" == "5.5.9" ]] || [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then
44+
export DRUPAL_BRANCH="8.6.x"
45+
# PHP 5.5.9 on TravisCI has a Sqlite version that fails
46+
# minimum requirements, so we install on MySql instead.
47+
export SIMPLETEST_DB="mysql://root:@localhost/drupal_travis_db#drupalconsole"
48+
export IMAGEMAGICK_MODULE="drupal/imagemagick:^2"
49+
else
50+
export DRUPAL_BRANCH="8.8.x"
51+
export SIMPLETEST_DB="sqlite://localhost/sites/default/files/.ht.sqlite#drupalconsole"
52+
export IMAGEMAGICK_MODULE="drupal/imagemagick:dev-3.x"
53+
fi
54+
55+
# Get Drupal via git, and install it via Composer.
56+
- git clone --depth=5 --branch=$DRUPAL_BRANCH http://git.drupal.org/project/drupal.git $DRUPAL_PATH
57+
- cd $DRUPAL_PATH
58+
- composer install --no-progress --no-suggest
59+
60+
# Require drupal/console from the source just cloned from GitHub.
61+
- cd $TRAVIS_BUILD_DIR
62+
- git checkout -b travisci-run-branch
63+
- cd $DRUPAL_PATH
64+
- |
65+
composer config repositories.travisci-run '{"type": "path", "url": "$TRAVIS_BUILD_DIR", "options": {"symlink": false}}'
66+
- composer require "drupal/console:dev-travisci-run-branch" --no-progress --no-suggest
3167

3268
script:
33-
- if [ -n "${TRAVIS_BUILD_DIR+1}" ]; then PROJECT_DIR=$TRAVIS_BUILD_DIR; fi
34-
# - phpunit
35-
# - php box.phar build
36-
# - php drupal.phar init
37-
# - php drupal.phar check
38-
# - php drupal.phar site:new drupal8.dev --latest --no-interaction
39-
# - cd drupal8.dev
40-
# - php ../drupal.phar site:install standard --langcode=en --db-type=sqlite --db-file=sites/default/files/.ht.sqlite --site-name="Drupal 8 Site Install" --site-mail=admin@example.com --account-name=admin --account-mail=admin@example.com --account-pass=admin --no-interaction
41-
# - php ../drupal.phar chain --file=$PROJECT_DIR/config/dist/chain/sample.yml
69+
# Install Drupal site via drupal/console and show site status.
70+
- drupal site:install standard $SIMPLETEST_DB --langcode=en --site-name="Drupal 8 Site Install" --site-mail=admin@example.com --account-name=admin --account-mail=admin@example.com --account-pass=admin --no-interaction
71+
- drupal module:install --composer token admin_toolbar "$IMAGEMAGICK_MODULE" --verbose --no-interaction
72+
- drupal debug:module
73+
- drupal config:override system.image --key=toolkit --value=imagemagick
74+
- drupal site:status -v
75+
# - cd $DRUPAL_PATH/vendor/drupal/console
76+
# - ../../phpunit/phpunit/phpunit
4277
# - ~/.composer/vendor/bin/phpcs --warning-severity=0 --standard=~/.composer/vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml $PROJECT_DIR/drupal8.dev/modules/custom/example
4378

4479
notifications:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ Details of the latest version can be found on the Drupal Console project page un
3131
All notable changes to this project will be documented in the [releases page](https://github.com/hechoendrupal/DrupalConsole/releases)
3232

3333
## Documentation
34-
The most up-to-date documentation can be found at [http://docs.drupalconsole.com/](http://docs.drupalconsole.com/).
34+
The most up-to-date documentation can be found at [https://drupalconsole.com/docs/](https://drupalconsole.com/docs/).
3535

36-
More information about using this project at the [official documentation](http://docs.drupalconsole.com/en/using/project.html).
36+
More information about using this project at the [official documentation](https://drupalconsole.com/docs/en/using/project).
3737

3838
## Required PHP Version
3939
PHP 5.5.9 or higher is required to use the Drupal Console application.
4040

4141
## Download
4242

43-
[Install Drupal Console Using Composer](https://docs.drupalconsole.com/en/getting/composer.html)
43+
[Install Drupal Console Using Composer](https://drupalconsole.com/docs/en/getting/composer)
4444

45-
[Install Drupal Console Launcher](https://docs.drupalconsole.com/en/getting/launcher.html)
45+
[Install Drupal Console Launcher](https://drupalconsole.com/docs/en/getting/launcher)
4646

47-
[Installing Drupal Console on Windows](https://docs.drupalconsole.com/en/getting/windows.html)
47+
[Installing Drupal Console on Windows](https://drupalconsole.com/docs/en/getting/windows)
4848

4949
## Run
5050
Using the DrupalConsole Launcher
@@ -66,8 +66,8 @@ bin/drupal
6666
You can ask for support at Drupal Console gitter chat room [http://bit.ly/console-support](http://bit.ly/console-support).
6767

6868
## Contribute to Drupal Console
69-
* [Getting the project](https://docs.drupalconsole.com/en/contributing/getting-the-project.html)
70-
* [Running the project](https://docs.drupalconsole.com/en/contributing/running-the-project.html)
69+
* [Getting the project](https://drupalconsole.com/docs/en/getting/project)
70+
* [Using the project](https://drupalconsole.com/docs/en/using/project)
7171

7272
## Enabling Autocomplete
7373
```

autoload.local.php.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
22

3-
$autoloaders = [ getcwd() . '/vendor/autoload.php' ];
3+
$autoloaders = [ getcwd() . '/../../autoload.php', getcwd() . '/vendor/autoload.php' ];

autoload.php.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$loader = require __DIR__ . '/vendor/autoload.php';
3+
$loader = require __DIR__ . '/../../autoload.php';
44

55
$loader->setPsr4('Drupal\\Console\\Test\\', __DIR__ . '/Test');
66

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,20 @@
3737
},
3838
"require": {
3939
"php": "^5.5.9 || ^7.0",
40-
"alchemy/zippy": "0.4.3",
40+
"alchemy/zippy": "~0.4",
4141
"composer/installers": "~1.0",
4242
"doctrine/annotations": "^1.2",
4343
"doctrine/collections": "^1.3",
44-
"drupal/console-core": "1.6.1",
44+
"drupal/console-core": "1.9.4",
4545
"drupal/console-extend-plugin": "~0",
46-
"guzzlehttp/guzzle": "~6.1",
4746
"psy/psysh": "0.6.* || ~0.8",
4847
"symfony/css-selector": "~2.8|~3.0",
4948
"symfony/dom-crawler": "~2.8|~3.0",
5049
"symfony/http-foundation": "~2.8|~3.0"
5150
},
5251
"suggest": {
53-
"symfony/thanks": "Thank your favorite PHP projects on Github using the CLI!",
54-
"vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically."
52+
"symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI",
53+
"vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically"
5554
},
5655
"bin": ["bin/drupal"],
5756
"config": {

config/services/config.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ services:
2121
- { name: drupal.command }
2222
console.config_export_content_type:
2323
class: Drupal\Console\Command\Config\ExportContentTypeCommand
24-
arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
24+
arguments: ['@console.extension_manager', '@entity_type.manager', '@console.validator', '@console.chain_queue', '@config.storage']
2525
tags:
2626
- { name: drupal.command }
27+
console.config_export_entity:
28+
class: Drupal\Console\Command\Config\ExportEntityCommand
29+
arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator', '@entity_type.repository', '@config.storage']
30+
tags:
31+
- { name: drupal.command }
2732
console.config_export_single:
2833
class: Drupal\Console\Command\Config\ExportSingleCommand
2934
arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager','@language_manager', '@console.validator']
3035
tags:
3136
- { name: drupal.command }
3237
console.config_export_view:
3338
class: Drupal\Console\Command\Config\ExportViewCommand
34-
arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
39+
arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator', '@console.chain_queue']
3540
tags:
3641
- { name: drupal.command }
3742
console.config_import:

config/services/database.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
11
services:
2-
console.database_add:
3-
class: Drupal\Console\Command\Database\AddCommand
4-
arguments: ['@console.database_settings_generator']
5-
tags:
6-
- { name: drupal.command }
7-
console.database_client:
8-
class: Drupal\Console\Command\Database\ClientCommand
9-
tags:
10-
- { name: drupal.command }
11-
console.database_query:
12-
class: Drupal\Console\Command\Database\QueryCommand
13-
tags:
14-
- { name: drupal.command }
15-
console.database_connect:
16-
class: Drupal\Console\Command\Database\ConnectCommand
17-
tags:
18-
- { name: drupal.command }
192
console.database_drop:
203
class: Drupal\Console\Command\Database\DropCommand
21-
arguments: ['@database']
224
tags:
235
- { name: drupal.command }
246
console.database_dump:
257
class: Drupal\Console\Command\Database\DumpCommand
26-
arguments: ['@app.root', '@console.shell_process']
8+
arguments: ['@app.root', '@console.shell_process', '@database']
279
tags:
2810
- { name: drupal.command }
2911
console.database_log_clear:
@@ -36,8 +18,3 @@ services:
3618
arguments: ['@database', '@date.formatter', '@entity_type.manager', '@string_translation']
3719
tags:
3820
- { name: drupal.command }
39-
console.database_restore:
40-
class: Drupal\Console\Command\Database\RestoreCommand
41-
arguments: ['@app.root']
42-
tags:
43-
- { name: drupal.command }

config/services/debug.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ services:
6767
- { name: drupal.command }
6868
console.module_debug:
6969
class: Drupal\Console\Command\Debug\ModuleCommand
70-
arguments: ['@console.configuration_manager', '@console.site', '@http_client']
70+
arguments: ['@console.configuration_manager', '@console.site']
7171
tags:
7272
- { name: drupal.command }
7373
console.image_styles_debug:
@@ -130,7 +130,7 @@ services:
130130
- { name: drupal.command }
131131
console.rest_debug:
132132
class: Drupal\Console\Command\Debug\RestCommand
133-
arguments: ['@?plugin.manager.rest']
133+
arguments: ['@entity_type.manager', '@?plugin.manager.rest']
134134
tags:
135135
- { name: drupal.command }
136136
console.test_debug:
@@ -147,3 +147,8 @@ services:
147147
arguments: ['@console.drupal_api']
148148
tags:
149149
- { name: drupal.command }
150+
console.hook_debug:
151+
class: Drupal\Console\Command\Debug\HookCommand
152+
arguments: ['@console.extension_manager', '@module_handler']
153+
tags:
154+
- { name: drupal.command }

config/services/generate.yml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
console.generate_module:
33
class: Drupal\Console\Command\Generate\ModuleCommand
4-
arguments: ['@console.module_generator', '@console.validator', '@app.root', '@console.string_converter', '@console.drupal_api']
4+
arguments: ['@console.module_generator', '@console.validator', '@app.root', '@console.string_converter', '@console.drupal_api', '@console.chain_queue', '@console.site']
55
tags:
66
- { name: drupal.command }
77
console.generate_modulefile:
@@ -114,6 +114,11 @@ services:
114114
arguments: [ '@console.plugin_migrate_process_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter', '@console.validator']
115115
tags:
116116
- { name: drupal.command }
117+
console.generate_plugin_migrate_data_parser:
118+
class: Drupal\Console\Command\Generate\PluginMigrateDataParserCommand
119+
arguments: [ '@console.plugin_migrate_data_parser_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter', '@console.validator']
120+
tags:
121+
- { name: drupal.command }
117122
console.generate_plugin_rest_resource:
118123
class: Drupal\Console\Command\Generate\PluginRestResourceCommand
119124
arguments: ['@console.extension_manager', '@console.plugin_rest_resource_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
@@ -124,6 +129,14 @@ services:
124129
arguments: ['@console.extension_manager', '@console.plugin_rules_action_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
125130
tags:
126131
- { name: drupal.command }
132+
console.generate_plugin_rules_condition:
133+
class: Drupal\Console\Command\Generate\PluginRulesConditionCommand
134+
arguments: ['@console.extension_manager', '@console.plugin_rules_condition_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
135+
console.generate_plugin_rules_dataprocessor:
136+
class: Drupal\Console\Command\Generate\PluginRulesDataprocessorCommand
137+
arguments: ['@console.extension_manager', '@console.plugin_rules_dataprocessor_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
138+
tags:
139+
- { name: drupal.command }
127140
console.generate_plugin_skeleton:
128141
class: Drupal\Console\Command\Generate\PluginSkeletonCommand
129142
arguments: ['@console.extension_manager', '@console.plugin_skeleton_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
@@ -139,6 +152,11 @@ services:
139152
arguments: ['@console.extension_manager', '@console.plugin_views_field_generator', '@console.site','@console.string_converter', '@console.validator', '@console.chain_queue']
140153
tags:
141154
- { name: drupal.command }
155+
console.generate_plugin_queue:
156+
class: Drupal\Console\Command\Generate\PluginQueueWorkerCommand
157+
arguments: ['@console.extension_manager', '@console.plugin_queue_generator','@console.validator','@console.string_converter','@console.chain_queue']
158+
tags:
159+
- { name: drupal.command }
142160
console.generate_post_update:
143161
class: Drupal\Console\Command\Generate\PostUpdateCommand
144162
arguments: ['@console.extension_manager', '@console.post_update_generator', '@console.site', '@console.validator','@console.chain_queue']
@@ -164,6 +182,11 @@ services:
164182
arguments: ['@console.extension_manager', '@console.theme_generator', '@console.validator', '@app.root', '@theme_handler', '@console.site', '@console.string_converter']
165183
tags:
166184
- { name: drupal.command }
185+
console.generate_setting_theme:
186+
class: Drupal\Console\Command\Generate\ThemeSettingCommand
187+
arguments: ['@console.extension_manager', '@console.theme_setting_generator', '@console.validator', '@app.root', '@theme_handler', '@console.site', '@console.string_converter']
188+
tags:
189+
- { name: drupal.command }
167190
console.generate_twig_extension:
168191
class: Drupal\Console\Command\Generate\TwigExtensionCommand
169192
arguments: ['@console.extension_manager', '@console.twig_extension_generator', '@console.site', '@console.string_converter', '@console.validator', '@console.chain_queue']
@@ -179,6 +202,11 @@ services:
179202
arguments: ['@config.factory', '@console.chain_queue', '@console.pluginblock_generator', '@entity_type.manager', '@console.extension_manager', '@console.validator', '@console.string_converter', '@plugin.manager.element_info']
180203
tags:
181204
- { name: drupal.command }
205+
console.generate_blocktype:
206+
class: Drupal\Console\Command\Generate\BlockTypeCommand
207+
arguments: ['@config.factory', '@console.chain_queue', '@console.blocktype_generator', '@entity_type.manager', '@console.extension_manager', '@console.validator', '@console.string_converter', '@plugin.manager.element_info']
208+
tags:
209+
- { name: drupal.command }
182210
console.generate_command:
183211
class: Drupal\Console\Command\Generate\CommandCommand
184212
arguments: ['@console.command_generator', '@console.extension_manager', '@console.validator', '@console.string_converter', '@console.site']
@@ -214,3 +242,18 @@ services:
214242
arguments: ['@console.extension_manager', '@console.js_test_generator', '@console.validator']
215243
tags:
216244
- { name: drupal.command }
245+
console.generate_composer:
246+
class: Drupal\Console\Command\Generate\ComposerCommand
247+
arguments: ['@console.composer_generator', '@console.extension_manager', '@console.validator']
248+
tags:
249+
- { name: drupal.command }
250+
console.generate_plugin_validation_constraint:
251+
class: Drupal\Console\Command\Generate\PluginValidationConstraintCommand
252+
arguments: ['@console.extension_manager', '@console.validation_constraint_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
253+
tags:
254+
- { name: drupal.command }
255+
console.generate_pluginderivative:
256+
class: Drupal\Console\Command\Generate\PluginDerivativeCommand
257+
arguments: ['@config.factory', '@console.chain_queue', '@console.pluginderivative_generator', '@console.extension_manager', '@console.validator', '@console.string_converter']
258+
tags:
259+
- { name: drupal.command }

0 commit comments

Comments
 (0)