Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 1a6ed635c0ab · 2018-09-17T19:20:21.000+02:00
* 3.4:
  Change the public folder to web for 3.4
  Updated KnpUniversity links to SymfonyCasts
  correct a typo in a namespace loading
  There is no public folder in 3.4
  Fixed the link to Functional Tests
  Update templating.rst
  Update doctrine.rst
  Shorten Twig ternary expression
diff --git a/bundles/extension.rst b/bundles/extension.rst
@@ -32,8 +32,8 @@ This is how the extension of an AcmeHelloBundle should look like::
     // src/Acme/HelloBundle/DependencyInjection/AcmeHelloExtension.php
     namespace Acme\HelloBundle\DependencyInjection;
 
-    use Symfony\Component\HttpKernel\DependencyInjection\Extension;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
+    use Symfony\Component\DependencyInjection\Extension\Extension;
 
     class AcmeHelloExtension extends Extension
     {
diff --git a/doctrine.rst b/doctrine.rst
@@ -162,10 +162,11 @@ Woh! You now have a new ``src/Entity/Product.php`` file::
 
 .. caution::
 
-    MySQL sets a `limit of 767 bytes for the index key prefix`_. When using
-    ``utf8mb4``, string columns with 255 character length surpass that limit.
-    This means that any column of type ``string`` and ``unique=true`` must
-    set its maximum ``length`` to ``190``. Otherwise, you'll see this error:
+    There is a `limit of 767 bytes for the index key prefix`_ when using
+    InnoDB tables in MySQL 5.6 and earlier versions. String columns with 255
+    character length and ``utf8mb4`` encoding surpass that limit. This means
+    that any column of type ``string`` and ``unique=true`` must set its
+    maximum ``length`` to ``190``. Otherwise, you'll see this error:
     *"[PDOException] SQLSTATE[42000]: Syntax error or access violation:
     1071 Specified key was too long; max key length is 767 bytes"*.
 
@@ -756,4 +757,4 @@ Learn more
 .. _`SensioFrameworkExtraBundle`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 .. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`limit of 767 bytes for the index key prefix`: https://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
-.. _`Doctrine screencast series`: https://knpuniversity.com/screencast/symfony-doctrine
+.. _`Doctrine screencast series`: https://symfonycasts.com/screencast/symfony-doctrine
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -594,4 +594,4 @@ Doctrine's `Association Mapping Documentation`_.
 
 .. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
 .. _`orphanRemoval`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/working-with-associations.html#orphan-removal
-.. _`Mastering Doctrine Relations`: https://knpuniversity.com/screencast/doctrine-relations
+.. _`Mastering Doctrine Relations`: https://symfonycasts.com/screencast/doctrine-relations
diff --git a/forms.rst b/forms.rst
@@ -719,4 +719,4 @@ Learn more
 
 .. _`Symfony Form component`: https://github.com/symfony/form
 .. _`DateTime`: https://php.net/manual/en/class.datetime.php
-.. _`Symfony Forms screencast series`: https://knpuniversity.com/screencast/symfony-forms
+.. _`Symfony Forms screencast series`: https://symfonycasts.com/screencast/symfony-forms
diff --git a/frontend.rst b/frontend.rst
@@ -106,4 +106,4 @@ Other Front-End Articles
 .. _`Mix`: https://laravel.com/docs/mix
 .. _`Symfony`: http://symfony.com/
 .. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
-.. _`Webpack Encore screencast series`: https://knpuniversity.com/screencast/webpack-encore
+.. _`Webpack Encore screencast series`: https://symfonycasts.com/screencast/webpack-encore
diff --git a/frontend/encore/installation-no-flex.rst b/frontend/encore/installation-no-flex.rst
@@ -39,7 +39,7 @@ Next, create a new ``webpack.config.js`` file at the root of your project:
 
     Encore
         // directory where compiled assets will be stored
-        .setOutputPath('public/build/')
+        .setOutputPath('web/build/')
         // public path used by the web server to access the output path
         .setPublicPath('/build')
         // only needed for CDN's or sub-directory deploy
diff --git a/frontend/encore/server-data.rst b/frontend/encore/server-data.rst
@@ -35,7 +35,7 @@ method that returns an array, you could do the following:
 
 .. code-block:: twig
 
-    <div data-user-profile="{{ app.user ? app.user.profileData|json_encode|e('html_attr') : '' }}">
+    <div data-user-profile="{{ app.user ? app.user.profileData|json_encode|e('html_attr') }}">
         <!-- ... -->
     </div>
 
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -55,7 +55,7 @@ of your project. It already holds the basic config you need:
 They *key* part is ``addEntry()``: this tells Encore to load the ``assets/js/app.js``
 file and follow *all* of the ``require`` statements. It will then package everything
 together and - thanks to the first ``app`` argument - output final ``app.js`` and
-``app.css`` files into the ``public/build`` directory.
+``app.css`` files into the ``web/build`` directory.
 
 .. _encore-build-assets:
 
@@ -158,8 +158,8 @@ To import values, use ``import``:
     // assets/js/app.js
     - var $ = require('jquery');
     + import $ from 'jquery';
-    
-    - require('../css/app.css');    
+
+    - require('../css/app.css');
     + import '../css/app.css';
 
 .. _multiple-javascript-entries:
diff --git a/page_creation.rst b/page_creation.rst
@@ -196,8 +196,8 @@ One of Symfony's *killer* features is the Web Debug Toolbar: a bar that displays
 a *huge* amount of debugging information along the bottom of your page while developing. This is all
 included out of the box using a package called ``symfony/profiler-pack``.
 
-You will see a black bar along the bottom of the page. You'll learn more about all the information it holds 
-along the way, but feel free to experiment: hover over and click 
+You will see a black bar along the bottom of the page. You'll learn more about all the information it holds
+along the way, but feel free to experiment: hover over and click
 the different icons to get information about routing, performance, logging and more.
 
 Rendering a Template
@@ -342,5 +342,5 @@ Go Deeper with HTTP & Framework Fundamentals
 
 .. _`Twig`: https://twig.symfony.com
 .. _`Composer`: https://getcomposer.org
-.. _`Stellar Development with Symfony`: https://knpuniversity.com/screencast/symfony/setup
+.. _`Stellar Development with Symfony`: https://symfonycasts.com/screencast/symfony/setup
 .. _`Flex recipes`: https://flex.symfony.com
diff --git a/security.rst b/security.rst
@@ -1348,4 +1348,4 @@ Other Security Related Topics
 .. _`frameworkextrabundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 .. _`HWIOAuthBundle`: https://github.com/hwi/HWIOAuthBundle
 .. _`Symfony ACL bundle`: https://github.com/symfony/acl-bundle
-.. _`Symfony Security screencast series`: https://knpuniversity.com/screencast/symfony-security
+.. _`Symfony Security screencast series`: https://symfonycasts.com/screencast/symfony-security
diff --git a/service_container.rst b/service_container.rst
@@ -1069,4 +1069,4 @@ Learn more
 .. _`service-oriented architecture`: https://en.wikipedia.org/wiki/Service-oriented_architecture
 .. _`Symfony Standard Edition (version 3.3) services.yaml`: https://github.com/symfony/symfony-standard/blob/3.3/app/config/services.yml
 .. _`glob pattern`: https://en.wikipedia.org/wiki/Glob_(programming)
-.. _`Symfony Fundamentals screencast series`: https://knpuniversity.com/screencast/symfony-fundamentals
+.. _`Symfony Fundamentals screencast series`: https://symfonycasts.com/screencast/symfony-fundamentals
diff --git a/setup.rst b/setup.rst
@@ -159,7 +159,7 @@ Go Deeper with Setup
     setup/composer
     setup/*
 
-.. _`Stellar Development with Symfony`: http://knpuniversity.com/screencast/symfony
+.. _`Stellar Development with Symfony`: http://symfonycasts.com/screencast/symfony
 .. _`Composer`: https://getcomposer.org/
 .. _`technical requirements`: https://symfony.com/doc/current/reference/requirements.html
 .. _`The Symfony Demo application`: https://github.com/symfony/symfony-demo
diff --git a/templating.rst b/templating.rst
@@ -404,9 +404,8 @@ ease the work of the template designer. In PHP, the templating system provides
 an extensible *helper* system that provides useful features in a template
 context.
 
-You've already seen a few built-in Twig tags (``{% block %}`` & ``{% extends %}``)
-as well as an example of a PHP helper (``$view['slots']``). Here you will learn a
-few more.
+You've already seen a few built-in Twig tags like ``{% block %}`` and
+``{% extends %}``. Here you will learn a few more.
 
 .. index::
    single: Templating; Including other templates
diff --git a/testing.rst b/testing.rst
@@ -47,7 +47,7 @@ Unit Tests
 
 A unit test is a test against a single PHP class, also called a *unit*. If you
 want to test the overall behavior of your application, see the section about
-`Functional Tests`_.
+:ref:`Functional Tests <functional-tests>`.
 
 Writing Symfony unit tests is no different from writing standard PHPUnit
 unit tests. Suppose, for example, that you have an *incredibly* simple class

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ This is how the extension of an AcmeHelloBundle should look like::`
`32`	`32`	`// src/Acme/HelloBundle/DependencyInjection/AcmeHelloExtension.php`
`33`	`33`	`namespace Acme\HelloBundle\DependencyInjection;`
`34`	`34`
`35`		`- use Symfony\Component\HttpKernel\DependencyInjection\Extension;`
`36`	`35`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`36`	`+ use Symfony\Component\DependencyInjection\Extension\Extension;`
`37`	`37`
`38`	`38`	`class AcmeHelloExtension extends Extension`
`39`	`39`	`{`