Merge branch '1.3'

* 1.3:
  Update testing.rst
  Update nginx sample with PHP7 as default
  Bootstrap composer autoload in PHPUnit

doc/testing.rst

@@ -182,7 +182,8 @@ look like this:
 .. code-block:: xml
 
     <?xml version="1.0" encoding="UTF-8"?>
-    <phpunit backupGlobals="false"
+    <phpunit bootstrap="./vendor/autoload.php"
+             backupGlobals="false"
              backupStaticAttributes="false"
              colors="true"
              convertErrorsToExceptions="true"
@@ -191,6 +192,7 @@ look like this:
              processIsolation="false"
              stopOnFailure="false"
              syntaxCheck="false"
+             bootstrap="vendor/autoload.php"
     >
         <testsuites>
             <testsuite name="YourApp Test Suite">

doc/web_servers.rst

@@ -57,7 +57,7 @@ The **minimum configuration** to get your application running under Nginx is:
         # location ~ ^/(index|index_dev)\.php(/|$) {
         location ~ ^/index\.php(/|$) {
             # the ubuntu default
-            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            fastcgi_pass   unix:/var/run/php/phpX.X-fpm.sock;
             # for running on centos
             #fastcgi_pass   unix:/var/run/php-fpm/www.sock;