8000 Merge branch '3.4' into 4.0 · symfony/symfony-docs@a8473c4 · GitHub
[go: up one dir, main page]
Skip to content

Commit a8473c4

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.0
* 3.4: Added more links to screencast videos Explain another option to override bundle's entity mapping
2 parents ca653aa + 7c0714a commit a8473c4

9 files changed

+51
-9
lines changed

‎bundles/override.rst

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,14 @@ inside a :doc:`compiler pass </service_container/compiler_passes>`.
7676
Entities & Entity Mapping
7777
-------------------------
7878

79-
Due to the way Doctrine works, it is not possible to override entity mapping
80-
of a bundle. However, if a bundle provides a mapped superclass (such as the
81-
``User`` entity in the FOSUserBundle) one can override attributes and
82-
associations. Learn more about this feature and its limitations in
83-
`the Doctrine documentation`_.
79+
If a bundle defines its entity mapping in configuration files instead of
80+
annotations, you can override them as any other regular bundle configuration
81+
file. The only caveat is that you must override all those mapping configuration
82+
files and not just the ones you actually want to override.
83+
84+
If a bundle provides a mapped superclass (such as the ``User`` entity in the
85+
FOSUserBundle) you can override its attributes and associations. Learn more
86+
about this feature and its limitations in `the Doctrine documentation`_.
8487

8588
Forms
8689
-----

‎doctrine.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
Databases and the Doctrine ORM
55
==============================
66

7+
.. admonition:: Screencast
8+
:class: screencast
9+
10+
Do you prefer video tutorials? Check out the `Doctrine screencast series`_.
11+
712
Symfony doesn't provide a component to work with the database, but it *does* provide
813
tight integration with a third-party library called `Doctrine`_.
914

@@ -751,3 +756,4 @@ Learn more
751756
.. _`SensioFrameworkExtraBundle`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
752757
.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
753758
.. _`limit of 767 bytes for the index key prefix`: https://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
759+
.. _`Doctrine screencast series`: https://knpuniversity.com/screencast/symfony-doctrine

‎doctrine/associations.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
How to Work with Doctrine Associations / Relations
55
==================================================
66

7+
.. admonition:: Screencast
8+
:class: screencast
9+
10+
Do you prefer video tutorials? Check out the `Mastering Doctrine Relations`_
11+
screencast series.
12+
713
There are **two** main relationship/association types:
814

915
``ManyToOne`` / ``OneToMany``
@@ -588,3 +594,4 @@ Doctrine's `Association Mapping Documentation`_.
588594

589595
.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
590596
.. _`orphanRemoval`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/working-with-associations.html#orphan-removal
597+
.. _`Mastering Doctrine Relations`: https://knpuniversity.com/screencast/doctrine-relations

‎forms.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
Forms
55
=====
66

7+
.. admonition:: Screencast
8+
:class: screencast
9+
10+
Do you prefer video tutorials? Check out the `Symfony Forms screencast series`_.
11+
712
Dealing with HTML forms is one of the most common - and challenging - tasks for
813
a web developer. Symfony integrates a Form component that makes dealing with
914
forms easy. In this article, you'll build a complex form from the ground up,
@@ -714,3 +719,4 @@ Learn more
714719

715720
.. _`Symfony Form component`: https://github.com/symfony/form
716721
.. _`DateTime`: https://php.net/manual/en/class.datetime.php
722+
.. _`Symfony Forms screencast series`: https://knpuniversity.com/screencast/symfony-forms

‎frontend.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Managing CSS and JavaScript
22
===========================
33

4+
.. admonition:: Screencast
5+
:class: screencast
6+
7+
Do you prefer video tutorials? Check out the `Webpack Encore screencast series`_.
8+
49
Symfony ships with a pure-JavaScript library - called Webpack Encore - that makes
510
working with CSS and JavaScript a joy. You can use it, use something else, or just
611
create static CSS and JS files in your ``public/`` directory and include them in your
@@ -101,3 +106,4 @@ Other Front-End Articles
101106
.. _`Mix`: https://laravel.com/docs/5.4/mix
102107
.. _`Symfony`: http://symfony.com/
103108
.. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
109+
.. _`Webpack Encore screencast series`: https://knpuniversity.com/screencast/webpack-encore

‎page_creation.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ two-step process:
1818
create a Symfony ``Response`` object, which can hold HTML content, a JSON
1919
string or even a binary file like an image or PDF.
2020

21-
.. seealso::
21+
.. admonition:: Screencast
22+
:class: screencast
2223

2324
Do you prefer video tutorials? Check out the `Stellar Development with Symfony`_
24-
screencast series from KnpUniversity.
25+
screencast series.
2526

2627
.. seealso::
2728

‎security.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
Security
55
========
66

7+
.. admonition:: Screencast
8+
:class: screencast
9+
10+
Do you prefer video tutorials? Check out the `Symfony Security screencast series`_.
11+
712
Symfony's security system is incredibly powerful, but it can also be confusing
813
to set up. In this article you'll learn how to set up your application's security
914
step-by-step, from configuring your firewall and how you load users, to denying
@@ -1343,3 +1348,4 @@ Other Security Related Topics
13431348
.. _`frameworkextrabundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
13441349
.. _`HWIOAuthBundle`: https://github.com/hwi/HWIOAuthBundle
13451350
.. _`Symfony ACL bundle`: https://github.com/symfony/acl-bundle
1351+
.. _`Symfony Security screencast series`: https://knpuniversity.com/screencast/symfony-security

‎service_container.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
Service Container
66
=================
77

8+
.. admonition:: Screencast
9+
:class: screencast
10+
11+
Do you prefer video tutorials? Check out the `Symfony Fundamentals screencast series`_.
12+
813
Your application is *full* of useful objects: a "Mailer" object might help you
914
send emails while another object might help you save things to the database.
1015
Almost *everything* that your app "does" is actually done by one of these objects.
@@ -1026,3 +1031,4 @@ Learn more
10261031
.. _`service-oriented architecture`: https://en.wikipedia.org/wiki/Service-oriented_architecture
10271032
.. _`Symfony Standard Edition (version 3.3) services.yaml`: https://github.com/symfony/symfony-standard/blob/3.3/app/config/services.yml
10281033
.. _`glob pattern`: https://en.wikipedia.org/wiki/Glob_(programming)
1034+
.. _`Symfony Fundamentals screencast series`: https://knpuniversity.com/screencast/symfony-fundamentals

‎setup.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
Installing & Setting up the Symfony Framework
55
=============================================
66

7-
.. seealso::
7+
.. admonition:: Screencast
8+
:class: screencast
89

910
Do you prefer video tutorials? Check out the `Stellar Development with Symfony`_
10-
screencast series from KnpUniversity.
11+
screencast series.
1112

1213
To create your new Symfony application, first make sure you're using PHP 7.1 or higher
1314
and have `Composer`_ installed. If you don't, start by :doc:`installing Composer globally </setup/composer>`

0 commit comments

Comments
 (0)
0