Merge 'master' with 'test-suite'

.github/ISSUE_TEMPLATE

@@ -0,0 +1,41 @@
+### Issue title
+
+The issue title should comply with the following structure:
+
+[ *ISSUE-GROUP* ] Short description
+
+The *ISSUE-GROUP* should be one of:
+
+* `command:name`
+* `console`
+* `helper`
+* `standard`
+* `template`
+* `translation`
+* `test`
+* `docs`
+
+### Problem/Motivation
+A brief statement describing why the issue was filed.
+
+**Details to include:**
+- Why are we doing this? Above all, a summary should explain why a change is needed, in a few short sentences.
+
+### How to reproduce
+Include steps related how to reproduce.
+
+**Details to include:**
+- Drupal version (you can obtain this by running `drupal site:status`).
+- Console version (you can obtain this by running `composer show | grep drupal/console`).
+- Console Launcher version (you can obtain this by running outside of a drupal site `drupal --version`).
+- Steps to reproduce
+- Include screen-shot or video whenever necessary.
+
+### Solution
+A brief description of the proposed fix.
+
+**Details to include:**
+- A short summary of the approach proposed or used in the PR.
+- Approaches that have been tried and ruled out.
+- Links to relevant API documentation or other resources.
+- Known workarounds.

.gitignore

@@ -2,6 +2,7 @@
 /.rules
 
 # Composer
+composer.lock
 /vendor
 /bin/phpunit
 /bin/jsonlint
@@ -11,6 +12,12 @@
 /bin/pdepend
 /bin/php-cs-fixer
 /bin/phpmd
+/bin/php-parse
+/bin/psysh
+PATCHES.txt
+
+# Develop
+autoload.local.php
 
 # Binaries
 /box.phar
@@ -25,14 +32,6 @@
 /core
 /nbproject/
 
-composer.phar
-
-.idea/DrupalConsole.iml
-
-.idea/modules.xml
-
-.idea/php.xml
-
-.idea/vcs.xml
-
-.idea/workspace.xml
+# drupal/console-extend-plugin generated files
+extend.console.*.yml
+*-console.services.yml

.php_cs

@@ -1,4 +1,10 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL);
+return PhpCsFixer\Config::create()
+        ->setRules(
+            [
+                '@PSR2' => true,
+                'array_syntax' => ['syntax' => 'short'],
+            ]
+        )
+        ->setUsingCache(false);

.travis.yml

@@ -5,14 +5,16 @@ language: php
 php:
   - 5.5.9
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
   - hhvm
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 7
+    - php: 7.0
+    - php: 7.1
 
 env:
   global:

CONTRIBUTING.md

@@ -35,11 +35,12 @@ A brief statement describing why the issue was filed.
 - Why are we doing this? Above all, a summary should explain why a change is needed, in a few short sentences.
 
 ### How to reproduce
-Include steps related how to reproduce. 
+Include steps related how to reproduce.
 
 **Details to include:**
-- Drupal version (you can obtain this by running `drupal site:status`).  
-- Console version (you can obtain this by running `drupal --version`).
+- Drupal version (you can obtain this by running `drupal site:status`).
+- Console version (you can obtain this by running `composer show | grep drupal/console`).
+- Console Launcher version (you can obtain this by running outside of a drupal site `drupal --version`).
 - Steps to reproduce
 - Include screen-shot or video whenever necessary.
 

README.md

@@ -2,14 +2,12 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Drupal Console](#drupal-console)
+  - [Drupal Console](#drupal-console)
   - [Required PHP version](#required-php-version)
   - [Drupal Console documentation](#documentation)
-  - [Download as new dependency](#download-as-new-dependency)
-  - [Fix download the latest version](#fix-download-the-latest-version)
-  - [Download using DrupalComposer](#download-using-drupalcomposer)
-  - [Install Drupal Console Launcher](#install-drupal-console-launcher)
-  - [Run Drupal Console](#running-drupal-console)
+  - [Download Drupal Console](#download)
+  - [Run Drupal Console](#run)
+  - [Contributors](#contributors)
   - [Supporting organizations](#supporting-organizations)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -18,13 +16,13 @@ Drupal Console
 =============================================
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hechoendrupal/DrupalConsole)
-[![Build Status](https://travis-ci.org/hechoendrupal/DrupalConsole.svg?branch=master)](https://travis-ci.org/hechoendrupal/DrupalConsole)
+[![Build Status](https://travis-ci.org/hechoendrupal/drupal-console.svg?branch=master)](https://travis-ci.org/hechoendrupal/drupal-console)
 [![Latest Stable Version](https://poser.pugx.org/drupal/console/v/stable.svg)](https://packagist.org/packages/drupal/console)
 [![Latest Unstable Version](https://poser.pugx.org/drupal/console/v/unstable.svg)](https://packagist.org/packages/drupal/console)
 [![Software License](https://img.shields.io/badge/license-GPL%202.0+-blue.svg)](https://packagist.org/packages/drupal/console)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/d0f089ff-a6e9-4ba4-b353-cb68173c7d90/mini.png)](https://insight.sensiolabs.com/projects/d0f089ff-a6e9-4ba4-b353-cb68173c7d90)
 
-The Drupal Console is a CLI tool to generate boilerplate code, interact and debug Drupal 8.
+The Drupal CLI. A tool to generate boilerplate code, interact with and debug Drupal.
 
 ## Latest Version
 Details of the latest version can be found on the Drupal Console project page under https://drupalconsole.com/.
@@ -40,78 +38,36 @@ More information about using this project at the [official documentation](http:/
 ## Required PHP Version
 PHP 5.5.9 or higher is required to use the Drupal Console application.
 
-## Download as new dependency
-```
-# Change directory to Drupal site
-cd /path/to/drupal8.dev
-
-# Download DrupalConsole
-composer require drupal/console:~1.0 \
---prefer-dist \
---optimize-autoloader \
---sort-packages
-```
-
-## Fix download the latest version
-
-Drupal 8 include some outdated libraries of Symfony 2.7.x, as result you get an old release of Drupal Console.
-
-To fix that, execute the following command and you will get the latest release of Drupal Console.
-```
-composer update drupal/console --with-dependencies
-```
-
-## Download using DrupalComposer
-```
-composer create-project \
-drupal-composer/drupal-project:8.x-dev \
-drupal8.dev \
---prefer-dist \
---no-progress \
---no-interaction
-```
+## Download 
 
-## Install Drupal Console Launcher
-```
-# Run this in your terminal to get the latest version:
-curl https://drupalconsole.com/installer -L -o drupal.phar
-
-# Or if you don't have curl:
-php -r "readfile('https://drupalconsole.com/installer');" > drupal.phar
-
-# Accessing from anywhere on your system:
-mv drupal.phar /usr/local/bin/drupal
+[Install Drupal Console Using Composer](https://docs.drupalconsole.com/en/getting/composer.html)
 
-# Apply executable permissions on the downloaded file:
-chmod +x /usr/local/bin/drupal
+[Install Drupal Console Launcher](https://docs.drupalconsole.com/en/getting/launcher.html)
 
-# Copy configuration files.
-drupal init --override
+[Installing Drupal Console on Windows](https://docs.drupalconsole.com/en/getting/windows.html)
 
-# Check and validate system requirements
-drupal check
+## Run
+Using the DrupalConsole Launcher
 ```
+drupal
+``` 
 
-## Run Drupal Console
-We highly recommend you to install the global executable, but if is not installed, then you can run DrupalConsole by:  
+We highly recommend you to install the global executable, but if is not installed, you can run Drupal Console depending on your installation by executing:
 
-Using default Drupal + DrupalConsole
 ```
 vendor/bin/drupal
-```
-Using DrupalComposer
-Change directory `web`, `docroot` or any other.
-```
-../vendor/bin/drupal
+# or
+vendor/drupal/console/bin/drupal
+# or
+bin/drupal
 ```
 
-
 ## Drupal Console Support
 You can ask for support at Drupal Console gitter chat room [http://bit.ly/console-support](http://bit.ly/console-support).
 
-## Getting The Project To Contribute
-
-For information about how to run this project for development follow instructions at [setup instructions](https://gist.github.com/jmolivas/97bbd07f328217be3564a434c5bd2618).
+## Contribute to Drupal Console
+* [Getting the project](https://docs.drupalconsole.com/en/contributing/getting-the-project.html)
+* [Running the project](https://docs.drupalconsole.com/en/contributing/running-the-project.html)
 
 ## Enabling Autocomplete
 ```
@@ -130,14 +86,16 @@ source "$HOME/.console/console.rc" 2>/dev/null
 ln -s ~/.console/drupal.fish ~/.config/fish/completions/drupal.fish
 ```
 
+## Contributors
+
+[Full list of contributors](https://drupalconsole.com/contributors)
+
 ## Supporting Organizations
 
 [![weKnow](https://www.drupal.org/files/weKnow-logo_5.png)](http://weknowinc.com)
 
 [![Anexus](https://www.drupal.org/files/anexus-logo.png)](http://www.anexusit.com/)
 
-[![Indava](https://www.drupal.org/files/indava-logo.png)](http://www.indava.com/)
-
-[![FFW](https://www.drupal.org/files/ffw-logo.png)](https://ffwagency.com)
+[All supporting organizations](https://drupalconsole.com/supporting-organizations)
 
 > Drupal is a registered trademark of Dries Buytaert.

Test/Generator/ProfileGeneratorTest.php

@@ -37,6 +37,7 @@ public function testGenerateProfile(
         $description,
         $core,
         $dependencies,
+        $themes,
         $distribution
     ) {
         $generator = new ProfileGenerator();
@@ -51,6 +52,7 @@ public function testGenerateProfile(
             $description,
             $core,
             $dependencies,
+            $themes,
             $distribution
         );
 

autoload.local.php.dist

@@ -0,0 +1,3 @@
+<?php
+
+$autoloaders = [ getcwd() . '/vendor/autoload.php' ];