Skip to content

Commit dfec9d5

Browse files
LOBsTerrLOBsTerr
committed
Merge branch 'master' of github.com:hechoendrupal/drupal-console
2 parents dca0943 + 42e2dec commit dfec9d5

55 files changed

Lines changed: 210 additions & 221 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ ln -s ~/.console/drupal.fish ~/.config/fish/completions/drupal.fish
9292

9393
## Supporting Organizations
9494

95-
[![weKnow](https://www.drupal.org/files/weKnow-logo_5.png)](http://weknowinc.com)
96-
97-
[![Anexus](https://www.drupal.org/files/anexus-logo.png)](http://www.anexusit.com/)
98-
9995
[All supporting organizations](https://drupalconsole.com/supporting-organizations)
10096

10197
> Drupal is a registered trademark of Dries Buytaert.

‎composer.json‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
{
22
"name": "drupal/console",
33
"description": "The Drupal CLI. A tool to generate boilerplate code, interact with and debug Drupal.",
4-
"keywords": ["Drupal", "Console", "Development", "Symfony"],
4+
"keywords": [
5+
"Drupal",
6+
"Console",
7+
"Development",
8+
"Symfony"
9+
],
510
"homepage": "http://drupalconsole.com/",
611
"type": "library",
712
"license": "GPL-2.0-or-later",
813
"authors": [
914
{
10-
"name": "David Flores",
11-
"email": "dmousex@gmail.com",
12-
"homepage": "http://dmouse.net"
15+
"name": "David Flores",
16+
"email": "dmousex@gmail.com",
17+
"homepage": "http://dmouse.net"
1318
},
1419
{
15-
"name": "Jesus Manuel Olivas",
16-
"email": "jesus.olivas@gmail.com",
17-
"homepage": "http://jmolivas.com"
20+
"name": "Jesus Manuel Olivas",
21+
"email": "jesus.olivas@gmail.com",
22+
"homepage": "http://jmolivas.com"
1823
},
1924
{
20-
"name": "Eduardo Garcia",
21-
"email": "enzo@enzolutions.com",
22-
"homepage": "http://enzolutions.com/"
25+
"name": "Eduardo Garcia",
26+
"email": "enzo@enzolutions.com",
27+
"homepage": "http://enzolutions.com/"
2328
},
2429
{
25-
"name": "Omar Aguirre",
26-
"email": "omersguchigu@gmail.com"
30+
"name": "Omar Aguirre",
31+
"email": "omersguchigu@gmail.com"
2732
},
2833
{
29-
"name": "Drupal Console Contributors",
30-
"homepage": "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
34+
"name": "Drupal Console Contributors",
35+
"homepage": "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
3136
}
3237
],
3338
"support": {
@@ -36,30 +41,34 @@
3641
"docs": "https://docs.drupalconsole.com/"
3742
},
3843
"require": {
39-
"php": "^5.5.9 || ^7.0",
44+
"php": ">=7.0.8",
4045
"alchemy/zippy": "~0.4",
4146
"composer/installers": "~1.0",
4247
"doctrine/annotations": "^1.2",
4348
"doctrine/collections": "^1.3",
44-
"drupal/console-core": "1.9.4",
45-
"drupal/console-extend-plugin": "~0",
49+
"drupal/console-core": "1.9.7",
50+
"drupal/console-extend-plugin": "~0.9.5",
4651
"psy/psysh": "0.6.* || ~0.8",
47-
"symfony/css-selector": "~2.8|~3.0",
48-
"symfony/dom-crawler": "~2.8|~3.0",
49-
"symfony/http-foundation": "~2.8|~3.0"
52+
"symfony/css-selector": "~3.0|~4.0",
53+
"symfony/dom-crawler": "~3.0|~4.0",
54+
"symfony/http-foundation": "~3.0|~4.0"
5055
},
5156
"suggest": {
5257
"symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI",
5358
"vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically"
5459
},
55-
"bin": ["bin/drupal"],
60+
"bin": [
61+
"bin/drupal"
62+
],
5663
"config": {
5764
"bin-dir": "bin/",
5865
"sort-packages": true
5966
},
6067
"minimum-stability": "dev",
6168
"prefer-stable": true,
6269
"autoload": {
63-
"psr-4": {"Drupal\\Console\\": "src"}
70+
"psr-4": {
71+
"Drupal\\Console\\": "src"
72+
}
6473
}
65-
}
74+
}

‎config/services/debug.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
- { name: drupal.command }
2424
console.user_debug:
2525
class: Drupal\Console\Command\Debug\UserCommand
26-
arguments: ['@entity_type.manager','@entity.query', '@console.drupal_api']
26+
arguments: ['@entity_type.manager', '@console.drupal_api']
2727
tags:
2828
- { name: drupal.command }
2929
console.views_debug:
@@ -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']
70+
arguments: ['@console.configuration_manager', '@console.site', '@extension.list.module']
7171
tags:
7272
- { name: drupal.command }
7373
console.image_styles_debug:

‎config/services/generate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
class: Drupal\Console\Command\Generate\AjaxCommand
2424
arguments: ['@console.extension_manager', '@console.ajax_command_generator', '@console.validator', '@console.chain_queue']
2525
tags:
26-
- { name: drupal.command }
26+
- { name: drupal.command }
2727
console.generate_breakpoint:
2828
class: Drupal\Console\Command\Generate\BreakPointCommand
2929
arguments: ['@console.breakpoint_generator', '@app.root', '@theme_handler', '@console.validator', '@console.string_converter']
@@ -256,4 +256,4 @@ services:
256256
class: Drupal\Console\Command\Generate\PluginDerivativeCommand
257257
arguments: ['@config.factory', '@console.chain_queue', '@console.pluginderivative_generator', '@console.extension_manager', '@console.validator', '@console.string_converter']
258258
tags:
259-
- { name: drupal.command }
259+
- { name: drupal.command }

‎config/services/generator.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
class: Drupal\Console\Generator\AjaxCommandGenerator
2727
arguments: ['@console.extension_manager']
2828
tags:
29-
- { name: drupal.generator }
29+
- { name: drupal.generator }
3030
console.breakpoint_generator:
3131
class: Drupal\Console\Generator\BreakPointGenerator
3232
arguments: ['@console.extension_manager']
@@ -250,4 +250,4 @@ services:
250250
class: Drupal\Console\Generator\PluginDerivativeGenerator
251251
arguments: ['@console.extension_manager']
252252
tags:
253-
- { name: drupal.generator }
253+
- { name: drupal.generator }

‎config/services/module.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
- { name: drupal.command }
2222
console.module_uninstall:
2323
class: Drupal\Console\Command\Module\UninstallCommand
24-
arguments: ['@console.site','@module_installer', '@console.chain_queue', '@config.factory', '@console.extension_manager']
24+
arguments: ['@console.site','@module_installer', '@console.chain_queue', '@config.factory', '@console.extension_manager', '@extension.list.module']
2525
tags:
2626
- { name: drupal.command }
2727
console.module_update:

‎config/services/rest.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ services:
1010
- '@entity_type.manager'
1111
- '@?plugin.manager.rest'
1212
- '@authentication_collector'
13-
- '@entity.manager'
1413
tags:
1514
- { name: drupal.command }

‎config/services/site.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- { name: drupal.command }
1717
console.site_statistics:
1818
class: Drupal\Console\Command\Site\StatisticsCommand
19-
arguments: ['@console.drupal_api', '@entity.query', '@console.extension_manager', '@module_handler']
19+
arguments: ['@console.drupal_api', '@entity_type.manager', '@console.extension_manager', '@module_handler']
2020
tags:
2121
- { name: drupal.command }
2222
console.site_status:

‎config/services/user.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
console.user_delete:
33
class: Drupal\Console\Command\User\DeleteCommand
4-
arguments: ['@entity_type.manager','@entity.query', '@console.drupal_api']
4+
arguments: ['@entity_type.manager', '@console.drupal_api']
55
tags:
66
- { name: drupal.command }
77
console.user_login_clear_attempts:

‎config/services/views.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
services:
22
console.views_disable:
33
class: Drupal\Console\Command\Views\DisableCommand
4-
arguments: ['@entity_type.manager', '@entity.query']
4+
arguments: ['@entity_type.manager']
55
tags:
66
- { name: drupal.command }
77
console.views_enable:
88
class: Drupal\Console\Command\Views\EnableCommand
9-
arguments: ['@entity_type.manager', '@entity.query']
9+
arguments: ['@entity_type.manager']
1010
tags:
1111
- { name: drupal.command }

0 commit comments

Comments
 (0)