Merge branch '2.3'

Author: dunglas

client-generator/vuejs.md

@@ -41,7 +41,7 @@ import App from './App.vue';
 
 // Replace "foo" with the name of the resource type
 import foo from './store/modules/foo/';
-import fooRoutes from './routes/foo';
+import fooRoutes from './router/foo';
 
 Vue.use(Vuex);
 Vue.use(VueRouter);

distribution/index.md

@@ -66,9 +66,13 @@ it.
 API Platform is shipped with a [Docker](https://docker.com) setup that makes it easy to get a containerized development
 environment up and running. If you do not already have Docker on your computer, [it's the right time to install it](https://docs.docker.com/install/).
 
+On Mac, only [Docker for Mac](https://docs.docker.com/docker-for-mac/) is supported.
+Similarly, on Windows, only [Docker for Windows](https://docs.docker.com/docker-for-windows/) is supported. Docker Machine **is not** supported out of the box.
+
 Open a terminal, and navigate to the directory containing your project skeleton. Run the following command to start all
 services using [Docker Compose](https://docs.docker.com/compose/):
 
+    $ docker-compose pull # Download the latest versions of the pre-built images
     $ docker-compose up -d # Running in detached mode
 
 This starts the following services:
@@ -83,11 +87,6 @@ This starts the following services:
 | cache-proxy | A HTTP cache proxy for the API provided by Varnish            | 8081    | all (prefer using a managed service in prod)
 | h2-proxy    | A HTTP/2 and HTTPS development proxy for all apps             | 443 (client)<br>444 (admin)<br>8443 (api)<br>8444 (cache-proxy) | dev (configure properly your web server in prod)
 
-If you encounter problems running Docker on Windows (especially with Docker Toolbox), see [our Troubleshooting guide](../extra/troubleshooting.md#using-docker).
-
-The first time you start the containers, Docker downloads and builds images for you. It will take some time, but don't worry,
-this is done only once. Starting servers will then be lightning fast.
-
 To see the container's logs, run:
 
     $ docker-compose logs -f # follow the logs
@@ -151,7 +150,7 @@ And start the built-in PHP server or the Symfony WebServerBundle:
 All JavaScript components are also [available as standalone libraries](https://github.com/api-platform?language=javascript)
 installable with NPM or Yarn.  
 
-**Note:** when installing API Platform this way, the API will be exposed as the `/api/` path. You need to open `http://localhost:8000/api/` to see the API documentation.
+**Note:** when installing API Platform this way, the API will be exposed as the `/api/` path. You need to open `http://localhost:8000/api/` to see the API documentation. If you are deploying API Platform directly on an Apache or Nginx webserver and getting a 404 error on opening this link, you will need to enable the [rewriting rules](https://symfony.com/doc/current/setup/web_server_configuration.html) for your specific webserver software.
 
 ## It's Ready!
 
@@ -647,7 +646,7 @@ Isn't API Platform a REST **and** GraphQL framework? That's true! GraphQL suppor
 need to install the [graphql-php](https://webonyx.github.io/graphql-php/) library. Run the following command (the cache needs to be cleared twice):
 
 ```bash
-docker-compose exec php composer req webonyx/graphql-php && bin/console cache:clear
+docker-compose exec php composer req webonyx/graphql-php && docker-compose exec php bin/console cache:clear
 ```
 
 You now have a GraphQL API! Open `https://localhost:8443/graphql` to play with it using the nice [GraphiQL](https://github.com/graphql/graphiql)

distribution/testing.md

@@ -185,6 +185,10 @@ You may also be interested in these alternative testing tools (not included in t
 
 ## Running Unit Tests with PHPUnit
 
+To install [PHPUnit](https://phpunit.de/) test suite, execute the following command:
+
+    $ docker-compose exec php composer require --dev symfony/phpunit-bridge
+
 To run your [PHPUnit](https://phpunit.de/) test suite, execute the following command:
 
-    $ docker-compose exec php vendor/bin/phpunit
+    $ docker-compose exec php bin/phpunit