Merge branch '3.4' into 4.0

javiereguiluz · javiereguiluz · commit a8473c4b14e8 · 2018-07-25T11:18:10.000+02:00
* 3.4:
  Added more links to screencast videos
  Explain another option to override bundle's entity mapping
diff --git a/bundles/override.rst b/bundles/override.rst
@@ -76,11 +76,14 @@ inside a :doc:`compiler pass </service_container/compiler_passes>`.
 Entities & Entity Mapping
 -------------------------
 
-Due to the way Doctrine works, it is not possible to override entity mapping
-of a bundle. However, if a bundle provides a mapped superclass (such as the
-``User`` entity in the FOSUserBundle) one can override attributes and
-associations. Learn more about this feature and its limitations in
-`the Doctrine documentation`_.
+If a bundle defines its entity mapping in configuration files instead of
+annotations, you can override them as any other regular bundle configuration
+file. The only caveat is that you must override all those mapping configuration
+files and not just the ones you actually want to override.
+
+If a bundle provides a mapped superclass (such as the ``User`` entity in the
+FOSUserBundle) you can override its attributes and associations. Learn more
+about this feature and its limitations in `the Doctrine documentation`_.
 
 Forms
 -----
diff --git a/doctrine.rst b/doctrine.rst
@@ -4,6 +4,11 @@
 Databases and the Doctrine ORM
 ==============================
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Doctrine screencast series`_.
+
 Symfony doesn't provide a component to work with the database, but it *does* provide
 tight integration with a third-party library called `Doctrine`_.
 
@@ -751,3 +756,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
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -4,6 +4,12 @@
 How to Work with Doctrine Associations / Relations
 ==================================================
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Mastering Doctrine Relations`_
+    screencast series.
+
 There are **two** main relationship/association types:
 
 ``ManyToOne`` / ``OneToMany``
@@ -588,3 +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
diff --git a/forms.rst b/forms.rst
@@ -4,6 +4,11 @@
 Forms
 =====
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Symfony Forms screencast series`_.
+
 Dealing with HTML forms is one of the most common - and challenging - tasks for
 a web developer. Symfony integrates a Form component that makes dealing with
 forms easy. In this article, you'll build a complex form from the ground up,
@@ -714,3 +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
diff --git a/frontend.rst b/frontend.rst
@@ -1,6 +1,11 @@
 Managing CSS and JavaScript
 ===========================
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Webpack Encore screencast series`_.
+
 Symfony ships with a pure-JavaScript library - called Webpack Encore - that makes
 working with CSS and JavaScript a joy. You can use it, use something else, or just
 create static CSS and JS files in your ``public/`` directory and include them in your
@@ -101,3 +106,4 @@ Other Front-End Articles
 .. _`Mix`: https://laravel.com/docs/5.4/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
diff --git a/page_creation.rst b/page_creation.rst
@@ -18,10 +18,11 @@ two-step process:
    create a Symfony ``Response`` object, which can hold HTML content, a JSON
    string or even a binary file like an image or PDF.
 
-.. seealso::
+.. admonition:: Screencast
+    :class: screencast
 
     Do you prefer video tutorials? Check out the `Stellar Development with Symfony`_
-    screencast series from KnpUniversity.
+    screencast series.
 
 .. seealso::
 
diff --git a/security.rst b/security.rst
@@ -4,6 +4,11 @@
 Security
 ========
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Symfony Security screencast series`_.
+
 Symfony's security system is incredibly powerful, but it can also be confusing
 to set up. In this article you'll learn how to set up your application's security
 step-by-step, from configuring your firewall and how you load users, to denying
@@ -1343,3 +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
diff --git a/service_container.rst b/service_container.rst
@@ -5,6 +5,11 @@
 Service Container
 =================
 
+.. admonition:: Screencast
+    :class: screencast
+
+    Do you prefer video tutorials? Check out the `Symfony Fundamentals screencast series`_.
+
 Your application is *full* of useful objects: a "Mailer" object might help you
 send emails while another object might help you save things to the database.
 Almost *everything* that your app "does" is actually done by one of these objects.
@@ -1026,3 +1031,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
diff --git a/setup.rst b/setup.rst
@@ -4,10 +4,11 @@
 Installing & Setting up the Symfony Framework
 =============================================
 
-.. seealso::
+.. admonition:: Screencast
+    :class: screencast
 
     Do you prefer video tutorials? Check out the `Stellar Development with Symfony`_
-    screencast series from KnpUniversity.
+    screencast series.
 
 To create your new Symfony application, first make sure you're using PHP 7.1 or higher
 and have `Composer`_ installed. If you don't, start by :doc:`installing Composer globally </setup/composer>`
